RanchiMall/ribc
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from sairajzero/master

Browse Source
This commit is contained in:
Sai Raj 2020-01-31 22:12:58 +05:30 committed by GitHub
commit e4cb3b6953
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
RIBC.html
View File

@ -7647,9 +7647,11 @@ Bitcoin.Util = {
websocket.send(data); websocket.send(data);
resolve(`Data sent to supernode : ${snfloID}`); resolve(`Data sent to supernode : ${snfloID}`);
}else if(evt.data == '$-'){ }else if(evt.data == '$-'){
this.kBucket.getNextSupernode(snfloID) this.kBucket.getNextSupernode(snfloID).then(nextNode => {
.then(nextNode => this.sendDataToSN(data, nextNode[0])) this.sendDataToSN(data, nextNode[0])
.catch(error => reject(error)) .then(result => resolve(result))
.catch(error => reject(error))
}).catch(error => reject(error))
}else{ }else{
console.log(evt.data) console.log(evt.data)
reject(evt.data) reject(evt.data)
@ -7657,9 +7659,11 @@ Bitcoin.Util = {
websocket.close(); websocket.close();
}) })
websocket.onerror = (evt) => { websocket.onerror = (evt) => {
this.kBucket.getNextSupernode(snfloID) this.kBucket.getNextSupernode(snfloID).then(nextNode => {
.then(nextNode => this.sendDataToSN(data, nextNode[0])) this.sendDataToSN(data, nextNode[0])
.catch(error => reject(error)) .then(result => resolve(result))
.catch(error => reject(error))
}).catch(error => reject(error))
}; };
}) })
}, },
@ -7668,6 +7672,7 @@ Bitcoin.Util = {
sendData: function (data, floID) { sendData: function (data, floID) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.kBucket.determineClosestSupernode(floID).then(closestNode => { this.kBucket.determineClosestSupernode(floID).then(closestNode => {
console.log(closestNode)
this.sendDataToSN(data, closestNode[0]) this.sendDataToSN(data, closestNode[0])
.then(result => resolve(result)) .then(result => resolve(result))
.catch(error => reject(error)) .catch(error => reject(error))
@ -7684,9 +7689,11 @@ Bitcoin.Util = {
if(evt.data == '$+'){ if(evt.data == '$+'){
websocket.send(`?${request}`); websocket.send(`?${request}`);
}else if(evt.data == '$-'){ }else if(evt.data == '$-'){
this.kBucket.getNextSupernode(snfloID) this.kBucket.getNextSupernode(snfloID).then(nextNode => {
.then(nextNode => this.requestDataFromSN(request, nextNode[0])) this.requestDataFromSN(request, nextNode[0])
.catch(error => reject(error)) .then(result => resolve(result))
.catch(error => reject(error))
}).catch(error => reject(error))
websocket.close() websocket.close()
}else{ }else{
resolve(evt.data); resolve(evt.data);
@ -7694,9 +7701,11 @@ Bitcoin.Util = {
} }
}) })
websocket.onerror = (evt) => { websocket.onerror = (evt) => {
this.kBucket.getNextSupernode(snfloID) this.kBucket.getNextSupernode(snfloID).then(nextNode => {
.then(nextNode => this.requestDataFromSN(request, nextNode[0])) this.requestDataFromSN(request, nextNode[0])
.catch(error => reject(error)) .then(result => resolve(result))
.catch(error => reject(error))
}).catch(error => reject(error))
}; };
}) })
}, },
@ -8483,6 +8492,11 @@ Bitcoin.Util = {
}).catch(error => reject(error)); }).catch(error => reject(error));
}) })
}, },
privKeyInput: function(){
var privKey = prompt("Enter Private Key: ")
return privKey
},
startUpFunctions:{ startUpFunctions:{
@ -8588,7 +8602,7 @@ Bitcoin.Util = {
.catch(error => reject(error)) .catch(error => reject(error))
}else{ }else{
try{ try{
var privKey = prompt("Enter Private Key: ") var privKey = floDapps.util.privKeyInput();
if(!privKey) if(!privKey)
return reject("Empty Private Key") return reject("Empty Private Key")
var floID = floCrypto.getFloIDfromPubkeyHex(floCrypto.getPubKeyHex(privKey)) var floID = floCrypto.getFloIDfromPubkeyHex(floCrypto.getPubKeyHex(privKey))
@ -8667,6 +8681,10 @@ Bitcoin.Util = {
this.util.startUpFunctions[fname] = fn; this.util.startUpFunctions[fname] = fn;
}, },
setCustomPrivKeyInput: function(customFn){
this.util.privKeyInput = customFn
},
setAppObjectStores: function(appObs){ setAppObjectStores: function(appObs){
this.util.appObs = appObs this.util.appObs = appObs
}, },
@ -8715,9 +8733,10 @@ Bitcoin.Util = {
floDapps.launchStartUp().then(result => { floDapps.launchStartUp().then(result => {
console.log(result) console.log(result)
alert(`Welcome FLO_ID: ${myFloID}`) console.log(`Welcome FLO_ID: ${myFloID}`)
RIBC.initRIBC().then(result => { RIBC.initRIBC().then(result => {
console.log(result) console.log(result)
renderAllElements()
}).catch(error => console.error(error)) }).catch(error => console.error(error))
}).catch(error => console.error(error)) }).catch(error => console.error(error))
} }
@ -8771,39 +8790,39 @@ Bitcoin.Util = {
return internUpdates return internUpdates
}, },
getProjectList: () => { getProjectList: function(){
return Object.keys(floGlobals.appObjects.RIBC.projectMaps) return Object.keys(floGlobals.appObjects.RIBC.projectMap)
}, },
getProjectDetails: (project) => { getProjectDetails: function(project){
return floGlobals.appObjects.RIBC.projectDetails[project] return floGlobals.appObjects.RIBC.projectDetails[project]
}, },
getProjectMap: (project) => { getProjectMap: function(project){
return floGlobals.appObjects.RIBC.ProjectMap[project] return floGlobals.appObjects.RIBC.ProjectMap[project]
}, },
getProjectBranches: (project) => { getProjectBranches: function(project){
return this.manage.findAllBranches(project) return this.manage.findAllBranches(project)
}, },
getTaskDetails: (project, branch, task) => { getTaskDetails: function(project, branch, task){
return this.manage.readTaskDetails(project, branch, task) return this.manage.readTaskDetails(project, branch, task)
}, },
getTaskStatus: (project, branch, task) => { getTaskStatus: function(project, branch, task){
return this.manage.readTaskStatus(project, branch, task) return this.manage.readTaskStatus(project, branch, task)
}, },
getInternList: () => { getInternList: function(){
return floGlobals.appObjects.RIBC.internList; return floGlobals.appObjects.RIBC.internList;
}, },
getInternRating: (floID) => { getInternRating: function(floID){
return floGlobals.appObjects.RIBC.internRating[floID]; return floGlobals.appObjects.RIBC.internRating[floID];
}, },
getAssignedInterns: (projectCode, branch, taskNumber) => { getAssignedInterns: function(projectCode, branch, taskNumber){
return floGlobals.appObjects.RIBC.internsAssigned[projectCode + "_" + branch + "_" + taskNumber] return floGlobals.appObjects.RIBC.internsAssigned[projectCode + "_" + branch + "_" + taskNumber]
}, },
@ -8889,7 +8908,7 @@ Bitcoin.Util = {
if (projectCode in this.projectMap) { if (projectCode in this.projectMap) {
return "Project Name already exists"; return "Project Name already exists";
} }
addBranch(projectCode); this.addBranch(projectCode);
return "Project Create: " + projectCode return "Project Create: " + projectCode
}, },
@ -8909,7 +8928,7 @@ Bitcoin.Util = {
return "Startpoint cannot be later than endpoint" return "Startpoint cannot be later than endpoint"
} }
var newBranch = addBranch(newProjectCode, newBranchConnection, newStartPoint, newEndPoint); var newBranch = this.addBranch(newProjectCode, newBranchConnection, newStartPoint, newEndPoint);
this.projectMap[newProjectCode][newBranch] = this.projectMap[oldProjectCode][oldBranch].slice(); this.projectMap[newProjectCode][newBranch] = this.projectMap[oldProjectCode][oldBranch].slice();
@ -9031,7 +9050,7 @@ Bitcoin.Util = {
insertTaskInMap: function (projectCode, branchName, insertPoint) { insertTaskInMap: function (projectCode, branchName, insertPoint) {
var lastTasks = []; var lastTasks = [];
lastTasks = findLastTaskNumber(projectCode); lastTasks = this.findLastTaskNumber(projectCode);
var lastNumber = lastTasks[branchName]; var lastNumber = lastTasks[branchName];
var arr = this.projectMap[projectCode][branchName]; var arr = this.projectMap[projectCode][branchName];
var addedTaskNumber = lastNumber + 1; var addedTaskNumber = lastNumber + 1;
@ -9126,7 +9145,7 @@ Bitcoin.Util = {
addBranch: function (projectCode1, branch, startPoint, mergePoint) { addBranch: function (projectCode1, branch, startPoint, mergePoint) {
var arr = findAllBranches(projectCode1); var arr = this.findAllBranches(projectCode1);
var newBranchName; var newBranchName;
if (arr == false) { if (arr == false) {
@ -9168,7 +9187,7 @@ Bitcoin.Util = {
addTaskInMap: function (projectCode, branchName) { addTaskInMap: function (projectCode, branchName) {
var lastTasks = []; var lastTasks = [];
lastTasks = findLastTaskNumber(projectCode); lastTasks = this.findLastTaskNumber(projectCode);
var lastNumber = lastTasks[branchName]; var lastNumber = lastTasks[branchName];
var addedTaskNumber = lastNumber + 1; var addedTaskNumber = lastNumber + 1;