Merge branch 'develop' into fix/-style-global

# Conflicts: # .idea/workspace.xml # frontend/layouts/default.vue
fix : style global de l'app
2026-02-09 16:09:19 +01:00 · 2026-02-09 16:08:29 +01:00 · 2026-02-09 15:04:23 +00:00 · 2026-02-09 15:04:16 +00:00
6 changed files with 10 additions and 12 deletions
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -5,7 +5,7 @@
      <driver-ref>postgresql</driver-ref>
      <synchronize>true</synchronize>
      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
-      <jdbc-url>jdbc:postgresql://localhost:5432/ferme</jdbc-url>
+      <jdbc-url>jdbc:postgresql://localhost:5433/ferme</jdbc-url>
      <working-dir>$ProjectFileDir$</working-dir>
    </data-source>
    <data-source source="LOCAL" name="Ferme recette" uuid="ae622167-c834-4e7b-87a5-c1721036f5dc">
@@ -16,4 +16,4 @@
      <working-dir>$ProjectFileDir$</working-dir>
    </data-source>
  </component>
-</project>
+</project>
--- a/config/version.yaml
+++ b/config/version.yaml
@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.35'
+    app.version: '0.0.36'
--- a/frontend/layouts/default.vue
+++ b/frontend/layouts/default.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="min-h-screen bg-white text-neutral-900">
+    <div class="min-h-screen bg-white text-neutral-900 flex flex-col">
        <header class="w-full border-b border-neutral-200 bg-primary-500">
            <div class="flex w-full items-center justify-center px-6 py-4">
                <button
@@ -20,13 +20,11 @@
                            Accueil
                        </a>
                    </NuxtLink>
-                    <NuxtLink
-                        to="/admin/dashboard" custom v-slot="{ href, navigate, isActive }"
-                        v-if="auth.isAdmin"
-                    >
+                    <NuxtLink to="/admin/dashboard" custom v-slot="{ href, navigate, isExactActive }">
                        <a
                            :href="href"
                            @click="navigate"
+                            :class="isExactActive ? 'opacity-100' : 'opacity-50'"
                        >
                            Admin
                        </a>
@@ -100,7 +98,7 @@
                </aside>
            </transition>
        </header>
-        <main class="mx-auto w-full max-w-[1280px] pb-0">
+        <main class="mx-auto w-full max-w-[1280px] flex-1 pb-0">
            <slot/>
        </main>
        <footer class="w-full mt-8 bg-primary-500 p-6">
--- a/frontend/pages/reception/[[id]].vue
+++ b/frontend/pages/reception/[[id]].vue
@@ -1,6 +1,6 @@
 <template>
    <div>
-        <div class="flex justify-between h-[52px] mb-[80px]">
+        <div class="flex justify-between h-[52px] mb-[80px] mt-16">
            <div class="flex flex-1 mr-16">
                <UiStepper
                    :labels="RECEPTION_STEP_LABELS"
--- a/frontend/pages/reception/finish-reception.vue
+++ b/frontend/pages/reception/finish-reception.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="flex items-center justify-start gap-10">
+    <div class="flex items-center justify-start gap-10 mt-16 cursor-pointer">
            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" />
            <h1 class="text-3xl font-bold uppercase">listes des réceptions finie</h1>
    </div>
--- a/frontend/pages/reception/waiting-reception.vue
+++ b/frontend/pages/reception/waiting-reception.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="flex items-center justify-between ">
+    <div class="flex items-center justify-between mt-16 cursor-pointer">
        <div class="flex items-center gap-10">
            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" />
            <h1 class="text-3xl font-bold uppercase">listes des réceptions en attente</h1>
Author	SHA1	Message	Date
tristan	93d1340c1c	Merge branch 'develop' into fix/-style-global # Conflicts: # .idea/workspace.xml # frontend/layouts/default.vue	2026-02-09 16:09:19 +01:00
tristan	e06636bc15	fix : style global de l'app	2026-02-09 16:08:29 +01:00
gitea-actions	d3dfde7060	chore: bump version to v0.0.36 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m13s Details	2026-02-09 15:04:23 +00:00
sroy	90c2cfc665	[#317 ] Création d'une page d'administration : modification/création d'un transporteur (!18 ) All checks were successful Auto Tag Develop / tag (push) Successful in 5s Details \| Numéro du ticket \| Titre du ticket \| \|------------------\|-----------------\| \| #317 \| Création d'une page d'administration : modification/création d'un 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: #18 Reviewed-by: Autin <tristan@yuno.malio.fr> Co-authored-by: sroy <sebastien@yuno.malio.fr> Co-committed-by: sroy <sebastien@yuno.malio.fr>	2026-02-09 15:04:16 +00:00