Compare commits

...

2 Commits

Author SHA1 Message Date
93d1340c1c Merge branch 'develop' into fix/-style-global
# Conflicts:
#	.idea/workspace.xml
#	frontend/layouts/default.vue
2026-02-09 16:09:19 +01:00
e06636bc15 fix : style global de l'app 2026-02-09 16:08:29 +01:00
5 changed files with 9 additions and 11 deletions

2
.idea/dataSources.xml generated
View File

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

View File

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

View File

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

View File

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

View File

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