From d31e90b5b4b1ed4cd73fa3749b38f1f49ab88466 Mon Sep 17 00:00:00 2001
From: Julien Debray <julien.debray@etu.hesge.ch>
Date: Wed, 19 Apr 2023 14:05:55 +0200
Subject: [PATCH] Correction
---
frontend/src/Connexion.js | 2 +-
frontend/src/PriseRendezVous.js | 1 +
frontend/src/components/AccountCard.js | 2 +-
frontend/src/components/CreneauCard.js | 4 +--
frontend/src/data/creneaux.js | 40 +++++++++++++-------------
mobile/package.json | 2 +-
6 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/frontend/src/Connexion.js b/frontend/src/Connexion.js
index 410918370..99c8e0b27 100644
--- a/frontend/src/Connexion.js
+++ b/frontend/src/Connexion.js
@@ -40,7 +40,7 @@ export default function Connexion() {
const result = response.json();
result.then((result) => {
console.log(result);
- if (result[0].isValid === 1) {
+ if (result[0].IsValid === 1) {
console.log("Vous êtes connecté.");
sessionStorage.setItem('isLogged', true);
sessionStorage.setItem('isAdmin', result[0].IsAdmin);
diff --git a/frontend/src/PriseRendezVous.js b/frontend/src/PriseRendezVous.js
index 8c192f57a..232575da8 100644
--- a/frontend/src/PriseRendezVous.js
+++ b/frontend/src/PriseRendezVous.js
@@ -178,6 +178,7 @@ const PriseRendezVous = () => {
</div>
<div className="grid grid-cols-4 gap-4">
{creneauxBoutique.map((creneau) => {
+ console.log(creneau)
return (
<CreneauCard
choisirCreneau={choisirCreneau}
diff --git a/frontend/src/components/AccountCard.js b/frontend/src/components/AccountCard.js
index 054f5a269..7c66cc9ec 100644
--- a/frontend/src/components/AccountCard.js
+++ b/frontend/src/components/AccountCard.js
@@ -7,7 +7,7 @@ function accountCard({
}
let btnText = isAdmin === 1 ? "Passer client" : "Passer admin";
- console.log("OK");
+
return (
<div className=" rounded overflow-hidden shadow-lg">
<div className="px-6 pt-2">
diff --git a/frontend/src/components/CreneauCard.js b/frontend/src/components/CreneauCard.js
index dd89660b2..eec2e8ef6 100644
--- a/frontend/src/components/CreneauCard.js
+++ b/frontend/src/components/CreneauCard.js
@@ -15,14 +15,14 @@ function BoutiqueCard({ choisirCreneau, Heure, disponible, isSelected, setIsSele
div.classList.toggle("bg-success");
});
});
-
+ console.log(disponible);
return (
<div
className={`testclass h-100 max-w-sm rounded overflow-hidden shadow-lg ${disponible ? 'hover:bg-blue-200' : 'opacity-50 cursor-not-allowed'} ${isSelected === Heure ? 'bg-green-300 hover:bg-green-300' : ''}`}
onClick={() => handleSelect(Heure)}
>
<div className="px-3 py-4 pt-2">
- <div className={"font-bold text-xl"}>{Heure}</div>
+ <div className={"font-bold text-xl"}>{Heure.substring(0, 5)}</div>
</div>
</div>
)
diff --git a/frontend/src/data/creneaux.js b/frontend/src/data/creneaux.js
index 2fac99f56..e0de3d5e8 100644
--- a/frontend/src/data/creneaux.js
+++ b/frontend/src/data/creneaux.js
@@ -1,102 +1,102 @@
export const creneaux = [
{
id: 0,
- horaire: "08:00",
+ horaire: "08:00:00",
disponible: true,
},
{
id: 1,
- horaire: "08:30",
+ horaire: "08:30:00",
disponible: true,
},
{
id: 2,
- horaire: "09:00",
+ horaire: "09:00:00",
disponible: true,
},
{
id: 3,
- horaire: "09:30",
+ horaire: "09:30:00",
disponible: true,
},
{
id: 4,
- horaire: "10:00",
+ horaire: "10:00:00",
disponible: true,
},
{
id: 5,
- horaire: "10:30",
+ horaire: "10:30:00",
disponible: true,
},
{
id: 6,
- horaire: "11:00",
+ horaire: "11:00:00",
disponible: true,
},
{
id: 7,
- horaire: "11:30",
+ horaire: "11:30:00",
disponible: true,
},
{
id: 8,
- horaire: "12:00",
+ horaire: "12:00:00",
disponible: true,
},
{
id: 9,
- horaire: "12:30",
+ horaire: "12:30:00",
disponible: true,
},
{
id: 10,
- horaire: "13:00",
+ horaire: "13:00:00",
disponible: true,
},
{
id: 11,
- horaire: "13:30",
+ horaire: "13:30:00",
disponible: true,
},
{
id: 12,
- horaire: "14:00",
+ horaire: "14:00:00",
disponible: true,
},
{
id: 13,
- horaire: "14:30",
+ horaire: "14:30:00",
disponible: true,
},
{
id: 14,
- horaire: "15:00",
+ horaire: "15:00:00",
disponible: true,
},
{
id: 15,
- horaire: "15:30",
+ horaire: "15:30:00",
disponible: true,
},
{
id: 16,
- horaire: "16:00",
+ horaire: "16:00:00",
disponible: true,
},
{
id: 17,
- horaire: "16:30",
+ horaire: "16:30:00",
disponible: true,
},
{
id: 18,
- horaire: "17:00",
+ horaire: "17:00:00",
disponible: true,
},
{
id: 19,
- horaire: "17:30",
+ horaire: "17:30:00",
disponible: true,
},
]
diff --git a/mobile/package.json b/mobile/package.json
index fc7020df2..a144a0a6d 100644
--- a/mobile/package.json
+++ b/mobile/package.json
@@ -15,6 +15,7 @@
"@react-navigation/native": "6.1.2",
"@react-navigation/stack": "6.3.11",
"appjs": "0.0.20",
+ "appjs-darwin": "^0.0.19",
"emailjs-com": "^3.2.0",
"expo": "~47.0.12",
"expo-font": "11.0.1",
@@ -34,4 +35,3 @@
},
"private": true
}
-
--
GitLab