Merge remote-tracking branch 'Superalgos/develop' into develop

This commit is contained in:
Matias committed 2019-04-06 11:06:30 +02:00
commit 01752c368a
8 files changed
+2168 -250

No files matched your search

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

+1
View File
@@ -33,6 +33,7 @@
<Compile Include="AABrowserAPI\BotCode.js">
<SubType>Code</SubType>
</Compile>
<Compile Include="AABrowserAPI\CopySimulator.js" />
<Compile Include="AABrowserAPI\TeamSetup.js">
<SubType>Code</SubType>
</Compile>
+1
View File
@@ -32,6 +32,7 @@ function newAppLoader() {
"Globals.js",
"Ecosystem.js",
"MQService",
"BottomSpace/DeleteTradingHistory.js",
"BottomSpace/ChartAspectRatio.js",
+2126 -247
View File
File diff suppressed because it is too large. Load diff
+5 -3
View File
@@ -9,14 +9,16 @@
"dependencies": {
"@azure/storage-blob": "^10.3.0",
"@octokit/rest": "^14.0.9",
"atob": "^2.1.1",
"@superalgos/mqservice": "0.0.12",
"atob": "^2.1.2",
"axios": "^0.18.0",
"azure-storage": "^2.8.2",
"azure-storage": "^2.10.2",
"dotenv": "^6.2.0",
"graphql": "^14.0.2",
"graphql": "^14.2.0",
"graphql-client": "^2.0.1",
"json-beautify": "^1.0.1",
"lodash": "^4.17.11",
"minio": "^7.0.5",
"nonce": "^1.0.4",
"request": "^2.88.0",
"retry": "^0.12.0",
+35
View File
@@ -36,6 +36,34 @@ global.CUSTOM_FAIL_RESPONSE = {
message: 'Custom Message'
}
/*
var Minio = require('minio')
var minioClient = new Minio.Client({
endPoint: 'niksadvancedalgos.ovh',
port: 80,
useSSL: false,
accessKey: 'luis1234',
secretKey: '123456789'
})
const stage = 'textUpload'
const bucketName = 'test-bucket'
const textFilename = 'test.json'
/*
if (stage === 'textUpload') {
var str = 'some string you want to save'
minioClient.putObject(bucketName, textFilename, str, 'text/plain', function (e) {
if (e) {
return console.log(e)
}
console.log('Successfully uploaded the string')
})
}
return
*/
let storageData = new Map()
let botScripts // This module is the one which grabs user bots scrips from the storage, and browserifys them.
@@ -169,6 +197,13 @@ function onBrowserRequest (request, response) {
}
break
case 'MQService':
{
let filePath = "./node_modules/@superalgos/mqservice/orderLifeCicle/webDependency.js"
respondWithFile(filePath, response)
break;
}
case 'Plotter.js':
{
/*