Le SELECT du choix de rôle devient un radio
This commit is contained in:
34
app.js
34
app.js
@@ -6,7 +6,6 @@ const path = require("path")
|
||||
const publicDir = path.join(__dirname, './public')
|
||||
const bcrypt = require("bcryptjs")
|
||||
var bodyParser = require('body-parser')
|
||||
var cookieParser = require("cookie-parser")
|
||||
|
||||
|
||||
/* Connexion à la BDD MySQL */
|
||||
@@ -28,9 +27,7 @@ db.connect((error) => {
|
||||
|
||||
app.set('view engine', 'hbs');
|
||||
app.use(express.static(publicDir));
|
||||
/* Pour utiliser le bootstrap local */
|
||||
app.use('/css', express.static(__dirname + '/node_modules/bootstrap/dist/css'));
|
||||
app.use(cookieParser());
|
||||
|
||||
/* configure the Express.js server to receive the form values as JSON */
|
||||
app.use(bodyParser.urlencoded({extended: false}));
|
||||
@@ -44,7 +41,7 @@ app.get("/", (req, res) => {
|
||||
let today = dateFormat(new Date(), "yyyymmdd");
|
||||
|
||||
// On récupère la liste des sessions actives
|
||||
db.query('SELECT ID, topic, DATE_FORMAT(scheduled_on, "%d/%m/%Y") as "date" FROM session WHERE DATE_FORMAT(scheduled_on, "%Y%m%d") >= ?', [today], async (error, result) => {
|
||||
db.query('SELECT ID, topic, DATE_FORMAT(scheduled_on, "%d/%m/%Y") as "date", DATE_FORMAT(scheduled_on, "%Hh%i") as "heure" FROM session WHERE DATE_FORMAT(scheduled_on, "%Y%m%d") >= ?', [today], async (error, result) => {
|
||||
if(error){
|
||||
console.log(error);
|
||||
}
|
||||
@@ -140,10 +137,12 @@ app.post("/auth/check-login", (req, res) => {
|
||||
}
|
||||
})
|
||||
|
||||
//res.cookie("authorization", userId, { maxAge: 900000, httpOnly: true });
|
||||
|
||||
let cible = (role == 'P') ? 'master' : 'slave';
|
||||
return res.render(cible);
|
||||
if (role == 'A') {
|
||||
res.redirect('https://mia.thecoredev.fr');
|
||||
}
|
||||
else {
|
||||
res.redirect('https://mia.thecoredev.fr');
|
||||
}
|
||||
}
|
||||
else {
|
||||
return res.render('login', {
|
||||
@@ -161,12 +160,25 @@ app.post("/auth/check-login", (req, res) => {
|
||||
app.post("/auth/check-session", (req, res) => {
|
||||
|
||||
const { session, session_password, role } = req.body
|
||||
let listeSessions;
|
||||
|
||||
let today = dateFormat(new Date(), "yyyymmdd");
|
||||
db.query('SELECT ID, topic, DATE_FORMAT(scheduled_on, "%d/%m/%Y") as "date", DATE_FORMAT(scheduled_on, "%Hh%i") as "heure" FROM session WHERE DATE_FORMAT(scheduled_on, "%Y%m%d") >= ?', [today], async (error, result) => {
|
||||
if(error){
|
||||
console.log(error);
|
||||
}
|
||||
if (result.length == 0) {
|
||||
res.redirect('');
|
||||
}
|
||||
else {
|
||||
listeSessions = result;
|
||||
}
|
||||
});
|
||||
|
||||
db.query('SELECT password, topic, DATE_FORMAT(scheduled_on, "%d/%m/%Y %H:%i") as "date" FROM session WHERE ID = ?', [session], async (error, result) => {
|
||||
if(error){
|
||||
console.log(error)
|
||||
}
|
||||
|
||||
if( result.length == 0 ) {
|
||||
return res.render('login-session', {
|
||||
error: 'Session inconnue : veuillez saisir un identifiant de session valide'
|
||||
@@ -174,12 +186,12 @@ app.post("/auth/check-session", (req, res) => {
|
||||
}
|
||||
else {
|
||||
if (result[0].password === session_password) {
|
||||
//res.send(req.cookies);
|
||||
return res.render('login', {"session": session, "role": role, "topic": result[0].topic, "session_date": result[0].date})
|
||||
}
|
||||
else {
|
||||
return res.render('login-session', {
|
||||
error: 'Mot de passe incorrect : corriger votre saisie'
|
||||
"error": "Mot de passe incorrect : corriger votre saisie",
|
||||
"select": listeSessions
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user