Merge branch 'develop' into feat/353-front-de-la-page-admin-client

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -56,6 +56,7 @@ Ajouter dans le fichier .env du frontend
 * [#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
 

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.64'
+    app.version: '0.0.65'

frontend/i18n/locales/fr.json

@@ -82,7 +82,10 @@
             "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.",
@@ -133,6 +136,10 @@
             "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/layouts/default.vue

@@ -108,7 +108,7 @@
 
                     <NuxtLink
                         v-if="auth.isAdmin"
-                        to="/admin/bovin/list"
+                        to="/admin/bovin/bovin-list"
                         custom
                         v-slot="{ href, navigate }"
                     >
@@ -214,7 +214,7 @@
                         <NuxtLink v-if="auth.isAdmin" to="/admin/customer/customer-list" @click="closeMenu">
                             Clients
                         </NuxtLink>
-                        <NuxtLink v-if="auth.isAdmin" to="/admin/bovin/list" @click="closeMenu">
+                        <NuxtLink v-if="auth.isAdmin" to="/admin/bovin/bovin-list" @click="closeMenu">
                             Bovins
                         </NuxtLink>
                     </nav>

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

@@ -1,24 +1,32 @@
 <template>
     <form @submit.prevent="validate">
-        <div class="text-primary-500 flex items-center justify-between">
-            <h1 class="text-3xl font-bold uppercase">
-                {{ route.params.id ? 'Modifier bovin' : 'Ajout bovin' }}
+        <div class="flex items-center justify-between relative">
+            <div class="flex flex-row absolute -left-[60px]">
+                <Icon
+                    @click="router.push('/admin/bovin/bovin-list')"
+                    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 ? 'Modifications du type bovin' : 'Ajout d\'un type bovin' }}
             </h1>
+        </div>
 
+        <div class="grid grid-cols-2 items-start pt-7 mb-11 gap-x-[200px]">
+            <UiTextInput label="Nom du bovin" id="bovin-label" v-model="form.label" />
+            <UiTextInput label="Code bovin" id="code-id" v-model="form.code" />
+        </div>
+        <div class="flex justify-center items-center">
             <UiButton
                 type="submit"
                 :disabled="isLoading || isHydrating"
-                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="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"
             >
-                <Icon :name="isEdit ? '' : 'mdi:plus'" size="28" />
-                {{ isEdit ? 'Valider' : 'Ajouter' }}
+                Valider
             </UiButton>
         </div>
-
-        <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 py-12">
-            <UiTextInput label="Nom du bovin" id="bovin-label" v-model="form.label" />
-            <UiTextInput label="Code bovin" id="code-id" v-model="form.code" />
-        </div>
     </form>
 </template>
 
@@ -29,6 +37,8 @@ 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
@@ -37,9 +47,6 @@ 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: ''
@@ -92,7 +99,6 @@ async function validate() {
         } else {
             await createBovin(basePayload)
         }
-        await navigate()
     } finally {
         isLoading.value = false
     }

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

@@ -0,0 +1,67 @@
+<template>
+    <div class="flex items-center justify-between ">
+        <h1 class="text-4xl font-bold uppercase text-primary-500">Liste des types bovins</h1>
+    </div>
+    <div class="mt-7 border border-slate-200 mb-11 ">
+        <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>Nom</div>
+            <div>Code</div>
+        </div>
+        <div v-if="!auth.isAdmin" class="px-4 py-6 text-slate-400">
+            Accès réservé aux administrateurs.
+        </div>
+        <div v-else-if="bovinList.length === 0" class="px-4 py-6 text-slate-400">
+            Aucun type de bovin.
+        </div>
+        <template v-else>
+            <div
+                v-for="bovin in bovinList"
+                :key="bovin.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"
+                role="button"
+                tabindex="0"
+                @click="goToBovin(bovin.id)"
+                @keydown.enter="goToBovin(bovin.id)"
+            >
+                <div>{{ bovin.label }}</div>
+                <div>{{ bovin.code }}</div>
+            </div>
+        </template>
+    </div>
+    <div class="flex justify-center items-center">
+        <NuxtLink
+            to="/admin/bovin"
+            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>
+</template>
+
+<script setup lang="ts">
+import { getBovineTypeList } from "~/services/bovine-type"
+import type { BovineTypeData } from "~/services/dto/bovine-type-data"
+import { useAuthStore } from "~/stores/auth"
+
+const bovinList = ref<BovineTypeData[]>([])
+const router = useRouter()
+const auth = useAuthStore()
+
+const goToBovin = (id: number) => {
+    if (!auth.isAdmin) return
+    router.push(`/admin/bovin/${id}`)
+}
+
+const handleAddClick = (event: Event) => {
+    if (auth.isAdmin) return
+    event.preventDefault()
+}
+
+onMounted(async () => {
+    if (!auth.isAdmin) return
+    bovinList.value = await getBovineTypeList()
+})
+</script>

frontend/pages/admin/bovin/list.vue

@@ -1,72 +0,0 @@
-<template>
-    <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold text-primary-500 uppercase">Liste des types bovins</h1>
-        <NuxtLink
-            to="/admin/bovin"
-            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"
-            @click="handleAddClick"
-        >
-            <Icon name="mdi:plus" size="28"  />
-            Ajouter
-        </NuxtLink>
-    </div>
-    <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
-                       grid grid-cols-2 gap-4
-                       bg-slate-100 px-4 py-3
-                       font-semibold uppercase
-                       tracking-wide"
-            >
-                <div class="col-span-1">Nom</div>
-                <div class="col-span-1">Code</div>
-            </div>
-            <div v-if="bovinList.length === 0" class="px-4 py-6 text-slate-400">
-                Aucun type de bovin.
-            </div>
-            <div v-else>
-                <div
-                    v-for="bovin in bovinList"
-                    :key="bovin.id"
-                    class="grid grid-cols-2 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
-                    @click="goToBovin(bovin.id)"
-                >
-                    <div class="col-span-1">{{ bovin.label }}</div>
-                    <div class="col-span-1">{{ bovin.code }}</div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <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>
-</template>
-
-<script setup lang="ts">
-import { getBovineTypeList } from "~/services/bovine-type"
-import type { BovineTypeData } from "~/services/dto/bovine-type-data"
-import { useAuthStore } from "~/stores/auth"
-
-const bovinList = ref<BovineTypeData[]>([])
-const router = useRouter()
-const auth = useAuthStore()
-
-const goToBovin = (id: number) => {
-    if (!auth.isAdmin) return
-    router.push(`/admin/bovin/${id}`)
-}
-
-const handleAddClick = (event: Event) => {
-    if (auth.isAdmin) return
-    event.preventDefault()
-}
-
-onMounted(async () => {
-    if (!auth.isAdmin) return
-    bovinList.value = await getBovineTypeList()
-})
-</script>

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

@@ -101,11 +101,10 @@ async function validate() {
 
     if(idCarrier.value){
         await updateCarrier(idCarrier.value, basePayload)
-        navigate()
         return
-    }
+    }else{
         await createCarrier(basePayload)
-    navigate()
+    }
 }
 
 function navigate(){

frontend/services/bovine-type.ts

@@ -24,19 +24,27 @@ 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)
 }