From 0c663466bf317f9fbe04ab9fed038ce2ad753ecf Mon Sep 17 00:00:00 2001
From: Amber Elferink <a.s.elferink@students.uu.nl>
Date: Sun, 8 Apr 2018 00:05:30 +0200
Subject: [PATCH] geeft goede alerts
---
public/javascripts/login.js | 9 +++++----
routes/checkLogin.js | 6 ------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/public/javascripts/login.js b/public/javascripts/login.js
index 7ec471b..26a9fda 100644
--- a/public/javascripts/login.js
+++ b/public/javascripts/login.js
@@ -28,11 +28,9 @@
function validate() {
var un = $('#username').val();
var pw = $('#password').val();
- var valid = false;
postLogin(function (returnValue) {
- console.log(returnValue);
- //giveAlert(returnValue);
+ giveAlert(returnValue);
}, un, pw);
/*var usernameArray = ["Vlad", "bob"];
@@ -47,7 +45,6 @@ function validate() {
}
function postLogin(callback, un, pw) {
- console.log(un,pw)
$.ajax({
type: 'POST',
url: '/api/checkLogin',
@@ -72,4 +69,8 @@ function giveAlert(returnValue) {
if (returnValue == true) {
alert("Login was successful");
}
+ else
+ {
+ alert("Username or password is incorrect");
+ }
}
\ No newline at end of file
diff --git a/routes/checkLogin.js b/routes/checkLogin.js
index 31205fa..739f241 100644
--- a/routes/checkLogin.js
+++ b/routes/checkLogin.js
@@ -46,16 +46,10 @@ function checkLoginWithDatabase(callback, loginData){
db.serialize(function () {
db.all("SELECT * FROM Persons WHERE Persons.username = ?", [loginData.username], function (err, row) {
- console.log(row.length);
for(var i = 0; i < row.length; i++) {
-
- console.log(row);
-
if (err) {
return callback(err);
}
- console.log(row[i].password);
- console.log(loginData.password);
if (row == undefined) {
//username not found in database
callback(undefined, false);
--
GitLab