Merge pull request #1 from Expand-sys/marketplace

Marketplace

README.md

@@ -11,10 +11,11 @@ thatbeing said goodluck.
 from heere is will assume you have set up the api server
 
 if deploying to a serverless application make sure you se t the environmental variables forst. these are as follwos
-* BANKAPIURL=<your api url including http/s and the trailing slash NOT BANKF>
+* BANKAPIURL=your api url including http/s and the trailing slash NOT BANKF
-* SECURE=<true if you have ssl on your front end host>
+* SECURE=true if you have ssl on your front end host
-* PORT=<put the port in here>
+* PORT=put the port in here
-* SETUP=<true when you have set the above this just gets rid of the setup page that will show if it equals false or the .env file is not fojound>
+* MONGO=put your mongodb url here
+* SETUP=true when you have set the above this just gets rid of the setup page that will show if it equals false or the .env file is not fojound
 
 if you are deploying on a vps then
 1. git clone repository
@@ -22,3 +23,10 @@ if you are deploying on a vps then
 1. run with your favourite node webserver if you dont know any use [pm2](https://pm2.keymetrics.io/)
 1. go through set up at localhost:<port number you set earlier>
 1. restart the application and badda bim badda boom you done
+
+## Marketplace
+
+now this is getting complex :sunglasses:
+the market place is new and requires monogodb until Jolly finishes his rust api marketplace and i can integrate that
+set up is pretty straight forward for now, it should just work:tm: as long as you import all the minecraft blocks into the database as per the item schema,
+to do this there is a bit of code at the bottom of ./routes/marketplace.js uncomment that and run that url then comment it again cause you dont want to run it twice, it will messy up your shit. i will make it a one time run route in the future.

index.js

@@ -14,6 +14,7 @@ const url = require('url')
 const dotenv = require('dotenv');
 const fs = require('fs');
 let Log = require('./schemas/log.js');
+const mongoose = require('mongoose')
 dotenv.config();
 //mongodb connection
 
@@ -64,25 +65,48 @@ app.use(expressValidator({
   }
 }));
 app.post('/setup', async function(req, res){
+
+
   console.log(req.body)
-  let mongo = req.body.mongo;
+  let {mongo, url, banksecure, marketplace} = req.body;
   process.env.MONGO = mongo
-  let apiurl = 'BANKAPIURL='+req.body.url
+  process.env.MARKETPLACE = false
-  process.env.BANKAPIURL = req.body.url
+  if(marketplace){
-  let banksecure = 'SECURE=false'
+    process.env.MARKETPLACE = true
+  }
+  if(!url.endsWith('/')){
+    url=url+"/"
+  }
+  process.env.BANKAPIURL =url
   process.env.SECURE = false
-  if(req.body.secure){
+  if(!banksecure){
-    banksecure = 'SECURE=true'
+    banksecure = false
-    process.env.SECURE = true
+    process.env.SECURE = false
   }
   process.env.SETUP = true
-  fs.writeFileSync('.env', apiurl+'\n'+banksecure+'\n'+mongo+'\nSETUP=true')
+  fs.writeFileSync('.env', "BANKAPIURL="+process.env.BANKAPIURL+'\n'+"SECURE="+process.env.SECURE+'\n'+"MARKETPLACE="+process.env.MARKETPLACE+'\n'+"MONGO="+process.env.MONGO+'\nSETUP=true')
   dotenv.config();
+  if(process.env.MARKETPLACE){
+    mongoose.connect(process.env.MONGO,{
+      useNewUrlParser: true,
+      useUnifiedTopology: true,
+      useFindAndModify: true,
+    });
 
+    let db = mongoose.connection;
+    db.once('open', function(){
+      console.log('Connected to MongoDB');
+    })
+
+    //check for DB errors
+    db.on('error', function(err){
+      console.log(err);
+    });
+  }
   res.redirect('/')
 })
 app.get('/', async function(req, res){
-  if(setup==false){
+  if(!process.env.SETUP){
     res.render('setup')
   }else{
 
@@ -105,7 +129,8 @@ app.get('/', async function(req, res){
     res.render('index', {
       user: req.session.user,
       admin: req.session.admin,
-      alive: alive
+      alive: alive,
+      marketplace: process.env.MARKETPLACE
     })
   }
 });
@@ -153,8 +178,8 @@ app.get('/BankF', ensureAuthenticated, async function(req, res){
   console.log(logrec.timings)
   console.log("query finished "+Date.now())
   logsent = logsent.body.value
-  console.log(logsent)
+
-  if(logsent === 1 || logsent === -1 || logsent == null){
+  if(logsent == 1 || logsent == -1 || logsent == null){
     logsent = undefined
   }else{
     logsent = await logsent.filter(({ from }) => from === req.session.user)
@@ -180,6 +205,7 @@ app.get('/BankF', ensureAuthenticated, async function(req, res){
     user: req.session.user,
     admin: req.session.admin,
     sucesses: successes,
+    marketplace: process.env.MARKETPLACE
   })
 });
 
@@ -268,12 +294,14 @@ app.post('/sendfunds', async function(req, res){
       balance:balance.value,
       user: req.session.user,
       admin: req.session.admin,
+      marketplace: process.env.MARKETPLACE
     })
   }
 })
 
 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 = [];
@@ -290,7 +318,8 @@ app.post('/register', async function(req, res){
     }
     if(errors[0]){
       res.render('register', {
-        errors:errors
+        errors:errors,
+        marketplace: process.env.MARKETPLACE
       })
     } else {
       if(postUser(name, password)){
@@ -298,6 +327,7 @@ app.post('/register', async function(req, res){
         res.render('login',{
           errors:errors,
           successes: successes,
+          marketplace: process.env.MARKETPLACE
         })
       }
     }
@@ -305,6 +335,7 @@ app.post('/register', async function(req, res){
     errors.push({msg: "User already exists"})
     res.render('register',{
       errors:errors,
+      marketplace: process.env.MARKETPLACE
     })
   }
 })
@@ -326,6 +357,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{
@@ -350,7 +382,8 @@ app.post('/login', async function(req, res){
       if(verified.body.value == 0){
         errors.push({msg: 'Password wrong'})
         res.render('login',{
-          errors:errors
+          errors:errors,
+          marketplace: process.env.MARKETPLACE
         })
       }else if(verified.body.value == 1){
         req.session.user = name;
@@ -359,7 +392,8 @@ app.post('/login', async function(req, res){
       } else {
         errors.push({msg: 'User not found'})
         res.render('login',{
-          errors:errors
+          errors:errors,
+          marketplace: process.env.MARKETPLACE
         })
       }
     }
@@ -377,13 +411,14 @@ app.use('/admin', admin);
 let settings = require('./routes/settings');
 app.use('/settings', settings)
 
-
+let marketplace = require('./routes/marketplace')
-
+app.use('/marketplace', marketplace)
 
 
 app.get('/logout', function(req, res){
   req.session.regenerate(function(err) {
     res.render('login', {
+      marketplace: process.env.MARKETPLACE
     })
   })
 });
@@ -393,6 +428,7 @@ app.get('/login', function(req, res){
   req.session.regenerate(function(err) {
     res.render('login', {
       user: req.session.user,
+      marketplace: process.env.MARKETPLACE
     })
   })
 });
@@ -401,6 +437,7 @@ app.get('/register', function(req, res){
   res.render('register', {
     user: req.session.user,
     admin: req.session.admin,
+    marketplace: process.env.MARKETPLACE
   })
 
 });

package.json

@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "connect-flash": "^0.1.1",
+    "cote": "^1.0.2",
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
     "express-messages": "^1.0.1",
@@ -12,6 +13,7 @@
     "mongoose": "^5.12.5",
     "path": "^0.12.7",
     "pug": "^3.0.2",
+    "socket.io": "^2.4.1",
     "url": "^0.11.0",
     "validator": "^13.5.2"
   },