Merge pull request #29 from FACN7/ebraheem

sending data to dom Relates #28
FACN7 · Oct 30, 2019 · e297fff · e297fff
2 parents e3cb7e6 + 659206d
commit e297fff
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/public/private.js b/public/private.js
@@ -1,12 +1,18 @@
-function request(url) {
-    return new Promise((resolve, reject) => {
-      const xhr = new XMLHttpRequest();
-      xhr.open("GET", url);
-      xhr.onload = () => resolve(xhr.responseText);
-      xhr.onerror = () => reject(xhr.statusText);
-      xhr.send();
-    });
+function request(url, cb) {
+    var xhr = new XMLHttpRequest();
+    xhr.onreadystatechange = function() {
+      if (xhr.readyState === 4) {
+        if (xhr.status === 200) {
+          cb(null, xhr.responseText);
+        } else {
+          cb("error" + xhr.responseType);
+        }
+      }
+    };
+    xhr.open("GET", url, true);
+    xhr.send();
   }
+
 
   function showTransactionsListDom(err, data) {
     if (err) {
@@ -21,7 +27,7 @@ function request(url) {
         row.appendChild(date);
         var desc = document.createElement("td");
         desc.innerHTML = tran.descrip;
-        row.appendChild(date);
+        row.appendChild(desc);
         var balance = document.createElement("td");
         balance.innerHTML = tran.balance;
         row.appendChild(balance);

diff --git a/src/handlers.js b/src/handlers.js
@@ -42,7 +42,7 @@ const serverError = (err, response) => {
 
 
 const homeHandler = (request,response) => {
-    if (request.headers.cookie){
+    if (request.headers.cookie&&userid!==undefined){
       const { jwt } = parse(request.headers.cookie);
       console.log(jwt);
     verify(jwt, SECRET, (err, jwt) => {
@@ -228,7 +228,7 @@ const homeHandler = (request,response) => {
 
 
   const transactionsHandler=(request,response)=>{
-    if (request.headers.cookie){
+    if (request.headers.cookie&&userid!==undefined){
       const { jwt } = parse(request.headers.cookie);
       console.log(jwt);
     verify(jwt, SECRET, (err, jwt) => {
@@ -238,16 +238,16 @@ const homeHandler = (request,response) => {
                 // check user
               const message = `Your user id is: ${jwt.email}`;
               if(userid.email===jwt.email){
-                transactions(userid.email).then((err,res)=>{
-                  if (err) return console.log(err);
-                  let dynmicData = JSON.stringify(res);
+                transactions_query(userid.email).then((res)=>{
+                  let dynmicData = JSON.stringify(res.rows);
                   response.writeHead(200, { "Content-Type": "application/json" });
+                  // console.log(dynmicData);
+
                   response.end(dynmicData);
-                  console.log(dynmicData);
-                })
+                }).catch(err => console.log(err))
 
-              }{
-                console.log("hackers")
+              }else{
+                console.log("hackerstrans")
               }
             } 
           });
@@ -260,5 +260,6 @@ module.exports = {
     publicHandler,
     errorHandler,
     loginHandler,
-    signUpHandler
+    signUpHandler,
+    transactionsHandler
   };
diff --git a/src/router.js b/src/router.js
@@ -1,6 +1,6 @@
 const {   homeHandler,
     publicHandler,
-    errorHandler,loginHandler,signUpHandler} = require("./handlers");
+    errorHandler,loginHandler,signUpHandler,transactionsHandler} = require("./handlers");
 
 
 const router = (request, response) => {
@@ -22,7 +22,7 @@ const router = (request, response) => {
     } else if (url === "/add-trnasaction") {
 
     }  else if (url === "/transactions") {
-
+      transactionsHandler(request,response)
     }else if (url === "/delete-trnasaction") {
     } else {
       errorHandler(response);