From c5f646a411fe222c6043d6b811ed64ef9e188665 Mon Sep 17 00:00:00 2001 From: Expand-sys Date: Tue, 27 Apr 2021 10:11:08 +1000 Subject: [PATCH 1/4] bug turned into lemonade - wasnt awaiting for api req before filtering results --- index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 41a96fc..b15f9d0 100644 --- a/index.js +++ b/index.js @@ -156,13 +156,13 @@ app.get('/BankF', ensureAuthenticated, async function(req, res){ if(logsent == 1 || logsent == -1 || logrec == null){ logsent = undefined }else{ - logsent = logsent.filter(({ from }) => from === req.session.user) + logsent = await logsent.filter(({ from }) => from === req.session.user) } logrec = logrec.body.value if(logrec == 1 || logrec == -1 || logrec == null){ logrec = undefined } else{ - logrec = logrec.filter(({ to }) => to === req.session.user) + logrec = await logrec.filter(({ to }) => to === req.session.user) } for( i in logrec){ logrec[i].time = Date(logrec[i].time) From 014ae93cfd67b6ae6827b4b15e74e26a7cb48acf Mon Sep 17 00:00:00 2001 From: Expand-sys Date: Tue, 27 Apr 2021 10:15:33 +1000 Subject: [PATCH 2/4] another bug pulverised - legrec instead of logsent thanks harrison --- index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index b15f9d0..55e1506 100644 --- a/index.js +++ b/index.js @@ -153,13 +153,14 @@ app.get('/BankF', ensureAuthenticated, async function(req, res){ console.log(logrec.timings) console.log("query finished "+Date.now()) logsent = logsent.body.value - if(logsent == 1 || logsent == -1 || logrec == null){ + console.log(logsent) + if(logsent === 1 || logsent === -1 || logsent == null){ logsent = undefined }else{ logsent = await logsent.filter(({ from }) => from === req.session.user) } logrec = logrec.body.value - if(logrec == 1 || logrec == -1 || logrec == null){ + if(logrec === 1 || logrec === -1 || logrec === null){ logrec = undefined } else{ logrec = await logrec.filter(({ to }) => to === req.session.user) From 2fcf3af09ecc19f8cd39cc0ee8a94a8dca16e18f Mon Sep 17 00:00:00 2001 From: Expand-sys Date: Tue, 27 Apr 2021 10:16:36 +1000 Subject: [PATCH 3/4] more shit --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 55e1506..9225735 100644 --- a/index.js +++ b/index.js @@ -239,7 +239,7 @@ app.post('/sendfunds', async function(req, res){ logsent = logsent.body.value console.log(logsent) - if(logsent == 1|| logrec == -1 || logrec == null){ + if(logsent == 1|| logsent == -1 || logsent == null){ logsent = undefined }else{ logsent = await logsent.filter(({ from }) => from === req.session.user) From 925c6c7992409be54033b56ea15b2685adebe5ef Mon Sep 17 00:00:00 2001 From: Expand-sys Date: Tue, 27 Apr 2021 11:13:32 +1000 Subject: [PATCH 4/4] Merge branch 'main' of https://github.com/Expand-sys/ccashfrontend --- views/bankf.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bankf.pug b/views/bankf.pug index 193cc56..60e5cf0 100644 --- a/views/bankf.pug +++ b/views/bankf.pug @@ -52,7 +52,7 @@ block content if logrec each log in logrec hr - p Date: #{log.date} + p Date: #{log.time} p #{log.from} sent you $#{log.amount} hr