3.21.07
- - + +
3.21.07
@@ -213,7 +201,7 @@
«
-
-
+
- - - + +
-
@@ -320,7 +308,7 @@
-
+
@@ -330,13 +318,13 @@
- - - - + + + +@@ -939,5 +927,3 @@ - - diff --git a/icoDashboardCreator/impl.js b/icoDashboardCreator/impl.js index d59ac5c9..83deedce 100644 --- a/icoDashboardCreator/impl.js +++ b/icoDashboardCreator/impl.js @@ -16,22 +16,24 @@ var Project = db.projectConfiguration; module.exports = { //client setup - icoDashboardSetup: function (req, res) { + icoDashboardSetup: async function(req, res) { + var projectArray = await getProjectArray(req.user.email); var address = req.cookies['address']; res.render(path.join(__dirname, './', 'dist', 'index.ejs'), { user: req.user, address: address, + ProjectConfiguration: projectArray, }); }, - siteConfiguration: function (req, res) { + siteConfiguration: function(req, res) { console.log(req.params, "project") res.render('siteConfiguration', { user: req.user, projectName: req.params.projectName }); }, - getSiteConfiguration: function (req, res) { + getSiteConfiguration: function(req, res) { client.findAll({ where: { 'email': req.user.email, @@ -62,36 +64,38 @@ module.exports = { } }); }, - updateSiteConfiguration: async function (req, res) { - var projectdata = await client.find({ - where: { - 'email': req.user.email - }, - include: ['projectConfigurations'], - }) - var projectdatavalues = await ProjectConfiguration.find({ - where: { - "client_id": projectdata.projectConfigurations[0].dataValues.client_id + updateSiteConfiguration: async function(req, res) { + var projectdata = await client.find({ + where: { + 'email': req.user.email + }, + include: ['projectConfigurations'], + }) + var projectdatavalues = await ProjectConfiguration.find({ + where: { + "client_id": projectdata.projectConfigurations[0].dataValues.client_id + } + }) + if (req.files[0]) { + console.log("here") + projectdatavalues.siteLogo = fs.readFileSync(req.files[0].path) + projectdatavalues.save().then((result, error) => { + console.log("inside", error, result) + }) } - }) - if (req.files[0]) { - console.log("here") - projectdatavalues.siteLogo = fs.readFileSync(req.files[0].path) - projectdatavalues.save().then((result, error) => { console.log("inside", error, result) }) - } - - // projectdata.dataValues.siteLogo = fs.readFileSync(req.files[0].path) - ProjectConfiguration.update({ - "siteName": req.body.site_name, - "coinName": req.body.coin_name, - "softCap": req.body.soft_cap, - "hardCap": req.body.hard_cap, - "startDate": req.body.start_date, - "endDate": req.body.end_date, - "homeURL": req.body.website_url, - "usdConversionRate": req.body.usd_conversion_rate, - "minimumContribution": req.body.minimum_contribution, - }, { + + // projectdata.dataValues.siteLogo = fs.readFileSync(req.files[0].path) + ProjectConfiguration.update({ + "siteName": req.body.site_name, + "coinName": req.body.coin_name, + "softCap": req.body.soft_cap, + "hardCap": req.body.hard_cap, + "startDate": req.body.start_date, + "endDate": req.body.end_date, + "homeURL": req.body.website_url, + "usdConversionRate": req.body.usd_conversion_rate, + "minimumContribution": req.body.minimum_contribution, + }, { where: { "client_id": projectdata.projectConfigurations[0].dataValues.client_id } @@ -101,150 +105,183 @@ module.exports = { console.log("Project updated successfully!"); res.redirect("/icoDashboardSetup/project/" + req.body.coin_name) }); - }, + }, - getKYCPage: async function (req, res) { - res.render("kyctab.ejs") - }, - getICOdata: async function (req, res) { - var userdata = await User.find({ - where: { - "projectConfigurationCoinName": "don" + getKYCPage: async function(req, res) { + res.render("kyctab.ejs") }, - attributes: { exclude: ["mobile", "isd_code", "usertype_id", "updatedAt", "createdAt", "kycDoc3", "kycDocName3", "kycDoc2", "kycDocName2", "kycDoc1", "kycDocName1", "password", "uniqueId"] } - }) + getICOdata: async function(req, res) { + var userdata = await User.find({ + where: { + "projectConfigurationCoinName": "don" + }, + attributes: { + exclude: ["mobile", "isd_code", "usertype_id", "updatedAt", "createdAt", "kycDoc3", "kycDocName3", "kycDoc2", "kycDocName2", "kycDoc1", "kycDocName1", "password", "uniqueId"] + } + }) - res.send({ data: [userdata.dataValues, userdata.dataValues, userdata.dataValues, userdata.dataValues, userdata.dataValues, userdata.dataValues] }); - }, - getUserData: async function (req, res) { - var userdata = new Object(); - User.find({ - where: { - "projectConfigurationCoinName": "don", "id": req.params.userid - }, - }).then(result => { - console.log(result.dataValues) - userdata = result.dataValues; - console.log(userdata, "helloS") - - if (result.dataValues.kycDoc1) { - userdata.kycDoc1 = 'data:image/bmp;base64,' + Buffer.from(result.dataValues.kycDoc1).toString('base64') - userdata.kycDoc2 = 'data:image/bmp;base64,' + Buffer.from(result.dataValues.kycDoc2).toString('base64') - userdata.kycDoc3 = 'data:image/bmp;base64,' + Buffer.from(result.dataValues.kycDoc3).toString('base64') - } - res.render("adminKYCpanel.ejs", { KYCdata: userdata }) - }) + res.send({ + data: [userdata.dataValues, userdata.dataValues, userdata.dataValues, userdata.dataValues, userdata.dataValues, userdata.dataValues] + }); + }, + getUserData: async function(req, res) { + var userdata = new Object(); + User.find({ + where: { + "projectConfigurationCoinName": "don", + "id": req.params.userid + }, + }).then(result => { + console.log(result.dataValues) + userdata = result.dataValues; + console.log(userdata, "helloS") - }, - updateUserData: async function (req, res) { - var userdata = await User.find({ - where: { - "projectConfigurationCoinName": "don", "id": req.params.userid - }, - }) - userdata.kyc_verified = req.body.kyc_verified; - userdata.status = req.body.status; - userdata.save().then(function (result, error) { - if (!result) - console.log("not updated"); - console.log("updated"); - }) - res.redirect("/kycTab") - }, + if (result.dataValues.kycDoc1) { + userdata.kycDoc1 = 'data:image/bmp;base64,' + Buffer.from(result.dataValues.kycDoc1).toString('base64') + userdata.kycDoc2 = 'data:image/bmp;base64,' + Buffer.from(result.dataValues.kycDoc2).toString('base64') + userdata.kycDoc3 = 'data:image/bmp;base64,' + Buffer.from(result.dataValues.kycDoc3).toString('base64') + } + res.render("adminKYCpanel.ejs", { + KYCdata: userdata + }) + }) - contractData: async function (req, res) { - console.log(req.params); - ProjectConfiguration.find({ - where: { - 'coinSymbol': req.params.projectName - }, - attributes: { exclude: ["contractCode", "contractByteCode"] } - }).then(result => res.send({ "tokenAddress": result.dataValues.contractAddress, "crowdSaleAddress": result.dataValues.contractAddress }) - ) - }, + }, + updateUserData: async function(req, res) { + var userdata = await User.find({ + where: { + "projectConfigurationCoinName": "don", + "id": req.params.userid + }, + }) + userdata.kyc_verified = req.body.kyc_verified; + userdata.status = req.body.status; + userdata.save().then(function(result, error) { + if (!result) + console.log("not updated"); + console.log("updated"); + }) + res.redirect("/kycTab") + }, - //user login - userLogin: function (req, res) { - res.render("userLogin.ejs", { - message: req.flash('loginMessage') - }); - }, - getUserSignup: function (req, res) { - res.render("userSignup.ejs", { - projectName: req.params.projectName, - message: req.flash('signupMessage') - }); - }, + contractData: async function(req, res) { + console.log(req.params); + ProjectConfiguration.find({ + where: { + 'coinSymbol': req.params.projectName + }, + attributes: { + exclude: ["contractCode", "contractByteCode"] + } + }).then(result => res.send({ + "tokenAddress": result.dataValues.contractAddress, + "crowdSaleAddress": result.dataValues.contractAddress + })) + }, - getUserLogin: function (req, res) { - res.render("userLogin.ejs", { - 'projectName': req.params.projectName, - message: req.flash('signupMessage') - }); - }, + //user login + userLogin: function(req, res) { + res.render("userLogin.ejs", { + message: req.flash('loginMessage') + }); + }, + getUserSignup: function(req, res) { + res.render("userSignup.ejs", { + projectName: req.params.projectName, + message: req.flash('signupMessage') + }); + }, - postUserLogin: async function (req, res, next) { - passport.authenticate('user-login', { - session: false - }, async (err, user, info) => { - console.log("This is :" + user); - try { - if (err || !user) { - const error = new Error('An Error occured') - console.log(); - return res.json({ - 'token': "failure", - 'message': req.flash('loginMessage') - }); - } - const token = jwt.sign({ - userEmail: user.email, - projectName: user.projectConfigurationCoinName - }, configAuth.jwtAuthKey.secret, { - expiresIn: configAuth.jwtAuthKey.tokenLife - }); - //Send back the token to the user - res.cookie('token', token, { - expire: 360000 + Date.now() - }); - return res.json({ - 'token': "success" - }); - } catch (error) { - return next(error); - } - })(req, res, next); - }, + getUserLogin: function(req, res) { + res.render("userLogin.ejs", { + 'projectName': req.params.projectName, + message: req.flash('signupMessage') + }); + }, - postUserSignup: function (req, res, next) { - passport.authenticate('user-signup', { - session: false - }, async (err, user, info) => { - console.log(user); - try { - if (err || !user) { - return res.redirect('./userSignup'); - } - return res.redirect('./userLogin'); - } catch (error) { - return next(error); - } - })(req, res, next); - }, + postUserLogin: async function(req, res, next) { + passport.authenticate('user-login', { + session: false + }, async (err, user, info) => { + console.log("This is :" + user); + try { + if (err || !user) { + const error = new Error('An Error occured') + console.log(); + return res.json({ + 'token': "failure", + 'message': req.flash('loginMessage') + }); + } + const token = jwt.sign({ + userEmail: user.email, + projectName: user.projectConfigurationCoinName + }, configAuth.jwtAuthKey.secret, { + expiresIn: configAuth.jwtAuthKey.tokenLife + }); + //Send back the token to the user + res.cookie('token', token, { + expire: 360000 + Date.now() + }); + return res.json({ + 'token': "success" + }); + } catch (error) { + return next(error); + } + })(req, res, next); + }, + + postUserSignup: function(req, res, next) { + passport.authenticate('user-signup', { + session: false + }, async (err, user, info) => { + console.log(user); + try { + if (err || !user) { + return res.redirect('./userSignup'); + } + return res.redirect('./userLogin'); + } catch (error) { + return next(error); + } + })(req, res, next); + }, - verifyMail: (req, res) => { - console.log(req.query); - db.user.find({ + verifyMail: (req, res) => { + console.log(req.query); + db.user.find({ + where: { + uniqueId: req.query.verificationId + } + }).then((user) => { + user.emailVerified = true; + user.save().then((user) => { + res.redirect('./' + user.projectConfigurationCoinName + '/userLogin'); + }); + }); + } + +} + +function getProjectArray(email) { + var projectArray = []; + return new Promise(async function (resolve, reject) { + client.find({ where: { - uniqueId: req.query.verificationId - } - }).then((user) => { - user.emailVerified = true; - user.save().then((user) => { - res.redirect('./' + user.projectConfigurationCoinName + '/userLogin'); + 'email': email + }, + include: [{ + model: ProjectConfiguration, + attributes: ['coinName', 'contractAddress', 'contractHash'] + }], + }).then(client => { + client.projectConfigurations.forEach(element => { + projectArray.push(element.dataValues); }); + // res.send({'projectArray': projectArray}); + resolve(projectArray); }); - } - + }); } diff --git a/icoDashboardCreator/routes.js b/icoDashboardCreator/routes.js index 85aa26ee..59e5c5b0 100644 --- a/icoDashboardCreator/routes.js +++ b/icoDashboardCreator/routes.js @@ -1,10 +1,7 @@ const impl = require("./impl"); -const DataURI = require('datauri').promise; var db = require('../database/models/index'); var path = require('path'); var client = db.client; -console.log(path.join(__dirname, './dist'),"dir") - module.exports = function (app,express) { app.get('/icoDashboardSetup/project/:projectName', isLoggedIn,hasVerified, hasPackage3, impl.icoDashboardSetup); diff --git a/icoDashboardCreator/userAuthImpl.js b/icoDashboardCreator/userAuthImpl.js index c0df5e15..219de2fd 100644 --- a/icoDashboardCreator/userAuthImpl.js +++ b/icoDashboardCreator/userAuthImpl.js @@ -1,13 +1,14 @@ var db = require('../database/models/index'); var User = db.user; +var Address = db.userCurrencyAddress; var fs = require('fs'); var configAuth = require('../config/auth'); const Binance = require('node-binance-api'); var coinPaymentHandler = require('../coinPayments/impl'); +var icoListener = require('../icoHandler/listener'); module.exports = { getTransactions: (req, res, next) => { - console.log(req.user); var projectConfiguration = req.user.projectConfiguration; res.render('userTransactionHistory', { user: req.user, @@ -75,7 +76,6 @@ module.exports = { }, getPrices: async (req, res, next) => { - console.log("Getting price"); const binance = Binance().options({ APIKEY: configAuth.binanceKey.apiKey, APISECRET: configAuth.binanceKey.apiSecret, @@ -84,7 +84,6 @@ module.exports = { }); binance.prices((error, ticker) => { - console.log(); res.send({ BTC: 1/ticker.ETHBTC, BTCUSD: ticker.BTCUSDT, @@ -120,12 +119,49 @@ module.exports = { }); }, - buyToken: async (req, res) => { - txInfo = await coinPaymentHandler.buyToken(req.body.second_currency, req.body.second_currency, req.body.amount, req.user.email); - console.log(txInfo); + loadWallet: async (req, res) => { + txInfo = await coinPaymentHandler.buyToken(req.body.second_currency, req.body.second_currency, req.body.amount, req.user.email, req.user.userCurrencyAddresses[0].address); res.render('userTokenPayment', { user: req.user, qrCodeLink: txInfo.qrcode_url }); + }, + + checkBalances: (req, res) => { + var btc_address, eth_address; + for(var i=0; i
@@ -361,7 +349,7 @@ - - - - - - + + + + + +- + - - + + - - + + @@ -888,8 +876,8 @@@@ -875,12 +863,12 @@ - - + + @@ -912,17 +900,17 @@ -