From 2d2b38eae49e682a3eafe59ddfe8619504c05280 Mon Sep 17 00:00:00 2001
From: sroy <sebastien@yuno.malio.fr>
Date: Fri, 27 Feb 2026 10:06:49 +0000
Subject: [PATCH 1/2] [#355] modification front de la page admin transporteur
 (!36)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

| Numéro du ticket | Titre du ticket |
|------------------|-----------------|
|       #355           |      modification front de la page admin transporteur           |

## Description de la PR

## Modification du .env

## Check list

- [x] Pas de régression
- [ ] TU/TI/TF rédigée
- [x] TU/TI/TF OK
- [x] CHANGELOG modifié

Reviewed-on: https://gitea.malio.fr/MALIO-DEV/Ferme/pulls/36
Reviewed-by: Autin <tristan@yuno.malio.fr>
Co-authored-by: sroy <sebastien@yuno.malio.fr>
Co-committed-by: sroy <sebastien@yuno.malio.fr>
---
 CHANGELOG.md                                  |  2 +-
 frontend/components/address.vue               |  9 ++--
 frontend/pages/admin/carrier/[[id]].vue       | 53 +++++++++++--------
 frontend/pages/admin/carrier/carrier-list.vue | 24 +++++----
 frontend/pages/admin/supplier/[[id]].vue      |  4 +-
 5 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 222a318..337fbda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,7 +55,7 @@ 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] afficher/modifier écran expédition terminée
 ### Changed
 
 ### Fixed
diff --git a/frontend/components/address.vue b/frontend/components/address.vue
index 2c7c839..bce2fe9 100644
--- a/frontend/components/address.vue
+++ b/frontend/components/address.vue
@@ -18,14 +18,13 @@
             <UiTextInput id="address-country" v-model="form.countryCode" label="Pays (code)" />
         </div>
         <div class="flex justify-center items-center">
-        <button
-            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"
+        <UiButton
+            class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
             type="submit"
             :disabled="isLoading"
         >
-            <Icon :name="props.address ? '' : 'mdi:plus'" size="28" />
-            {{ props.address? "Valider" : "Ajouter" }}
-        </button>
+            Valider
+        </UiButton>
         </div>
     </form>
 </template>
diff --git a/frontend/pages/admin/carrier/[[id]].vue b/frontend/pages/admin/carrier/[[id]].vue
index 0a7fa7d..5da4420 100644
--- a/frontend/pages/admin/carrier/[[id]].vue
+++ b/frontend/pages/admin/carrier/[[id]].vue
@@ -1,32 +1,41 @@
 
 <template>
     <form @submit.prevent="validate">
-    <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase">
-            {{ route.params.id ? 'Modifier transporteur' : 'Ajout transporteur' }}
-        </h1>
+        <div class="flex items-center justify-between relative">
+            <div class="flex flex-row absolute -left-[60px]">
+                <Icon
+                    @click="router.push('/admin/carrier/carrier-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 transporteur' : 'Ajout d\'un transporteur' }}
+            </h1>
+        </div>
 
-        <UiButton
-            type="submit"
-            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"
-        >
-            Valider
-        </UiButton>
-    </div>
+        <div class="grid grid-cols-2 items-start pt-7 mb-11 gap-x-[200px]">
+            <UiTextInput
+                label="Nom du transporteur"
+                id="carrier-name"
+                v-model="form.name"
+            />
 
-    <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 py-12">
-        <UiTextInput
-            label = "nom du fournisseur"
-            id="carrier-name"
-            v-model="form.name"
-        />
-
-        <UiTextInput
-                label = "code fournisseur"
+            <UiTextInput
+                label="Code transporteur"
                 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>
diff --git a/frontend/pages/admin/carrier/carrier-list.vue b/frontend/pages/admin/carrier/carrier-list.vue
index dad52ab..d447dff 100644
--- a/frontend/pages/admin/carrier/carrier-list.vue
+++ b/frontend/pages/admin/carrier/carrier-list.vue
@@ -1,25 +1,18 @@
 <template>
 
     <div class="flex items-center justify-between ">
-            <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>
+            <h1 class="text-4xl font-bold uppercase text-primary-500">listes des transporteurs</h1>
     </div>
 
-        <div class="mt-6 border border-slate-200 mb-16 ">
-            <div class="grid grid-cols-2 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
+        <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>Label</div>
                 <div>Code</div>
             </div>
             <div
                 v-for="carrier in carrierList"
                 :key="carrier.id"
-                class="grid grid-cols-2 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
+                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="goToCarrier(carrier.id)"
@@ -29,6 +22,15 @@
                 <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>
 
diff --git a/frontend/pages/admin/supplier/[[id]].vue b/frontend/pages/admin/supplier/[[id]].vue
index db1046c..7ad74d7 100644
--- a/frontend/pages/admin/supplier/[[id]].vue
+++ b/frontend/pages/admin/supplier/[[id]].vue
@@ -17,7 +17,7 @@
         </div>
         <div class="flex items-center justify-center">
             <UiButton
-                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"
+                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"
                 type="submit"
                 :disabled="isLoading || !auth.isAdmin"
             >
@@ -71,7 +71,7 @@
         <div class="flex justify-center items-center">
         <UiButton
             type="button"
-            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="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="supplierId === null || !auth.isAdmin"
             @click="goToAddAddress"
         >

From a0557b077b5078d7ab58c4ff0e3a6a6e8bc9a886 Mon Sep 17 00:00:00 2001
From: gitea-actions <gitea-actions@local>
Date: Fri, 27 Feb 2026 10:06:55 +0000
Subject: [PATCH 2/2] chore: bump version to v0.0.64

---
 config/version.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/version.yaml b/config/version.yaml
index aa29a3a..5dde70c 100644
--- a/config/version.yaml
+++ b/config/version.yaml
@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.63'
+    app.version: '0.0.64'