Merge remote-tracking branch 'origin/develop' into feat/356-front-page-admin-bovin

CHANGELOG.md

@@ -55,9 +55,9 @@ Ajouter dans le fichier .env du frontend
 * [#332] Refonte écran réception terminée
 * [#327] afficher/modifier écran expédition terminée
 * [#352] modification front admin fournisseur
-* [#355] modification front admin transporteur
+
+
 * [#356] front page admin bovin
-* [#353] modification front admin client
 ### Changed
 
 ### Fixed

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.66'
+    app.version: '0.0.63'

frontend/components/address.vue

@@ -18,13 +18,14 @@
             <UiTextInput id="address-country" v-model="form.countryCode" label="Pays (code)" />
         </div>
         <div class="flex justify-center items-center">
-        <UiButton
+        <button
-            class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
+            class="inline-flex items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
             type="submit"
             :disabled="isLoading"
         >
-            Valider
+            <Icon :name="props.address ? '' : 'mdi:plus'" size="28" />
-        </UiButton>
+            {{ props.address? "Valider" : "Ajouter" }}
+        </button>
         </div>
     </form>
 </template>

frontend/i18n/locales/fr.json

@@ -82,10 +82,7 @@
             "list": "Impossible de récupérer la liste des camions."
         },
         "bovin": {
-            "list": "Impossible de récupérer la liste des races de bovins.",
+            "list": "Impossible de récupérer la liste des races de bovins."
-            "fetch": "Impossible de récupérer le type bovin.",
-            "create": "Impossible de créer le type bovin.",
-            "update": "Impossible de mettre à jour le type bovin."
         },
         "carrier": {
             "list": "Impossible de récupérer la liste des transporteurs.",
@@ -136,10 +133,6 @@
             "update": "Transporteur mis à jour",
             "create": "Transporteur créé"
         },
-        "bovin": {
-            "update": "Type bovin mis à jour avec succès.",
-            "create": "Type bovin créé avec succès."
-        },
         "weight": {
             "update": "Pesée mis à jour"
         }

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

@@ -22,9 +22,9 @@
             <UiButton
                 type="submit"
                 :disabled="isLoading || isHydrating"
-                class="inline-flex items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
+                class="inline-flex items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2 justify-self-end"
             >
-                Valider
+                {{ isEdit ? 'Valider' : 'Ajouter' }}
             </UiButton>
         </div>
     </form>
@@ -37,8 +37,6 @@ const router = useRouter()
 const route = useRoute()
 const isLoading = ref(false)
 const isHydrating = ref(false)
-const idBovin = computed(() => resolveId(route.params.id))
-const isEdit = computed(() => idBovin.value !== null)
 
 function resolveId(param: unknown) {
     const idStr = Array.isArray(param) ? param[0] : param
@@ -47,6 +45,9 @@ function resolveId(param: unknown) {
     return Number.isFinite(id) ? id : null
 }
 
+const idBovin = computed(() => resolveId(route.params.id))
+const isEdit = computed(() => idBovin.value !== null)
+
 const form = reactive<BovinFormData>({
     label: '',
     code: ''
@@ -99,6 +100,7 @@ async function validate() {
         } else {
             await createBovin(basePayload)
         }
+        await navigate()
     } finally {
         isLoading.value = false
     }

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

@@ -1,41 +1,32 @@
 
 <template>
     <form @submit.prevent="validate">
-        <div class="flex items-center justify-between relative">
+    <div class="flex items-center justify-between">
-            <div class="flex flex-row absolute -left-[60px]">
+        <h1 class="text-3xl font-bold uppercase">
-                <Icon
+            {{ route.params.id ? 'Modifier transporteur' : 'Ajout transporteur' }}
-                    @click="router.push('/admin/carrier/carrier-list')"
+        </h1>
-                    name="gg:arrow-left-o"
-                    size="40"
-                    class="cursor-pointer text-primary-500"
-                />
-            </div>
-            <h1 class="text-4xl text-primary-500 font-bold uppercase">
-                {{ route.params.id ? 'Modification du transporteur' : 'Ajout d\'un transporteur' }}
-            </h1>
-        </div>
 
-        <div class="grid grid-cols-2 items-start pt-7 mb-11 gap-x-[200px]">
+        <UiButton
-            <UiTextInput
+            type="submit"
-                label="Nom du transporteur"
+            class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2 justify-self-end"
-                id="carrier-name"
+        >
-                v-model="form.name"
+            Valider
-            />
+        </UiButton>
+    </div>
 
-            <UiTextInput
+    <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 py-12">
-                label="Code transporteur"
+        <UiTextInput
+            label = "nom du fournisseur"
+            id="carrier-name"
+            v-model="form.name"
+        />
+
+        <UiTextInput
+                label = "code fournisseur"
                 id="code-id"
                 v-model="form.code"
-            />
+        />
-        </div>
+    </div>
-        <div class="flex justify-center items-center">
-            <UiButton
-                type="submit"
-                class="inline-flex items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
-            >
-                Valider
-            </UiButton>
-        </div>
     </form>
 
 </template>
@@ -101,10 +92,11 @@ async function validate() {
 
     if(idCarrier.value){
         await updateCarrier(idCarrier.value, basePayload)
+        navigate()
         return
-    }else{
-        await createCarrier(basePayload)
     }
+    await createCarrier(basePayload)
+    navigate()
 }
 
 function navigate(){

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

@@ -1,18 +1,25 @@
 <template>
 
     <div class="flex items-center justify-between ">
-            <h1 class="text-4xl font-bold uppercase text-primary-500">listes des transporteurs</h1>
+            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des transporteurs</h1>
+            <NuxtLink
+                to="/admin/carrier"
+                class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+            >
+                <Icon name="mdi:plus" size="28"  />
+                Ajouter
+            </NuxtLink>
     </div>
 
-        <div class="mt-7 border border-slate-200 mb-11 ">
+        <div class="mt-6 border border-slate-200 mb-16 ">
-            <div class="grid grid-cols-2 gap-4 text-primary-700 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
+            <div class="grid grid-cols-2 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
                 <div>Label</div>
                 <div>Code</div>
             </div>
             <div
                 v-for="carrier in carrierList"
                 :key="carrier.id"
-                class="grid grid-cols-2 text-primary-700 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
+                class="grid grid-cols-2 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
                 role="button"
                 tabindex="0"
                 @click="goToCarrier(carrier.id)"
@@ -22,15 +29,6 @@
                 <div>{{ carrier.code }}</div>
             </div>
         </div>
-    <div class="flex justify-center items-center">
-        <NuxtLink
-            to="/admin/carrier"
-            class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
-        >
-            <Icon name="mdi:plus" size="28"  />
-            Ajouter
-        </NuxtLink>
-    </div>
 
 </template>
 

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

@@ -1,22 +1,12 @@
 <template>
     <form @submit.prevent="validate">
-        <div class="flex items-center relative">
+        <div class="flex items-center justify-between">
-            <div class="flex flex-row absolute -left-[60px] ">
+            <h1 class="text-3xl font-bold uppercase">
-                <Icon @click="router.push('/admin/customer/customer-list')" name="gg:arrow-left-o" size="40" class="cursor-pointer text-primary-500"/>
+                {{ customerId ? "Modifications du client" : "Ajout d'un client" }}
-            </div>
-            <h1 class="text-3xl text-primary-500  font-bold uppercase">
-                {{ customerId ? "Modification du client" : "Ajout d'un client" }}
             </h1>
-        </div>
 
-        <div class="flex flex-cols-3 justify-between mb-11 pt-7">
-            <UiTextInput id="customer-name" v-model="form.name" label="Nom du client" :disabled="!auth.isAdmin" wrapper-class="w-[280px]"/>
-            <UiTextInput id="customer-phone" v-model="form.phone" label="Téléphone" :disabled="!auth.isAdmin" wrapper-class="w-[280px]"/>
-            <UiTextInput id="customer-email" v-model="form.email" label="Email" :disabled="!auth.isAdmin" wrapper-class="w-[280px]"/>
-        </div>
-        <div class="flex items-center justify-center">
             <UiButton
-                class="inline-flex mb-28 items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
+                class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
                 type="submit"
                 :disabled="isLoading || !auth.isAdmin"
             >
@@ -25,19 +15,35 @@
             </UiButton>
         </div>
 
-        <div class="flex items-center justify-between mb-7">
+        <div class="grid grid-cols-2 gap-y-8 gap-x-80 mb-10 py-12">
-            <h2 class="text-3xl text-primary-500 font-bold uppercase">Adresses du client</h2>
+            <UiTextInput id="customer-name" v-model="form.name" label="Nom du client" :disabled="!auth.isAdmin"/>
+            <UiTextInput id="customer-phone" v-model="form.phone" label="Téléphone" :disabled="!auth.isAdmin"/>
+            <UiTextInput id="customer-email" v-model="form.email" label="Email" :disabled="!auth.isAdmin"/>
         </div>
-        <div class="overflow-x-auto mb-11 text-primary-700">
+
-            <table class="w-full border-collapse text-primary-700">
+        <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
+                type="button"
+                class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+                :disabled="customerId === null || !auth.isAdmin"
+                @click="goToAddAddress"
+            >
+                <Icon name="mdi:plus" size="28" />
+                Ajouter
+            </UiButton>
+        </div>
+        <div class="overflow-x-auto mb-10">
+            <table class="w-full border-collapse">
                 <thead>
-                <tr class="text-left border bg-slate-100 border-gray-200">
+                <tr class="text-left border-b border-gray-200">
-                    <th class="py-3 px-4 text-sm uppercase">Libellé</th>
+                    <th class="py-3 pr-4 text-sm uppercase">Libellé</th>
-                    <th class="py-3 px-4 text-sm uppercase">Rue</th>
+                    <th class="py-3 pr-4 text-sm uppercase">Rue</th>
-                    <th class="py-3 px-4 text-sm uppercase">Complément</th>
+                    <th class="py-3 pr-4 text-sm uppercase">Complément</th>
-                    <th class="py-3 px-4 text-sm uppercase">Code postal</th>
+                    <th class="py-3 pr-4 text-sm uppercase">Code postal</th>
-                    <th class="py-3 px-4 text-sm uppercase">Ville</th>
+                    <th class="py-3 pr-4 text-sm uppercase">Ville</th>
-                    <th class="py-3 px-4 text-sm uppercase">Pays</th>
+                    <th class="py-3 pr-4 text-sm uppercase">Pays</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -52,32 +58,21 @@
                     <tr
                         v-for="(address, index) in form.addresses"
                         :key="address.id ?? index"
-                        class="border border-gray-100 hover:bg-slate-50"
+                        class="border-b border-gray-100 hover:bg-slate-50"
                         :class="auth.isAdmin ? 'cursor-pointer' : 'cursor-not-allowed opacity-60'"
                         @click="goToEditAddress(address.id ?? null)"
                     >
-                        <td class="py-3 px-4">{{ address.label || "—" }}</td>
+                        <td class="py-3 pr-4">{{ address.label || "—" }}</td>
-                        <td class="py-3 px-4">{{ address.street || "—" }}</td>
+                        <td class="py-3 pr-4">{{ address.street || "—" }}</td>
-                        <td class="py-3 px-4">{{ address.street2 || "—" }}</td>
+                        <td class="py-3 pr-4">{{ address.street2 || "—" }}</td>
-                        <td class="py-3 px-4">{{ address.postalCode || "—" }}</td>
+                        <td class="py-3 pr-4">{{ address.postalCode || "—" }}</td>
-                        <td class="py-3 px-4">{{ address.city || "—" }}</td>
+                        <td class="py-3 pr-4">{{ address.city || "—" }}</td>
-                        <td class="py-3 px-4">{{ address.countryCode || "—" }}</td>
+                        <td class="py-3 pr-4">{{ address.countryCode || "—" }}</td>
                     </tr>
                 </template>
                 </tbody>
             </table>
         </div>
-        <div class="flex justify-center items-center">
-            <UiButton
-                type="button"
-                class="inline-flex items-center justify-center text-xl gap-2 text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
-                :disabled="customerId === null || !auth.isAdmin"
-                @click="goToAddAddress"
-            >
-                <Icon name="mdi:plus" size="28" />
-                Ajouter
-            </UiButton>
-        </div>
     </form>
 </template>
 

frontend/pages/admin/customer/address.vue

@@ -16,10 +16,13 @@ const addressId = computed(() => (route.query.addressId !== undefined ? Number(r
 const address = ref<AddressData | null>(null)
 
 const validate = async (payload: AddressPayload) => {
-    if (addressId.value !== null) {
+    try {
-        await updateAddress(addressId.value, payload)
+        if (addressId.value !== null) {
-    } else {
+            await updateAddress(addressId.value, payload)
-        await addAddress(payload)
+        } else {
+            await addAddress(payload)
+        }
+    } finally {
         await router.push("/admin/customer/" + customerId.value)
     }
 }

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

@@ -1,12 +1,21 @@
 <template>
     <div class="flex items-center justify-between">
-        <h1 class="text-4xl font-bold uppercase text-primary-500">Liste des clients</h1>
+        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des Clients</h1>
+        <NuxtLink
+            to="/admin/customer"
+            class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+            :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
+            @click="handleAddClick"
+        >
+            <Icon name="mdi:plus" size="28"  />
+            Ajouter
+        </NuxtLink>
     </div>
 
-    <div v-if="auth.isAdmin" class="mt-7 border border-slate-200 mb-11">
+    <div v-if="auth.isAdmin" class="mt-6 border border-slate-200 mb-16">
         <div class="max-h-96 overflow-y-auto">
             <div
-                class="sticky text-primary-700 top-0 z-10 grid grid-cols-8 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
+                class="sticky top-0 z-10 grid grid-cols-8 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
             >
                 <div>Nom</div>
                 <div>Téléphone</div>
@@ -25,7 +34,7 @@
             <div v-for="customer in customerList" :key="customer.id">
                 <div
                     v-if="!customer.addresses || customer.addresses.length === 0"
-                    class="grid text-primary-700 grid-cols-8 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
+                    class="grid grid-cols-8 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
                     @click="goToCustomer(customer.id)"
                 >
                     <div class="truncate">{{ customer.name || "—" }}</div>
@@ -42,7 +51,7 @@
                     <div
                         v-for="(address, idx) in customer.addresses"
                         :key="address.id ?? `${customer.id}-${idx}-${address.street}-${address.postalCode}`"
-                        class="grid grid-cols-8 text-primary-700 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
+                        class="grid grid-cols-8 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
                         :class="idx > 0 ? 'pl-4 border-l-4 border-l-slate-200 bg-slate-50' : ''"
                         @click="goToCustomer(customer.id)"
                     >
@@ -61,7 +70,7 @@
 
                 <template v-else>
                     <div
-                        class="grid grid-cols-8 text-primary-700 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
+                        class="grid grid-cols-8 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
                         @click="goToCustomer(customer.id)"
                     >
                         <div class="truncate">{{ customer.name || "—" }}</div>
@@ -75,20 +84,9 @@
             </div>
         </div>
     </div>
-    <div v-else class="mt-7 border border-slate-200 mb-11 px-4 py-6 text-slate-400">
+    <div v-else class="mt-6 border border-slate-200 mb-16 px-4 py-6 text-slate-400">
         Accès réservé aux administrateurs.
     </div>
-    <div class="flex justify-center items-center">
-        <NuxtLink
-            to="/admin/customer"
-            class="inline-flex items-center mb-16 justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
-            :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
-            @click="handleAddClick"
-        >
-            <Icon name="mdi:plus" size="28" />
-            Ajouter
-        </NuxtLink>
-    </div>
 </template>
 
 <script setup lang="ts">

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

@@ -6,7 +6,7 @@
                 <Icon @click="router.push('/admin/supplier/supplier-list')" name="gg:arrow-left-o" size="40" class="cursor-pointer text-primary-500"/>
             </div>
             <h1 class="text-3xl text-primary-500  font-bold uppercase">
-                {{ supplierId ? "Modification du fournisseur" : "Ajout d'un fournisseur" }}
+                {{ supplierId ? "Modifications du fournisseur" : "Ajout d'un fournisseur" }}
             </h1>
         </div>
 
@@ -17,7 +17,7 @@
         </div>
         <div class="flex items-center justify-center">
             <UiButton
-                class="inline-flex mb-28 items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
+                class="inline-flex items-center mb-[106px] justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
                 type="submit"
                 :disabled="isLoading || !auth.isAdmin"
             >
@@ -27,7 +27,7 @@
         </div>
 
         <div class="flex items-center justify-between mb-7">
-            <h2 class="text-3xl text-primary-500 font-bold uppercase">Adresses du fournisseur</h2>
+            <h2 class="text-3xl text-primary-500 font-bold uppercase">Adresses fournisseur</h2>
         </div>
         <div class="overflow-x-auto mb-11 text-primary-700">
             <table class="w-full border-collapse">
@@ -71,7 +71,7 @@
         <div class="flex justify-center items-center">
         <UiButton
             type="button"
-            class="inline-flex items-center justify-center text-xl gap-2 text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
+            class="inline-flex items-center mb-16 justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
             :disabled="supplierId === null || !auth.isAdmin"
             @click="goToAddAddress"
         >

frontend/pages/admin/supplier/address.vue

@@ -16,12 +16,15 @@ const addressId = computed(() => { return route.query.addressId !== undefined ?
 const address = ref<AddressData|null>(null)
 
 const validate = async (address: AddressPayload) => {
+    try {
         if (addressId.value !== null) {
             await updateAddress(addressId.value, address)
         } else {
             await addAddress(address)
-            await router.push('/admin/supplier/' + supplierId.value)
         }
+    } finally {
+        await router.push('/admin/supplier/' + supplierId.value)
+    }
 }
 
 const addAddress = async (address: AddressPayload) => {

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

@@ -3,7 +3,7 @@
         <div
             class="flex items-center justify-between gap-10">
             <h1 class="text-3xl font-bold uppercase">
-                {{ userId ? "Modification de l'utilisateur" : "Ajout d'un utilisateur" }}
+                {{ userId ? "Modifications de l'utilisateur" : "Ajout d'un utilisateur" }}
             </h1>
             <UiButton
                 class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"

frontend/services/bovine-type.ts

@@ -24,27 +24,19 @@ export async function getBovineTypeList(): Promise<BovineTypeData[]> {
 
 export async function getBovin(id: number): Promise<BovineTypeData> {
     const api = useApi()
-    const response = await api.get<BovineTypeData>(`bovine_types/${id}`, {}, {
+    const response = await api.get<BovineTypeData>(`bovine_types/${id}`)
-        toastErrorKey: 'errors.bovin.fetch'
-    })
     return mapToBovineTypeData(response)
 }
 
 export async function createBovin(payload: BovinPayload = {}): Promise<BovineTypeData> {
     const api = useApi()
-    const response = await api.post<BovineTypeData>('bovine_types', toBovineTypePayload(payload), {
+    const response = await api.post<BovineTypeData>('bovine_types', toBovineTypePayload(payload))
-        toastErrorKey: 'errors.bovin.create',
-        toastSuccessKey: 'success.bovin.create'
-    })
     return mapToBovineTypeData(response)
 }
 
 export async function updateBovin(id: number, payload: BovinPayload = {}): Promise<BovineTypeData> {
     const api = useApi()
-    const response = await api.patch<BovineTypeData>(`bovine_types/${id}`, toBovineTypePayload(payload), {
+    const response = await api.patch<BovineTypeData>(`bovine_types/${id}`, toBovineTypePayload(payload))
-        toastErrorKey: 'errors.bovin.update',
-        toastSuccessKey: 'success.bovin.update'
-    })
     return mapToBovineTypeData(response)
 }