.gitea/workflows/auto-tag-develop.yml

@@ -16,30 +16,50 @@ jobs:
           token: ${{ secrets.RELEASE_TOKEN }}
           persist-credentials: true
 
-      - name: Create next tag v0.0.X
+      - name: Create next tag from config/version.yaml
         shell: bash
         run: |
           set -euo pipefail
 
-          # Skip if current commit already has a v0.0.* tag
-          if git tag --points-at HEAD | grep -qE '^v0\.0\.'; then
+          # Skip if current commit already has a vX.Y.Z tag
+          if git tag --points-at HEAD | grep -qE '^v[0-9]+\.[0-9]+\.[0-9]+$'; then
             echo "Tag already exists on this commit. Skipping."
             exit 0
           fi
 
-          last_tag="$(git tag -l 'v0.0.*' --sort=-v:refname | head -n1 || true)"
-          if [ -z "$last_tag" ]; then
-            next_tag="v0.0.1"
-          else
-            patch="${last_tag##v0.0.}"
-            if ! [[ "$patch" =~ ^[0-9]+$ ]]; then
-              echo "Unexpected tag format: $last_tag" >&2
-              exit 1
-            fi
-            next_tag="v0.0.$((patch + 1))"
+          changed_version=false
+          if git diff --name-only "${{ gitea.event.before }}" "${{ gitea.event.after }}" | grep -q '^config/version\.yaml$'; then
+            changed_version=true
           fi
 
