From 4a68b5a72443c5f4498945d463095e4d57b9059a Mon Sep 17 00:00:00 2001 From: TheCoreDev Date: Thu, 23 Nov 2023 16:29:16 +0100 Subject: [PATCH] Utilisation de mysql2 + renommage session.js --- app.js | 17 ++++------------- public/{scripts-session.js => session.js} | 2 +- views/create-session.hbs | 2 +- 3 files changed, 6 insertions(+), 15 deletions(-) rename public/{scripts-session.js => session.js} (95%) diff --git a/app.js b/app.js index 05d83e3..2be76ce 100644 --- a/app.js +++ b/app.js @@ -1,5 +1,5 @@ const express = require('express') -const mysql = require("mysql") +const mysql = require("mysql2") const dotenv = require('dotenv') const app = express() const path = require("path") @@ -30,19 +30,10 @@ db.connect((error) => { app.set('view engine', 'hbs'); app.use(express.static(publicDir)); app.use('/css', express.static(__dirname + '/node_modules/bootstrap/dist/css')); +app.use('/css', express.static(__dirname + '/node_modules/@eonasdan/tempus-dominus/dist/css')); +app.use('/js', express.static(__dirname + '/node_modules/@eonasdan/tempus-dominus/dist/js')); app.use(bodyParser.urlencoded({extended: false})); -app.use(express.json()) - - -async function recupListeSessions() { - let today = functions.getNowDate("yyyymmdd"); - - // On récupère la liste des sessions actives et pour lesquelles il reste de la place - db.query('SELECT ID, topic, DATE_FORMAT(scheduled_on, "%d/%m/%Y") as "date", DATE_FORMAT(scheduled_on, "%Hh%i") as "heure", IF(nb_of_attended-nb_of_participants=0, true, false) as "maxAtteint" FROM session WHERE DATE_FORMAT(scheduled_on, "%Y%m%d") >= ?', [today], async (error, result) => { - if(error){ console.log(error); } - return result; - }); -} +app.use(bodyParser.json()); // ******************************************* Arrivée sur la page d'accueil ******************************************* diff --git a/public/scripts-session.js b/public/session.js similarity index 95% rename from public/scripts-session.js rename to public/session.js index f057495..d6a911f 100644 --- a/public/scripts-session.js +++ b/public/session.js @@ -1,8 +1,8 @@ // DatePicker sur l'écran de création d'une session window.datetimepicker1 = $('#datetimepicker1'); + datetimepicker1.tempusDominus({ - //put your config here allowInputToggle: true, stepping: 15, localization: { diff --git a/views/create-session.hbs b/views/create-session.hbs index 5457e23..53b8a19 100644 --- a/views/create-session.hbs +++ b/views/create-session.hbs @@ -13,7 +13,7 @@ - +