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

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -55,8 +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
-
 * [#356] front page admin bovin
 ### Changed
 

config/version.yaml

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

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
+        <UiButton
-            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"
+            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" />
+            Valider
-            {{ props.address? "Valider" : "Ajouter" }}
+        </UiButton>
-        </button>
         </div>
     </form>
 </template>

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

@@ -1,32 +1,41 @@
 
 <template>
     <form @submit.prevent="validate">
-    <div class="flex items-center justify-between">
+        <div class="flex items-center justify-between relative">
-        <h1 class="text-3xl font-bold uppercase">
+            <div class="flex flex-row absolute -left-[60px]">
-            {{ route.params.id ? 'Modifier transporteur' : 'Ajout transporteur' }}
+                <Icon
-        </h1>
+                    @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
+        <div class="grid grid-cols-2 items-start pt-7 mb-11 gap-x-[200px]">
-            type="submit"
+            <UiTextInput
-            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"
+                label="Nom du transporteur"
-        >
+                id="carrier-name"
-            Valider
+                v-model="form.name"
-        </UiButton>
+            />
-    </div>
 
-    <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 py-12">
+            <UiTextInput
-        <UiTextInput
+                label="Code transporteur"
-            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>

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>
+            <h1 class="text-4xl 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-6 border border-slate-200 mb-16 ">
+        <div class="mt-7 border border-slate-200 mb-11 ">
-            <div class="grid grid-cols-2 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
+            <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>
 

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"
         >