diff --git a/src/app/(dashboard)/assign-zone-project/page.jsx b/src/app/(dashboard)/assign-zone-project/page.jsx index c9484c0ff1068b79421a715815236496f82448af..f3e0a85c02405dc0dd284f6aa272ee568ff2def9 100644 --- a/src/app/(dashboard)/assign-zone-project/page.jsx +++ b/src/app/(dashboard)/assign-zone-project/page.jsx @@ -309,7 +309,7 @@ const AffectingZoneProject = () => { }} { (listProjectsSemiAffected && listProjectsSemiAffected.length) ?
-
diff --git a/src/app/(dashboard)/consultation-reservations/BookedUsersTable.jsx b/src/app/(dashboard)/consultation-reservations/BookedUsersTable.jsx index f16e4861bbc96cf3464c135cf1883a34d4a2b4ba..ad6fc10791af7e6c3a11f36b5594acf7a99ad42d 100644 --- a/src/app/(dashboard)/consultation-reservations/BookedUsersTable.jsx +++ b/src/app/(dashboard)/consultation-reservations/BookedUsersTable.jsx @@ -9,12 +9,12 @@ const BookedUsersTable = ({bookedPlaces, presence}) => {
{presence && } {!presence && } diff --git a/src/app/(dashboard)/consultation-reservations/page.jsx b/src/app/(dashboard)/consultation-reservations/page.jsx index e56a7da7f8aaecbb90a304b0cc629a1f0f467076..a1ce7ba0ae266e40c204a52e2284fe445b3414d1 100644 --- a/src/app/(dashboard)/consultation-reservations/page.jsx +++ b/src/app/(dashboard)/consultation-reservations/page.jsx @@ -331,7 +331,7 @@ const Reservation = () => { onClick={() => { setSelectedZone({floorId: null, zoneId: null}) setNameProjectFilter("") - } } + }} >

Réinitialiser

@@ -362,40 +362,49 @@ const Reservation = () => { {(selectedZone.floorId && !isLoadingData) &&
- {!(floors.find((element) => element.id == selectedZone.floorId).image) ?
-
-
- - Aucune Illustration fournie pour cet étage + {!(floors.find((element) => element.id == selectedZone.floorId).image) ? +
+
+
+ + Aucune Illustration fournie pour cet étage +
-
- : -
- element.id == selectedZone.floorId).image} className='w-full [aspect-ratio:2.5]'> -
+ : +
+ element.id == selectedZone.floorId).image} + className='w-full [aspect-ratio:2.5]'> +
} - {(!isLoadingData) &&
- {/*selectedZone.floorId*/} - {floors.filter((element) => element.id == selectedZone.floorId).map((floor, index) => { - return floor.zones?.map((zone, index) => { - if (selectedZone.zoneId == zone.id && selectedZone.floorId == floor.id) return
setSelectedZone({floorId: floor.id, zoneId: zone.id})} - key={index} - className='rounded-md not-first:-left-2 text-white relative whitespace-nowrap flex items-center justify-center border border-[#B2CEDE] text-xs md:text-sm lg:text-base px-5 lg:px-10 h-9 bg-[#B2CEDE]'> -

Etage {floor.numero} - Zone {zone.nom}

-
- return
setSelectedZone({floorId: floor.id, zoneId: zone.id})} - className='cursor-pointer not-first:-left-2 hover:bg-neutral-100 duration-300 rounded-md text-[#8E8D8D] relative whitespace-nowrap border flex items-center justify-center border-[#D9D9D9] text-xs md:text-sm lg:text-base lg:px-10 px-5 h-9 bg-white'> -

Etage {floor.numero} - Zone {zone.nom}

-
- }) - })} -
} + {(!isLoadingData) && +
+ {/*selectedZone.floorId*/} + {floors.filter((element) => element.id == selectedZone.floorId).map((floor, index) => { + return floor.zones?.map((zone, index) => { + if (selectedZone.zoneId == zone.id && selectedZone.floorId == floor.id) return
setSelectedZone({floorId: floor.id, zoneId: zone.id})} + key={index} + className='rounded-md not-first:-left-2 text-white relative whitespace-nowrap flex items-center justify-center border border-[#B2CEDE] text-xs md:text-sm lg:text-base px-5 lg:px-10 h-9 bg-[#B2CEDE]'> +

Etage {floor.numero} - Zone {zone.nom}

+
+ return
setSelectedZone({ + floorId: floor.id, + zoneId: zone.id + })} + className='cursor-pointer not-first:-left-2 hover:bg-neutral-100 duration-300 rounded-md text-[#8E8D8D] relative whitespace-nowrap border flex items-center justify-center border-[#D9D9D9] text-xs md:text-sm lg:text-base lg:px-10 px-5 h-9 bg-white'> +

Etage {floor.numero} - Zone {zone.nom}

+
+ }) + })} +
}
}
@@ -436,9 +445,9 @@ const Reservation = () => {
}
-
+
- +
diff --git a/src/app/auth/login/page.jsx b/src/app/auth/login/page.jsx index 62afb337d3584b2bc9ab1596e538a396f167201e..690dcca62084ba67dd408c19c1d355e0a3bff024 100644 --- a/src/app/auth/login/page.jsx +++ b/src/app/auth/login/page.jsx @@ -17,6 +17,11 @@ const LoginPage = () => { const [messages, setMessages] = useState(''); const [isLoading, setIsLoading] = useState(false) const router = useRouter(); + const [isPasswordVisible, setIsPasswordVisible] = useState(false); + + const togglePasswordVisibility = () => { + setIsPasswordVisible(!isPasswordVisible); + }; const handleSubmit = (event) => { event.preventDefault(); @@ -62,8 +67,6 @@ const LoginPage = () => { className="w-full md:min-h-0 min-h-screen md:justify-start items-center justify-center py-14 rounded-lg flex flex-col">

Connectez-vous à notre plateforme

-

Vous n avez pas de compte ? Créer un compte -

@@ -85,15 +88,17 @@ const LoginPage = () => {
setPassword(e.target.value)} /> - +