Merge branch 'refs/heads/develop' into feat/312-creation-d-une-page-d-administration-listing-des-fournisseurs

# Conflicts:
#	.idea/workspace.xml
#	frontend/layouts/admin.vue

.idea/workspace.xml

@@ -4,11 +4,16 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : panel scrollable plus interface revue">
+    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : test auto-tag-develop.yml (auto incrément version)">
+      <change afterPath="$PROJECT_DIR$/frontend/composables/useAppVersion.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/packages/security.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/config/packages/security.yaml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/pages/admin/carrier/carrier-list.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/admin/carrier/carrier-list.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/pages/admin/supplier/supplier-list.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/admin/supplier/supplier-list.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/app.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/app.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/layouts/default.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/layouts/default.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/login.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Dto/AppVersion.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/ApiResource/AppVersion.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/State/AppVersionProvider.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/State/AppVersionProvider.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -220,43 +225,43 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.MCP Project settings loaded": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
-    "git-widget-placeholder": "feat/312-creation-d-une-page-d-administration-listing-des-fournisseurs",
-    "last_opened_file_path": "/home/sroy/Documents/test/Ferme",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "configurable.tailwindcss",
-    "ts.external.directory.path": "/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.MCP Project settings loaded&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;develop&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/home/sroy/Documents/test/Ferme&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;configurable.tailwindcss&quot;,
+    &quot;ts.external.directory.path&quot;: &quot;/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   },
-  "keyToStringList": {
-    "DatabaseDriversLRU": [
-      "postgresql"
+  &quot;keyToStringList&quot;: {
+    &quot;DatabaseDriversLRU&quot;: [
+      &quot;postgresql&quot;
     ],
-    "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
-      "TEXT"
+    &quot;com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File&quot;: [
+      &quot;TEXT&quot;
     ],
-    "vue.recent.templates": [
-      "Vue Composition API Component"
+    &quot;vue.recent.templates&quot;: [
+      &quot;Vue Composition API Component&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
-      <recent name="\\wsl.localhost\Ubuntu-24.04\home\matte\Ferme\frontend\pages\admin\supplier" />
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\m-tristan\workspace\Ferme" />
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\tristan\workspace\ferme\templates" />
       <recent name="C:\Users\autin\AppData\Roaming\JetBrains\PhpStorm2025.3\scratches" />
       <recent name="C:\Users\autin\AppData\Roaming\JetBrains\PhpStorm2025.3\scratches\Ferme_MCD\MCD_DOC" />
+      <recent name="\\wsl.localhost\Ubuntu-24.04\home\tristan\workspace\ferme\frontend\pages\reception" />
     </key>
   </component>
   <component name="SharedIndexes">
@@ -297,6 +302,14 @@
       <workItem from="1770195959162" duration="18915000" />
       <workItem from="1770274844804" duration="3940000" />
     </task>
+    <task id="LOCAL-00009" summary="feat : ajout d'une gestion d'erreur au global côté front avec la lib toaster et I18n pour centraliser les messages d'erreur">
+      <option name="closed" value="true" />
+      <created>1768555180530</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1768555180530</updated>
+    </task>
     <task id="LOCAL-00010" summary="feat : ajout de l'authentification avec lexik">
       <option name="closed" value="true" />
       <created>1768832208350</created>
@@ -681,15 +694,7 @@
       <option name="project" value="LOCAL" />
       <updated>1770371073055</updated>
     </task>
-    <task id="LOCAL-00058" summary="fix : nom page fournisseur">
-      <option name="closed" value="true" />
-      <created>1770632525875</created>
-      <option name="number" value="00058" />
-      <option name="presentableId" value="LOCAL-00058" />
-      <option name="project" value="LOCAL" />
-      <updated>1770632525875</updated>
-    </task>
-    <option name="localTasksCounter" value="59" />
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -739,6 +744,7 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
+    <MESSAGE value="fix : gitea workflow" />
     <MESSAGE value="fix : script de déploiement" />
     <MESSAGE value="feat : ajout plus d'information sur la liste des réceptions côté front sur la page d'accueil" />
     <MESSAGE value="fix : redirige sur le login sur une 401 et reset du auth state + doc + timeout du toaster" />
@@ -763,8 +769,7 @@
     <MESSAGE value="feat : update numéro de version" />
     <MESSAGE value="fix : auto-tag-develop.yml" />
     <MESSAGE value="feat : test auto-tag-develop.yml (auto incrément version)" />
-    <MESSAGE value="fix : nom page fournisseur" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix : nom page fournisseur" />
+    <option name="LAST_COMMIT_MESSAGE" value="feat : test auto-tag-develop.yml (auto incrément version)" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

CHANGELOG.md

@@ -30,7 +30,6 @@ Ajouter dans le fichier .env du frontend
 * [#267] Lister les réceptions en attente
 * [#268] Lister les réceptions terminées
 * [#316] Admin liste des transporteurs
-* [#312] Creation administration listing fournisseurs
 
 ### Changed
 

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.34'
+    app.version: '0.0.33'

frontend/layouts/admin.vue

@@ -27,7 +27,7 @@
                     <NuxtLink to="/admin/dashboard">
                         Tableau de bord
                     </NuxtLink>
-                    <NuxtLink to="/admin/supplier/supplier-list">
+                    <NuxtLink to="/admin/supplier-list">
                         Fournisseur
                     </NuxtLink>
                     <NuxtLink to="/admin/carrier/carrier-list">

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

@@ -4,7 +4,7 @@
             <h1 class="text-3xl font-bold uppercase">listes des transporteurs</h1>
             <button
                 @Click="goToCarrier()"
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] "
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
             >Ajouter
             </button>
     </div>

frontend/pages/admin/supplier-list.vue

@@ -0,0 +1,71 @@
+<template>
+    <div class="flex items-center justify-between p-4">
+        <h1 class="text-xl font-fullbold uppercase"> Fournisseurs </h1>
+        <NuxtLink to="/admin/supplier"
+           class="flex items-center justify-center uppercase text-xl bg-primary-500 text-white h-[50px] w-[272px]"
+        >
+            Ajouter </NuxtLink>
+    </div>
+    <div class="mt-6 border border-slate-200 mb-16">
+        <div
+            class="grid grid-cols-6 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
+        >
+            <div>Nom</div>
+            <div>Mail</div>
+            <div>Rue</div>
+            <div>Complément</div>
+            <div>Code Postal</div>
+            <div>Ville</div>
+        </div>
+
+        <div v-for="supplier in supplierList" :key="supplier.id">
+            <template v-if="supplier.addresses?.length">
+                <div
+                    v-for="addr in supplier.addresses"
+                    :key="addr.id"
+                    class="grid grid-cols-6 gap-4 px-4 py-2 "
+                    @click="goToSupplier(supplier.id)"
+                >
+                    <div class="truncate">
+                        {{ supplier.name }}
+                    </div>
+                    <div class="truncate">
+                        {{ supplier.email }}
+                    </div>
+                    <div class="truncate">
+                        {{ addr.street }}
+                    </div>
+                    <div class="truncate">
+                        {{ addr.street2 }}
+                    </div>
+                    <div>{{ addr.postalCode }}</div>
+                    <div class="uppercase truncate">
+                        {{ addr.city }}
+                    </div>
+                </div>
+            </template>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import type {SupplierData} from "~/services/dto/supplier-data"
+import {getSupplierList} from "~/services/supplier"
+
+definePageMeta({layout: "admin"})
+
+const supplierList = ref<SupplierData[]>([])
+const router = useRouter()
+
+
+const goToSupplier = (id: number) => {
+    router.push(`/admin/supplier/${id}`)
+}
+
+onMounted(async () => {
+    supplierList.value = (await getSupplierList(false)) ?? []
+})
+
+</script>
+
+

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

@@ -1,74 +0,0 @@
-<template>
-    <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase"> Fournisseurs </h1>
-        <NuxtLink to="/admin/supplier"
-                  class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-        >
-            Ajouter
-        </NuxtLink>
-    </div>
-    <div class="mt-6 border border-slate-200 mb-16">
-        <div class="max-h-96 overflow-y-auto">
-            <div
-                class="sticky top-0 z-10 grid grid-cols-6 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
-            >
-                <div>Nom</div>
-                <div>Mail</div>
-                <div>Rue</div>
-                <div>Complément</div>
-                <div>Code Postal</div>
-                <div>Ville</div>
-            </div>
-
-            <div v-for="supplier in supplierList" :key="supplier.id">
-                <template v-if="supplier.addresses?.length">
-                    <div
-                        v-for="addr in supplier.addresses"
-                        :key="addr.id"
-                        class="grid grid-cols-6 hover:bg-slate-50 border-t gap-4 px-4 py-2"
-                        @click="goToSupplier(supplier.id)"
-                    >
-                        <div class="truncate">
-                            {{ supplier.name }}
-                        </div>
-                        <div class="truncate">
-                            {{ supplier.email }}
-                        </div>
-                        <div class="truncate">
-                            {{ addr.street }}
-                        </div>
-                        <div class="truncate">
-                            {{ addr.street2 }}
-                        </div>
-                        <div>{{ addr.postalCode }}</div>
-                        <div class="uppercase truncate">
-                            {{ addr.city }}
-                        </div>
-                    </div>
-                </template>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-import type {SupplierData} from "~/services/dto/supplier-data"
-import {getSupplierList} from "~/services/supplier"
-
-definePageMeta({layout: "admin"})
-
-const supplierList = ref<SupplierData[]>([])
-const router = useRouter()
-
-
-const goToSupplier = (id: number) => {
-    router.push(`/admin/supplier/${id}`)
-}
-
-onMounted(async () => {
-    supplierList.value = (await getSupplierList(false)) ?? []
-})
-
-</script>
-
-