From 08824edc4315a4a00918cde77caae6d62ee24c6d Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 18 Sep 2020 19:51:32 +0200 Subject: [PATCH 01/13] Includes --- WebServer/AppLoader.js | 3 ++- webServer.js | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/WebServer/AppLoader.js b/WebServer/AppLoader.js index 889dc6884..7c82084be 100644 --- a/WebServer/AppLoader.js +++ b/WebServer/AppLoader.js @@ -57,7 +57,8 @@ function newAppLoader() { 'DesignSpace/Workspace/FunctionLibraries/DataMineFunctions.js', 'DesignSpace/Workspace/FunctionLibraries/DataStorageFunctions.js', 'DesignSpace/Workspace/FunctionLibraries/ChartingSpaceFunctions.js', - 'DesignSpace/Workspace/FunctionLibraries/TutorialFunctions.js', + 'DesignSpace/Workspace/FunctionLibraries/TutorialFunctions.js', + 'DesignSpace/Workspace/FunctionLibraries/IncludesFunctions.js', 'Utilities/CoordinateTransformations.js', 'Utilities/DateRateTransformations.js', diff --git a/webServer.js b/webServer.js index 6376ecedf..af1127acd 100644 --- a/webServer.js +++ b/webServer.js @@ -490,6 +490,43 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) { } break + case 'IncludedFileNames': + { + const fs = require('fs') + let folder + switch (requestParameters[2]) { + case 'Data-Mines': { + folder = process.env.DATA_MINES_PATH + '/' + break + } + case 'Trading-Mines': { + folder = process.env.TRADING_MINES_PATH + '/' + break + } + case 'Trading-Systems': { + folder = process.env.TRADING_SYSTEMS_PATH + '/' + break + } + case 'Trading-Engines': { + folder = process.env.TRADING_MINES_PATH + '/' + break + } + case 'Super-Scripts': { + folder = process.env.SUPER_SCRIPTS_PATH + '/' + break + } + case 'Tutorials': { + folder = process.env.TUTORIALS_PATH + '/' + break + } + } + + fs.readdir(folder, (err, files) => { + respondWithContent(JSON.stringify(files), response) + }) + } + break + case 'AppSchema.js': { let fs = require('fs') From 113938b7e46dbdbeee7521dfa4bfab895ce745c0 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 19 Sep 2020 11:58:59 +0200 Subject: [PATCH 02/13] Update webServer.js --- webServer.js | 106 ++++++++++++++++++--------------------------------- 1 file changed, 38 insertions(+), 68 deletions(-) diff --git a/webServer.js b/webServer.js index af1127acd..8f043fad6 100644 --- a/webServer.js +++ b/webServer.js @@ -454,79 +454,43 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) { } break - case 'IncludedNames': + case 'IncludedFileNames': { const fs = require('fs') let folder - let includedNames = { - includedDataMines: [], - includedTradingMines: [], - includedTradingSystems: [], - includedSuperScripts: [], - includedTradingEngines: [] + switch (requestParameters[2]) { + case 'Data-Mines': { + folder = process.env.DATA_MINES_PATH + '/' + break + } + case 'Trading-Mines': { + folder = process.env.TRADING_MINES_PATH + '/' + break + } + case 'Trading-Systems': { + folder = process.env.TRADING_SYSTEMS_PATH + '/' + break + } + case 'Trading-Engines': { + folder = process.env.TRADING_MINES_PATH + '/' + break + } + case 'Super-Scripts': { + folder = process.env.SUPER_SCRIPTS_PATH + '/' + break + } + case 'Tutorials': { + folder = process.env.TUTORIALS_PATH + '/' + break + } } - folder = process.env.DATA_MINES_PATH + '/' fs.readdir(folder, (err, files) => { - includedNames.includedDataMines = files - folder = process.env.TRADING_SYSTEMS_PATH + '/' - fs.readdir(folder, (err, files) => { - includedNames.includedTradingSystems = files - folder = process.env.SUPER_SCRIPTS_PATH + '/' - fs.readdir(folder, (err, files) => { - includedNames.includedSuperScripts = files - folder = process.env.TRADING_ENGINES_PATH + '/' - fs.readdir(folder, (err, files) => { - includedNames.includedTradingEngines = files - folder = process.env.TRADING_MINES_PATH + '/' - fs.readdir(folder, (err, files) => { - includedNames.includedTradingMines = files - respondWithContent(JSON.stringify(includedNames), response) - }) - }) - }) - }) + respondWithContent(JSON.stringify(files), response) }) } break - case 'IncludedFileNames': - { - const fs = require('fs') - let folder - switch (requestParameters[2]) { - case 'Data-Mines': { - folder = process.env.DATA_MINES_PATH + '/' - break - } - case 'Trading-Mines': { - folder = process.env.TRADING_MINES_PATH + '/' - break - } - case 'Trading-Systems': { - folder = process.env.TRADING_SYSTEMS_PATH + '/' - break - } - case 'Trading-Engines': { - folder = process.env.TRADING_MINES_PATH + '/' - break - } - case 'Super-Scripts': { - folder = process.env.SUPER_SCRIPTS_PATH + '/' - break - } - case 'Tutorials': { - folder = process.env.TUTORIALS_PATH + '/' - break - } - } - - fs.readdir(folder, (err, files) => { - respondWithContent(JSON.stringify(files), response) - }) - } - break - case 'AppSchema.js': { let fs = require('fs') @@ -646,36 +610,42 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) { } break - case 'DataMines': + case 'Data-Mines': { respondWithFile(process.env.DATA_MINES_PATH + '/' + requestParameters[2], response) } break - case 'TradingMines': + case 'Trading-Mines': { respondWithFile(process.env.TRADING_MINES_PATH + '/' + requestParameters[2], response) } break - case 'TradingSystems': + case 'Trading-Systems': { respondWithFile(process.env.TRADING_SYSTEMS_PATH + '/' + requestParameters[2], response) } break - case 'SuperScripts': + case 'Super-Scripts': { respondWithFile(process.env.SUPER_SCRIPTS_PATH + '/' + requestParameters[2], response) } break - case 'TradingEngines': + case 'Trading-Engines': { respondWithFile(process.env.TRADING_ENGINES_PATH + '/' + requestParameters[2], response) } break + case 'Tutorials': + { + respondWithFile(process.env.TUTORIALS_PATH + '/' + requestParameters[2], response) + } + break + case 'Storage': { respondWithFile(process.env.STORAGE_PATH + '/' + request.url.substring(9), response) From 93e924beb0250e0e0e37c6d07f85ecfba72decde Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 19 Sep 2020 13:01:35 +0200 Subject: [PATCH 03/13] Update webServer.js --- webServer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webServer.js b/webServer.js index 8f043fad6..e00ae4cd8 100644 --- a/webServer.js +++ b/webServer.js @@ -472,7 +472,7 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) { break } case 'Trading-Engines': { - folder = process.env.TRADING_MINES_PATH + '/' + folder = process.env.TRADING_ENGINES_PATH + '/' break } case 'Super-Scripts': { @@ -729,6 +729,7 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) { if (!err) { respondWithContent(file.toString(), response) } else { + console.log('File requested not found: ' + fileName) respondWithContent(undefined, response) } } From 243feb43d0a16963d3af8b6ec03ec3aaa1d4f7a0 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 21 Sep 2020 09:36:39 +0200 Subject: [PATCH 04/13] Fixed bug --- WebServer/index.html | 8 +++--- webServer.js | 65 ++++++++++++++++++++++++++++++-------------- 2 files changed, 49 insertions(+), 24 deletions(-) diff --git a/WebServer/index.html b/WebServer/index.html index 4e77c1241..392752278 100644 --- a/WebServer/index.html +++ b/WebServer/index.html @@ -11,10 +11,10 @@ - ---> + @@ -12,8 +13,6 @@ -