From eb90f9917883c82cb688b5eeb4429321d3e1592a Mon Sep 17 00:00:00 2001 From: Spacewiorblue Date: Thu, 2 Sep 2021 12:12:30 -0300 Subject: [PATCH] =?UTF-8?q?Add=20if=20para=20verificar=20se=20o=20login=20?= =?UTF-8?q?=C3=A9=20de=20usuario=20ou=20funcionario?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/login.js | 22 +++++++++++++--------- src/register.js | 2 +- src/register_worker.js | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/login.js b/src/login.js index b285868..3bd8add 100644 --- a/src/login.js +++ b/src/login.js @@ -2,18 +2,18 @@ const crypto = require("crypto"); const db = require("../src/postgres"); const notyf = new Notyf({ - position: { - x: "right", - y: "top", - }}); + position: { + x: "right", + y: "top", + }, +}); db.connect(); const button = document.getElementById("login-btn"); const user = document.getElementById("username"); button.addEventListener("click", function () { let password = document.getElementById("password").value; - //FAZER CAMPO ISWORKER NA TABELA USUARIO PARA FACILITAR O LOGIN - const query = `select usuario.email, usuario.senha from usuario where usuario.email='${user.value}'`; + const query = `select usuario.email, usuario.senha, usuario.funcionario from usuario where usuario.email='${user.value}'`; db.query(query, (err, res) => { if (err) { console.error(err); @@ -21,13 +21,17 @@ button.addEventListener("click", function () { password = crypto.createHash("sha256").update(password).digest("hex"); if (res.rowCount === 0) { - notyf.error('Usuário não encontrado'); + notyf.error("Usuário não encontrado"); } else { if (res.rows[0].email === user.value) { if (res.rows[0].senha === password) { - window.location.href = "../pages/home.html"; + if (res.rows[0].funcionario === true) { + window.location.href = "../pages/home.html"; + } else { + window.location.href = "../pages/home_user.html"; + } } else { - notyf.error('Senha incorreta!'); + notyf.error("Senha incorreta!"); } } } diff --git a/src/register.js b/src/register.js index 01ff843..397702e 100644 --- a/src/register.js +++ b/src/register.js @@ -44,7 +44,7 @@ button.addEventListener("click", function () { console.log(err); } cityNumber = res.rows[0].id; - const query = `insert into usuario values(default,${cpf.value.replaceAll(".", "").replaceAll("-", "")},'${name.value}','${phone.value}','${email.value}','${password}','${birthdate.value}',${cityNumber})`; + const query = `insert into usuario values(default,${cpf.value.replaceAll(".", "").replaceAll("-", "")},'${name.value}','${phone}','${email.value}','${password}','${birthdate.value}',${cityNumber})`; console.log(query); db.query(query, (err, res) => { if (err) { diff --git a/src/register_worker.js b/src/register_worker.js index ab9b2fb..024ae37 100644 --- a/src/register_worker.js +++ b/src/register_worker.js @@ -47,7 +47,6 @@ button.addEventListener("click", function () { console.log(err); } cityNumber = res.rows[0].id; - //fazer campo data de admissao const query = `insert into usuario values(default,${cpf.value.replaceAll(".", "").replaceAll("-", "")},'${name.value}','${phone.value}','${email.value}','${password}','${birthdate.value}',${cityNumber},${admin},'true')`; console.log(query); db.query(query, (err, res) => { @@ -56,6 +55,7 @@ button.addEventListener("click", function () { console.log(err); } else { notyf.success("Cadastro realizado com sucesso!"); + window.location.href = "../pages/home.html"; } console.log(res); });