diff --git a/public/script.js b/public/script.js index dece77b..6cb6c20 100644 --- a/public/script.js +++ b/public/script.js @@ -43,7 +43,6 @@ submitItemBtn.addEventListener("click", function(e) { xhrPost.onreadystatechange = function() { setTimeout(() => { // horrible hacky fix for 302 redirect - console.log("submit item by lender successful!"); request("/populate-all", "GET", updateDom); }, 500); }; @@ -65,7 +64,6 @@ submitItemBtn.addEventListener("click", function(e) { // var xhrPost = new XMLHttpRequest(); // xhrPost.onreadystatechange = function() { // if (xhrPost.readyState === 4 && xhrPost.status === 200) { -// console.log("post data response successful"); // reqForm.classList.add("hidden"); // var success = document.createElement("div"); // success.innerText = "Loan requested! :)"; @@ -87,13 +85,10 @@ submitItemBtn.addEventListener("click", function(e) { function borrow(id, name) { // reqForm.classList.remove("hidden"); // itemIdInput.value = id; - // console.log("name: ", name); // borrowH3.innerText = "Borrow " + name.toLowerCase(); - console.log(id, name); var xhrPost = new XMLHttpRequest(); xhrPost.onreadystatechange = function() { if (xhrPost.readyState === 4 && xhrPost.status === 200) { - console.log("borrow data response successful"); var success = document.createElement("div"); success.innerText = "Loan requested! :)"; successDiv.appendChild(success); @@ -119,7 +114,6 @@ function borrow(id, name) { searchBtn.addEventListener("click", function(e) { e.preventDefault(); var inputValue = encodeURIComponent(input.value); - console.log("input " + inputValue); // add validation alert if buttons gets clicked without input val if (inputValue.trim() == "") { @@ -142,8 +136,6 @@ function updateDom(err, data) { if (err) { console.log(err); } else { - console.log("updateDom reached"); - var items = JSON.parse(data); var table = document.getElementById("items-table"); clearList(table); @@ -172,7 +164,6 @@ function updateDom(err, data) { if (items.length > 0) { items.forEach(function(item) { - console.log(item); // adding our item names var row = document.createElement("tr"); var name = document.createElement("td"); @@ -247,7 +238,6 @@ regButton.addEventListener("click", function(e) { // checks that email is valid if (regEmail.validity.typeMismatch || regEmail.validity.valueMissing) { - console.log("reached"); error.innerHTML = "Please enter a valid email address"; error.className = "error"; regEmail.classList.add("incorrect-field"); @@ -326,13 +316,10 @@ const psdLogin = document.getElementById("login-password"); const error1 = document.getElementById("error1"); emailLogin.addEventListener("focusout", function(e) { - console.log("HERE"); if (!emailLogin.validity.valid) { - //console.log('email=',emailLogin.value);console.log('here') error1.innerHTML = "Please enter a valid email address"; error1.className = "error"; document.getElementById("login-email").classList.add("invalid-input"); - console.log(emailLogin.classList); } else if (emailLogin.validity.valid) { emailLogin.classList.remove("invalid-input"); error1.classList.remove("error"); diff --git a/src/database/db_build.js b/src/database/db_build.js index 7eebf74..900c1c4 100644 --- a/src/database/db_build.js +++ b/src/database/db_build.js @@ -7,7 +7,6 @@ const sql = fs.readFileSync(`${__dirname}/db_build.sql`).toString(); const runDbBuild = cb => { dbConnection.query(sql, (err, res) => { if (err) throw err; - // console.log("Tables created with result:", res); cb(null, res); }); }; diff --git a/src/handlers.js b/src/handlers.js index ba1ee84..dcb6e7d 100644 --- a/src/handlers.js +++ b/src/handlers.js @@ -67,9 +67,7 @@ const handlers = { }, home(req, res) { - console.log("home reached"); if (req.headers.cookie) { - console.log("checking cookie"); const sessionId = req.headers.cookie.split("=")[1]; passwords.checkSession(sessionId, (err, rows) => { if (err) { @@ -79,15 +77,11 @@ const handlers = { res.writeHead(401, { "Content-Type": "text/html" }); res.end("

Forbidden Access

"); } else { - console.log("cookie valid"); fs.readFile(buildPath("index-loggedin.html"), (err, file) => { - console.log("reading logged in html file"); if (err) { res.writeHead(500, { "Content-Type": "text/html" }); res.end("

Server Error

"); - console.log("home error"); } else { - console.log("returning logged in html file"); res.writeHead(200, { "Content-Type": "text/html" }); res.end(file); } @@ -99,7 +93,6 @@ const handlers = { if (err) { res.writeHead(500, { "Content-Type": "text/html" }); res.end("

Server Error

"); - console.log("home error"); } else { res.writeHead(200, { "Content-Type": "text/html" }); res.end(file); @@ -109,12 +102,10 @@ const handlers = { }, public(req, res, endpoint) { - console.log("endpoint: ", endpoint); fs.readFile(buildPath(endpoint), (err, file) => { if (err) { res.writeHead(404, { "Content-Type": "text/html" }); res.end("

Page not found

"); - console.log("public error"); } else { res.writeHead(200, { "Content-Type": contentType[path.extname(endpoint)] @@ -152,7 +143,6 @@ const handlers = { sessionID, email, (err, result, sssionID) => { - console.log("Store Session func reached"); if (err) { res.writeHead(500, { "Content-Type": "text/html" }); res.end("

Server Error in storeSession func

"); @@ -180,7 +170,6 @@ const handlers = { register(req, res) { if (req.method === "POST") { handlers.collectData(req, (err, data) => { - console.log("collected data"); if (err) { res.writeHead(500, { "Content-Type": "text/html" }); res.end("

Server Error

"); @@ -190,11 +179,9 @@ const handlers = { !data["reg-password"] || !data["fav-colour"] ) { - console.log("data: ", data); res.writeHead(500, { "Content-Type": "text/html" }); res.end("

Server Error

"); } else { - console.log(data); // sanitise data const name = data["reg-name"].replace(/[^a-z0-9_\- ]/gi, ""); const email = data["reg-email"].replace(/[^a-z0-9._\-@+]/gi, ""); @@ -233,10 +220,7 @@ const handlers = { sessionID, email, (err, result, sssionID) => { - console.log("Store Session func reached"); if (err) { - console.log("HERE"); - console.log(err); res.writeHead(500, { "Content-Type": "text/html" }); res.end( "

Server Error in storeSession func

" @@ -282,7 +266,6 @@ const handlers = { if (err) { res.writeHead(500, { "Content-Type": "text/html" }); res.end("

Server Error

"); - console.log("search error"); } else { res.writeHead(200, "Content-type: application/json"); res.end(JSON.stringify(result)); @@ -293,7 +276,6 @@ const handlers = { if (req.method === "POST") { handlers.collectJSON(req, (err, parsedData) => { cookies.getUserDetails(req, (err, result) => { - console.log('results are in: ', result); postData( result.name, result.email, @@ -302,7 +284,6 @@ const handlers = { if (err) { res.writeHead(500, { "Content-Type": "text/html" }); res.end("

Server Error

"); - console.log("postdata error"); } else { res.writeHead(302, { Location: "/success" }); res.end(); @@ -319,7 +300,6 @@ const handlers = { if (err) { res.writeHead(500, { "Content-Type": "text/html" }); res.end("

Server Error

"); - console.log("home error"); } else { res.writeHead(200, { "Content-Type": "text/html" }); res.end(file); @@ -329,11 +309,9 @@ const handlers = { addItem(req, res) { // SQL query: Add user // SQL query: Add item from that user - console.log("addItem reached"); if (req.method === "POST") { if (req.headers.cookie) { const sessionId = req.headers.cookie.split("=")[1]; - console.log(sessionId); passwords.checkSession(sessionId, (err, rows) => { if (err) { res.writeHead(500, { "Content-Type": "text/html" }); @@ -368,7 +346,6 @@ const handlers = { } }); } else { - console.log("no cookie"); res.writeHead(401, { "Content-Type": "text/html" }); res.end("

401 Forbidden

"); } @@ -388,10 +365,8 @@ const handlers = { // if (err) { // response.writeHead(500, "Content-Type:text/html"); // response.end("

Sorry, there was a problem getting the users

"); - // console.log(err); // } else { getData("", (err, res) => { - console.log("reached again"); if (err) { response.writeHead(500, "Content-Type:text/html"); response.end("

Sorry, there was a problem getting the users

"); diff --git a/src/passwords.js b/src/passwords.js index 1b33247..e1d49b8 100644 --- a/src/passwords.js +++ b/src/passwords.js @@ -36,7 +36,6 @@ const passwords = { }, storeSession: (sessionID, email, cb) => { - console.log("session ID: ", sessionID); passwords.deletePreviousSession(email, (err, res) => { if (err) return cb(err); dbConnection.query( @@ -66,8 +65,6 @@ const passwords = { `SELECT email FROM active_sessions WHERE session_id=$1`, [sessionId], (err, res) => { - console.log("session id: ", sessionId); - console.log("email1: ", res); if (err) return cb(err); return cb(null, res.rows); } diff --git a/src/queries/getData.js b/src/queries/getData.js index e1db811..c0e5e15 100644 --- a/src/queries/getData.js +++ b/src/queries/getData.js @@ -23,7 +23,6 @@ const getPassword = (qry, cb) => { [qry], (err, res) => { if (err) { - //console.log('DBQURERY');console.log(err); return cb(err); } return cb(null, res.rows); diff --git a/src/queries/postData.js b/src/queries/postData.js index 3660051..0ab795d 100644 --- a/src/queries/postData.js +++ b/src/queries/postData.js @@ -27,7 +27,6 @@ const checkUser = (email, cb) => { `SELECT id FROM users WHERE email=$1`, [email], (err, res) => { - console.log('checkUser result: ', res); if (err) return cb(err); if (res.rowCount === 1) cb(null, res); else cb(null, false); @@ -48,7 +47,6 @@ const postData = (name, email, itemId, cb) => { [name, email], (err, res) => { if (err) { - console.log(err); return cb(err); } borrowerId = res.rows[0].id; @@ -60,7 +58,6 @@ const postData = (name, email, itemId, cb) => { }; const addItem = (name, description, lenderId, cb) => { - console.log("add item reached"); dbConnection.query( `INSERT INTO items (name, description, lender_id) VALUES ('${name}', '${description}', ${lenderId}) RETURNING id`, (err, res) => { diff --git a/src/router.js b/src/router.js index 8cdfe0b..45f7b01 100644 --- a/src/router.js +++ b/src/router.js @@ -8,15 +8,12 @@ const router = (req, res) => { } else if (endpoint.startsWith("search?q=")) { handlers.search(req, res, endpoint); // some arguments maybe } else if (endpoint === "register") { - console.log("reached register"); handlers.register(req, res); } else if (endpoint === "request-item") { handlers.requestItem(req, res); } else if (endpoint === "add-item") { - console.log("add-item"); handlers.addItem(req, res, endpoint); // some arguments } else if (endpoint === "populate-all") { - console.log("populate"); handlers.testData(req, res); } else if (endpoint === "success") { handlers.success(req, res);