From d5d2298f06afee349f07ba4c1ae9ecc3e98f1555 Mon Sep 17 00:00:00 2001 From: TheCoreDev Date: Sat, 11 Nov 2023 22:49:47 +0100 Subject: [PATCH] =?UTF-8?q?Ca=20marche=20sur=20r=C3=A9servation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 13 +++++++----- public/styles.css | 7 +++++++ views/reservation.hbs | 47 +++++++++++++++++++++++++++++++++++++------ 3 files changed, 56 insertions(+), 11 deletions(-) diff --git a/app.js b/app.js index ccdd5e1..5e04183 100644 --- a/app.js +++ b/app.js @@ -29,7 +29,7 @@ app.use('/css', express.static(__dirname + '/node_modules/bootstrap/dist/css')); app.use(express.json()); app.get("/", (req, res) => { - db.query('SELECT c.id, c.libelle, c.prix, c.photo, c.lien, p.prenom as "demandeur", c.achete as "achete", p2.prenom as "responsable" FROM cadeau c LEFT OUTER JOIN participations pc on pc.cadeau = c.id LEFT OUTER JOIN participant p on p.id = pc.personne LEFT OUTER JOIN participant p2 on p2.id = pc.responsable', async (error, resultCadeaux) => { + db.query('SELECT c.id as "id", c.libelle as "libelle", c.prix, c.photo as "photo", c.lien, p.prenom as "demandeur", c.achete as "achete", p2.prenom as "responsable" FROM cadeau c LEFT OUTER JOIN participations pc on pc.cadeau = c.id LEFT OUTER JOIN participant p on p.id = pc.personne LEFT OUTER JOIN participant p2 on p2.id = pc.responsable', async (error, resultCadeaux) => { let message; if(error){ @@ -44,13 +44,16 @@ app.get("/", (req, res) => { }); -app.get("/reserve", (req, res) => { - db.query('SELECT libelle, prix, photo, lien FROM cadeau WHERE id = ?', [req.query.id], async (error, result) => { - if(error){ +app.get("/reserve", (req, res) => { + db.query('SELECT id, libelle, prix, photo, lien FROM cadeau WHERE id = ?', [req.query.id], async (error, result) => { + if(error) { console.log(error); } if (result.length > 0) { - res.render('reservation', { retour: result } ); + + db.query('SELECT id, prenom FROM participant', async (error, select) => { + res.render('reservation', { "id": result[0].id, "libelle": result[0].libelle, "photo": result[0].photo, "responsable": select } ); + }) } }) }); diff --git a/public/styles.css b/public/styles.css index f23176c..3a39435 100644 --- a/public/styles.css +++ b/public/styles.css @@ -26,6 +26,10 @@ background-color: aliceblue; } +.tableau ul:first-child li { + font-weight: bold; +} + figure img { height: 80px !important; } @@ -34,3 +38,6 @@ figure img:hover { height: 180px !important; } +.image { + width: 300px; +} \ No newline at end of file diff --git a/views/reservation.hbs b/views/reservation.hbs index 9276dd1..e135f56 100644 --- a/views/reservation.hbs +++ b/views/reservation.hbs @@ -16,13 +16,48 @@

{{ message }}

-
-
- Pas d'image -
{{libelle}}
-
- + +
+
{{libelle}}
+
+
+
+ +
+
+ + +
+
+ +
+ + +
+
+ + +
+
+
+ + +
+ +
+
+