From 53ac35d48701c5fa44d87d97e8d54530453fcf4c Mon Sep 17 00:00:00 2001 From: Expand-sys Date: Mon, 3 May 2021 21:34:02 +1000 Subject: [PATCH] marketplace fixed, forgot about implementing the sending money on purchase --- index.js | 2 ++ routes/marketplace.js | 13 ++++++++++--- views/itemlist.pug | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/index.js b/index.js index 8de7811..6f185c4 100644 --- a/index.js +++ b/index.js @@ -300,6 +300,7 @@ app.post('/sendfunds', async function(req, res){ app.post('/register', async function(req, res){ var {name, password, password2} = req.body; + let checkuser = await got(process.env.BANKAPIURL+'BankF/contains/'+name) checkuser = JSON.parse(checkuser.body).value let errors = []; @@ -355,6 +356,7 @@ app.post('/login', async function(req, res){ } catch(err){ console.log(err) } + req.session.password = password if(adminTest.body.value == undefined){ res.redirect('/') }else{ diff --git a/routes/marketplace.js b/routes/marketplace.js index 9e5382d..3f8666c 100644 --- a/routes/marketplace.js +++ b/routes/marketplace.js @@ -75,7 +75,7 @@ router.get('/marketdash', ensureAuthenticated, function(req,res){ } }) } - setTimeout(500); + res.render('marketdash',{ user:req.session.user, admin:req.session.admin, @@ -181,7 +181,6 @@ router.post('/:id/list',ensureAuthenticated, async function(req,res){ }) router.post('/:id/buy',async function(req, res){ Listing.findOne({_id: req.params.id}, async function(err, listing){ - console.log(await Inventory.findOne({user:req.session.user}).exec()) let inventory = await Inventory.findOne({user:req.session.user}).exec() if(inventory == null){ @@ -208,7 +207,15 @@ router.post('/:id/buy',async function(req, res){ }) } Listing.findOneAndRemove({_id:req.params.id}).exec() - + transfer = got.post(process.env.BANKAPIURL+'BankF/sendfunds',{ + json:{ + a_name: req.session.user, + b_name: listing.seller, + amount: parseInt(listing.amount*listing.price), + attempt: req.session.password + }, + responseType:'json' + }) res.redirect("/marketplace/marketdash") }) }) diff --git a/views/itemlist.pug b/views/itemlist.pug index 51d6577..0cefea0 100644 --- a/views/itemlist.pug +++ b/views/itemlist.pug @@ -25,6 +25,7 @@ block content br br label Amount: + br input.form-control-lg.shadow(type="number" min="0" name="amount") br br