-          git config user.name "gitea-actions"
-          git config user.email "gitea-actions@local"
-          git tag "$next_tag"
-          git push origin "$next_tag"
+          read_version() {
+            awk -F': *' '/app\.version:/{print $2}' config/version.yaml | tr -d '[:space:]' | tr -d "'\""
+          }
+
+          if $changed_version; then
+            version="$(read_version)"
+            if ! [[ "$version" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+              echo "Invalid version in version.yaml: $version" >&2
+              exit 1
+            fi
+          else
+            last_tag="$(git tag -l 'v*' --sort=-v:refname | head -n1 || true)"
+            if [ -z "$last_tag" ]; then
+              version="0.1.0"
+            else
+              base="${last_tag#v}"
+              IFS='.' read -r major minor patch <<< "$base"
+              version="${major}.${minor}.$((patch + 1))"
+            fi
+
+            printf "parameters:\\n    app.version: '%s'\\n" "$version" > config/version.yaml
+            git config user.name "gitea-actions"
+            git config user.email "gitea-actions@local"
+            git add config/version.yaml
+            git commit -m "chore: bump version to v$version" || true
+            git push origin develop || true
+          fi
+
+          tag="v$version"
+          git tag "$tag"
+          git push origin "$tag"

.idea/workspace.xml

@@ -4,10 +4,16 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : Création d'une page d'administration listing des fournisseurs">
+    <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/supplierList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/admin/supplierList.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" />
@@ -21,7 +27,6 @@
   <component name="CopilotPersistence">
     <persistenceIdMap>
       <entry key="_//wsl.localhost/Ubuntu-24.04/home/kevin/Stage/Ferme" value="381AhnCm9yPeOiWgMObKHhtgv2C" />
-      <entry key="_//wsl.localhost/Ubuntu-24.04/home/matte/Ferme" value="39QGG8hGN52IW0kjhmS0rLvVr56" />
     </persistenceIdMap>
   </component>
   <component name="EmbeddingIndexingInfo">
@@ -31,15 +36,15 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="TypeScript File" />
         <option value="Vue Composition API Component" />
+        <option value="TypeScript File" />
       </list>
     </option>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="develop" />
+        <entry key="$PROJECT_DIR$" value="feat/256-reception-etape-3-bovin" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -57,7 +62,7 @@
       </server>
     </servers>
   </component>
-  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="C:/php/php.exe">
+  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="C:/php-8.4.3/php.exe">
     <include_path>
       <path value="$PROJECT_DIR$/vendor/psr/log" />
       <path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
@@ -220,39 +225,36 @@
     <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",
-    "com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true",
-    "git-widget-placeholder": "feat/312-creation-d-une-page-d-administration-listing-des-fournisseurs",
-    "junie.onboarding.icon.badge.shown": "true",
-    "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": "proofread",
-    "to.speed.mode.migration.done": "true",
-    "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\m-tristan\workspace\Ferme" />
@@ -299,39 +301,6 @@
       <workItem from="1770195718952" duration="215000" />
       <workItem from="1770195959162" duration="18915000" />
       <workItem from="1770274844804" duration="3940000" />
-      <workItem from="1770620780923" duration="9218000" />
-    </task>
-    <task id="LOCAL-00005" summary="feat : update du fichier README.md et CHANGELOG.md">
-      <option name="closed" value="true" />
-      <created>1768317786187</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1768317786187</updated>
-    </task>
-    <task id="LOCAL-00006" summary="fix : correction du useApi pour qu'il n'y ait plus de retry lors d'une erreur 500 par exemple">
-      <option name="closed" value="true" />
-      <created>1768318875533</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1768318875533</updated>
-    </task>
-    <task id="LOCAL-00007" summary="test : ajout de TU sur les services et providers">
-      <option name="closed" value="true" />
-      <created>1768318921478</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1768318921478</updated>
-    </task>
-    <task id="LOCAL-00008" summary="feat : ajout de la génération du bon de reception, correction de la base du formulaire multi-etape de reception et ajout d'une gestion d'erreur global">
-      <option name="closed" value="true" />
-      <created>1768498751836</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1768498751836</updated>
     </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" />
@@ -677,23 +646,55 @@
       <option name="project" value="LOCAL" />
       <updated>1770308927948</updated>
     </task>
-    <task id="LOCAL-00052" summary="fix : suppression code mort sur la navbar">
+    <task id="LOCAL-00052" summary="fix : logo centré en mod mobile">
       <option name="closed" value="true" />
-      <created>1770366040426</created>
+      <created>1770310504254</created>
       <option name="number" value="00052" />
       <option name="presentableId" value="LOCAL-00052" />
       <option name="project" value="LOCAL" />
-      <updated>1770366040426</updated>
+      <updated>1770310504254</updated>
     </task>
-    <task id="LOCAL-00053" summary="feat : Création d'une page d'administration listing des fournisseurs">
+    <task id="LOCAL-00053" summary="feat : ajout d'un numéro de version automatique via la CI">
       <option name="closed" value="true" />
-      <created>1770628024317</created>
+      <created>1770369945257</created>
       <option name="number" value="00053" />
       <option name="presentableId" value="LOCAL-00053" />
       <option name="project" value="LOCAL" />
-      <updated>1770628024317</updated>
+      <updated>1770369945257</updated>
     </task>
-    <option name="localTasksCounter" value="54" />
+    <task id="LOCAL-00054" summary="feat : update numéro de version">
+      <option name="closed" value="true" />
+      <created>1770370216428</created>
+      <option name="number" value="00054" />
+      <option name="presentableId" value="LOCAL-00054" />
+      <option name="project" value="LOCAL" />
+      <updated>1770370216428</updated>
+    </task>
+    <task id="LOCAL-00055" summary="fix : auto-tag-develop.yml">
+      <option name="closed" value="true" />
+      <created>1770370700697</created>
+      <option name="number" value="00055" />
+      <option name="presentableId" value="LOCAL-00055" />
+      <option name="project" value="LOCAL" />
+      <updated>1770370700698</updated>
+    </task>
+    <task id="LOCAL-00056" summary="fix : auto-tag-develop.yml">
+      <option name="closed" value="true" />
+      <created>1770370919043</created>
+      <option name="number" value="00056" />
+      <option name="presentableId" value="LOCAL-00056" />
+      <option name="project" value="LOCAL" />
+      <updated>1770370919043</updated>
+    </task>
+    <task id="LOCAL-00057" summary="feat : test auto-tag-develop.yml (auto incrément version)">
+      <option name="closed" value="true" />
+      <created>1770371073055</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1770371073055</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -743,9 +744,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="fix : modification du script de déploiement pour corriger le problème d'écriture des logs de prod" />
-    <MESSAGE value="fix : doc de déploiement" />
-    <MESSAGE value="fix : doc et script de déploiement" />
     <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" />
@@ -766,20 +764,12 @@
     <MESSAGE value="feat : mise à jour du bon de réception" />
     <MESSAGE value="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)" />
     <MESSAGE value="feat : ajout du responsive sur la navbar et la page d'accueil" />
-    <MESSAGE value="fix : suppression code mort sur la navbar" />
-    <MESSAGE value="feat : Création d'une page d'administration listing des fournisseurs" />
-    <option name="LAST_COMMIT_MESSAGE" value="feat : Création d'une page d'administration listing des fournisseurs" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="php">
-          <url>file://$PROJECT_DIR$/src/Entity/ReceptionPelletBuilding.php</url>
-          <line>6</line>
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
+    <MESSAGE value="fix : logo centré en mod mobile" />
+    <MESSAGE value="feat : ajout d'un numéro de version automatique via la CI" />
+    <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)" />
+    <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

@@ -29,6 +29,7 @@ Ajouter dans le fichier .env du frontend
 * Finalisation de la partie réception de marchandise
 * [#267] Lister les réceptions en attente
 * [#268] Lister les réceptions terminées
+* [#316] Admin liste des transporteurs
 
 ### Changed
 

config/packages/security.yaml

@@ -53,6 +53,8 @@ security:
         - { path: ^/api/users, roles: PUBLIC_ACCESS, methods: [GET] }
         # Doc API (swagger) en public
         - { path: ^/api/docs, roles: PUBLIC_ACCESS }
+        # Version de l'application en public
+        - { path: ^/api/version, roles: PUBLIC_ACCESS, methods: [GET] }
         # Tout le reste nécessite un JWT
         - { path: ^/, roles: IS_AUTHENTICATED_FULLY }
 

config/services.yaml

@@ -8,6 +8,9 @@
 # https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
 parameters:
 
+imports:
+    - { resource: version.yaml }
+
 services:
     # default configuration for services in *this* file
     _defaults:

config/version.yaml

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

frontend/app.vue

@@ -3,3 +3,11 @@
     <NuxtPage />
   </NuxtLayout>
 </template>
+
+<script setup lang="ts">
+const { load } = useAppVersion()
+
+onMounted(() => {
+    load()
+})
+</script>

frontend/composables/useAppVersion.ts

@@ -0,0 +1,17 @@
+export const useAppVersion = () => {
+    const api = useApi()
+    const version = useState<string | null>('app-version', () => null)
+
+    const load = async () => {
+        if (version.value) {
+            return version.value
+        }
+        const response = await api.get<{ version: string }>('version', {}, {
+            toast: false
+        })
+        version.value = response.version
+        return version.value
+    }
+
+    return { version, load }
+}

frontend/layouts/admin.vue

@@ -30,6 +30,9 @@
                     <NuxtLink to="/admin/supplier-list">
                         Fournisseur
                     </NuxtLink>
+                    <NuxtLink to="/admin/carrier/carrier-list">
+                        Transporteur
+                    </NuxtLink>
                 </div>
 
                 <div class="p-4">

frontend/layouts/default.vue

@@ -100,6 +100,9 @@
         <main class="mx-auto w-full max-w-[1280px] pb-0">
             <slot/>
         </main>
+        <footer class="w-full mt-8 bg-primary-500 p-6">
+            <p class="font-bold text-white text-right">v{{ version }}</p>
+        </footer>
     </div>
 </template>
 
@@ -109,6 +112,7 @@ import { useAuthStore } from '~/stores/auth'
 const route = useRoute()
 const auth = useAuthStore()
 const isMenuOpen = ref(false)
+const { version } = useAppVersion()
 
 const closeMenu = () => {
   isMenuOpen.value = false

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

@@ -0,0 +1,51 @@
+<template>
+
+    <div class="flex items-center justify-between ">
+            <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] justify-self-end"
+            >Ajouter
+            </button>
+    </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>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"
+                role="button"
+                tabindex="0"
+                @click="goToCarrier(carrier.id)"
+                @keydown.enter="goToCarrier(carrier.id)"
+            >
+                <div>{{ carrier.name}}</div>
+                <div>{{ carrier.code }}</div>
+            </div>
+        </div>
+
+</template>
+
+<script setup lang="ts">
+import type {CarrierData} from "~/services/dto/carrier-data";
+import {getCarrierList} from "~/services/carrier";
+
+const carrierList = ref<CarrierData[]>()
+const router = useRouter()
+
+const goToCarrier = (id: number|null = null) => {
+    id !== null ? router.push(`/admin/carrier/${id}`) : router.push(`/admin/carrier`)
+}
+
+definePageMeta({
+    layout: 'admin'
+})
+
+onMounted(async () => {
+    carrierList.value = await getCarrierList(false)
+})
+</script>

frontend/pages/login.vue

@@ -46,7 +46,8 @@
       >
         Connexion
       </button>
-    </form>
+          <p class="font-bold">v{{ version }}</p>
+      </form>
   </div>
 </template>
 
@@ -57,6 +58,7 @@ import { useAuthStore } from '~/stores/auth'
 
 const router = useRouter()
 const auth = useAuthStore()
+const { version } = useAppVersion()
 
 definePageMeta({
   layout: 'auth'

src/ApiResource/AppVersion.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\ApiResource;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use App\State\AppVersionProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    operations: [
+        new Get(
+            uriTemplate: '/version',
+            normalizationContext: ['groups' => ['version:read']],
+            provider: AppVersionProvider::class,
+        ),
+    ],
+)]
+final class AppVersion
+{
+    #[Groups(['version:read'])]
+    public string $version = '';
+}

src/State/AppVersionProvider.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\State;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use App\ApiResource\AppVersion;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+
+final readonly class AppVersionProvider implements ProviderInterface
+{
+    public function __construct(
+        #[Autowire('%app.version%')]
+        private string $version,
+    ) {}
+
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): AppVersion
+    {
+        $dto          = new AppVersion();
+        $dto->version = $this->version;
+
+        return $dto;
+    }
+}