Merge pull request #276 from Superalgos/develop

Beta 6 Pre-Release

.env

@@ -1,7 +1,7 @@
 
 #PORT NUMBERS: If any of these ports are already in use by a different app, please pick a new number between 1 and 50000.
-WEB_SERVER_PORT=34247
-WEB_SOCKETS_SERVER_PORT=8080
+WEB_SERVER_PORT=34248
+WEB_SOCKETS_SERVER_PORT=8081
 
 
 # TASK MANAGER VARIABLES: 
@@ -13,9 +13,14 @@ TASK_SERVER_PATH=./TaskServer
 INTER_PROCESS_FILES_PATH=./Inter-Process-Files
 STORAGE_PATH=./Data-Storage
 PLOTTERS_PATH=./Legacy-Code
-DATA_MINES_PATH=./Data-Mines
-TRADING_SYSTEMS_PATH=./Trading-Systems
-SUPER_SCRIPTS_PATH=./Super-Scripts
+
+DATA_MINES_PATH=./Includes/Data-Mines
+TRADING_MINES_PATH=./Includes/Trading-Mines
+TRADING_SYSTEMS_PATH=./Includes/Trading-Systems
+SUPER_SCRIPTS_PATH=./Includes/Super-Scripts
+TRADING_ENGINES_PATH=./Includes/Trading-Engines
+TUTORIALS_PATH=./Includes/Tutorials
+WORKSPACES_PATH=./Includes/Workspaces
 
 WRITE_LOGS_TO_FILES=true
 BOTS_PATH=./Legacy-Code
@@ -34,5 +39,8 @@ PATH_TO_FILES_COMPONENT=./Files-Component/src
 PATH_TO_WEB_SERVER=./BackendServers/
 
 APP_SCHEMA_PATH=./
-WORKSPACE_PATH=./
-MY_WORKSPACES_PATH=./My-Workspaces
+DOC_SCHEMA_PATH=./
+CONCEPT_SCHEMA_PATH=./
+DEFAULT_WORKSPACE_PATH=./Includes/Workspaces
+MY_WORKSPACES_PATH=./My-Workspaces
+PATH_TO_FONTS=./BackendServers/WebServer/Fonts

.gitignore

@@ -1,2 +1,3 @@
 Data-Storage
-Log-Files
+Log-Files
+My-Workspaces

BackendServers/.env

@@ -8,6 +8,6 @@ WRITE_LOGS_TO_FILES=true
 BOTS_PATH=../Legacy-Code
 LOG_PATH=../Log-Files
 
-WEB_SOCKETS_SERVER_PORT=8080
-WEB_SERVER_PORT=34247
+WEB_SOCKETS_SERVER_PORT=8081
+WEB_SERVER_PORT=34248
 WEB_SERVER_URL=localhost

BackendServers/WebServer/AppLoader.js

@@ -19,15 +19,17 @@ function newAppLoader() {
 
             let plotters
             let modulesArray = []
-           
+
             plotters = defaultPlotters()
-       
+
             modulesArray = modulesArray.concat([
                 'ChartingSpace/Viewport.js',
-          
+
                 'Globals.js',
- 
+
                 'AppSchema.js',
+                'DocSchema.js',
+                'ConceptSchema.js',
                 'Workspace.js',
 
                 'ChartingSpace/EdgeEditor.js',
@@ -44,17 +46,37 @@ function newAppLoader() {
                 'DesignSpace/Workspace/FunctionLibraries/NodeDeleter.js',
                 'DesignSpace/Workspace/FunctionLibraries/ProtocolNode.js',
                 'DesignSpace/Workspace/FunctionLibraries/NodeCloning.js',
-                'DesignSpace/Workspace/FunctionLibraries/NodeChildren.js', 
+                'DesignSpace/Workspace/FunctionLibraries/NodeChildren.js',
                 'DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js',
                 'DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js',
                 'DesignSpace/Workspace/FunctionLibraries/ShortcutKeys.js',
                 'DesignSpace/Workspace/FunctionLibraries/OnFocus.js',
                 'DesignSpace/Workspace/FunctionLibraries/SuperScripts.js',
-                'DesignSpace/Workspace/FunctionLibraries/CCXTFunctions.js',
-                'DesignSpace/Workspace/FunctionLibraries/WebhookFunctions.js', 
+                'DesignSpace/Workspace/FunctionLibraries/CryptoEcosystemFunctions.js',
+                'DesignSpace/Workspace/FunctionLibraries/WebhookFunctions.js',
                 'DesignSpace/Workspace/FunctionLibraries/DependenciesFilter.js',
-                               
-                'Utilities/RoundedCornersBackground.js',
+                'DesignSpace/Workspace/FunctionLibraries/NodePath.js',
+                'DesignSpace/Workspace/FunctionLibraries/DataMineFunctions.js',
+                'DesignSpace/Workspace/FunctionLibraries/DataStorageFunctions.js',
+                'DesignSpace/Workspace/FunctionLibraries/ChartingSpaceFunctions.js',
+                'DesignSpace/Workspace/FunctionLibraries/TutorialFunctions.js',   
+                'DesignSpace/Workspace/FunctionLibraries/IncludesFunctions.js',  
+
+                'Utilities/CoordinateTransformations.js',
+                'Utilities/DateRateTransformations.js',
+                'Utilities/Download.js',
+                'Utilities/Clipboard.js',
+                'Utilities/DrawPrint.js',
+                'Utilities/LoadSaveFrame.js',
+                'Utilities/LoadSaveTutorial.js',
+                'Utilities/NodeConfig.js',
+                'Utilities/Hiriarchy.js',
+                'Utilities/Folders.js',
+                'Utilities/Branches.js',
+                'Utilities/Meshes.js',
+                'Utilities/NodeChildren.js',
+                'Utilities/Menu.js',
+                'Utilities/Dates.js',
 
                 'Panels/LayersPanel.js',
                 'Panels/UpDownButton.js',
@@ -62,7 +84,7 @@ function newAppLoader() {
                 'Panels/Layer.js',
                 'Panels/PlotterPanel.js',
                 'Panels/PanelsVisibleButton.js',
-                
+
                 'SideSpace/SidePanelTab.js',
                 'SideSpace/ListView.js',
                 'SideSpace/ListItem.js',
@@ -74,6 +96,9 @@ function newAppLoader() {
                 'Spaces/FloatingSpace.js',
                 'Spaces/DesignSpace.js',
                 'Spaces/SideSpace.js',
+                'Spaces/DocSpace.js',
+                'Spaces/ChatSpace.js',
+                'Spaces/TutorialSpace.js',
 
                 'Files/SingleFile.js',
                 'Files/FileCloud.js',
@@ -92,7 +117,7 @@ function newAppLoader() {
                 'FloatingSpace/CircularMenuItem.js',
                 'FloatingSpace/CircularProgressBar.js',
                 'FloatingSpace/BusyProgressBar.js',
-                'FloatingSpace/CodeEditor.js', 
+                'FloatingSpace/CodeEditor.js',
                 'FloatingSpace/ConfigEditor.js',
                 'FloatingSpace/ConditionEditor.js',
                 'FloatingSpace/FormulaEditor.js',
@@ -103,29 +128,36 @@ function newAppLoader() {
                 'Scales/TimeFrameScale.js',
                 'Scales/Commons.js',
                 'Scales/AutoScaleButton.js',
-                
+
                 'CockpitSpace/AssetBalances.js',
                 'CockpitSpace/Speedometer.js',
                 'CockpitSpace/FullScreen.js',
 
                 'EventsServerClient.js',
 
-                'VideoRecorder.js',
-                'Plotter.js',
+                'Plotting/Plotter.js',
+                'Plotting/NodesHighlights.js',
+                'Plotting/NodesErrors.js',
+                'Plotting/NodesWarnings.js',
+                'Plotting/NodesInfos.js',
+                'Plotting/NodesValues.js',
+                'Plotting/NodesStatus.js',
+                'Plotting/NodesProgress.js',
+                'Plotting/NodesRunning.js',
+                'Plotting/NodesAnnouncements.js',
+                'Plotting/RecordValues.js',
+
                 'LegacyPlotter.js',
                 'PlotterPanel.js',
 
+                'VideoRecorder.js',
                 'ProductStorage.js',
-
                 'SplashScreen.js',
                 'Canvas.js',
                 'EventHandler.js',
                 'Frame.js',
-
                 'Animation.js',
-
                 'Container.js',
-
                 'Utilities.js',
                 'PostLoader.js'
             ])
@@ -133,13 +165,9 @@ function newAppLoader() {
             modulesArray = modulesArray.concat(plotters)
 
             let downloadedCounter = 0
-            let versionParam = window.canvasApp.version
-            if (versionParam === undefined) { versionParam = '' } else {
-                versionParam = '?' + versionParam
-            }
 
             for (let i = 0; i < modulesArray.length; i++) {
-                let path = window.canvasApp.urlPrefix + modulesArray[i] + versionParam
+                let path = modulesArray[i] 
 
                 REQUIREJS([path], onRequired)
 
@@ -176,23 +204,14 @@ function newAppLoader() {
     }
 
     function defaultPlotters() {
-        return [  
+        return [
             'Plotters/Masters/Plotters-Candles-Volumes/Candles.js',
             'Plotters/Masters/Plotters-Candles-Volumes/CandlePanel.js',
             'Plotters/Masters/Plotters-Candles-Volumes/Volumes.js',
             'Plotters/Masters/Plotters-Candles-Volumes/VolumePanel.js',
             'Plotters/Masters/Plotters-Bollinger-Bands/BollingerBands.js',
             'Plotters/Masters/Plotters-Bollinger-Bands/BollingerBandsPanel.js',
-            'Plotters/Masters/Plotters-Bollinger-Bands/PercentageBandwidth.js',
-            'Plotters/TradingEngines/Plotters-Trading-Simulation/TradingSimulation.js',
-            'Plotters/TradingEngines/Plotters-Trading-Simulation/TradingSimulationAssetBalancesPanel.js',
-            'Plotters/TradingEngines/Plotters-Trading-Simulation/TradingSimulationCurrentPositionPanel.js',
-            'Plotters/TradingEngines/Plotters-Trading-Simulation/TradingSimulationPartialResultsPanel.js',
-            'Plotters/TradingEngines/Plotters-Trading-Simulation/Conditions.js',
-            'Plotters/TradingEngines/Plotters-Trading-Simulation/Strategies.js',
-            'Plotters/TradingEngines/Plotters-Trading-Simulation/Trades.js',
-            'Plotters/TradingEngines/Plotters-Trading-Simulation/SimulationExecution.js',
-            'Plotters/TradingEngines/Plotters-Trading-Simulation/SimulationExecutionPanel.js'
+            'Plotters/Masters/Plotters-Bollinger-Bands/PercentageBandwidth.js'
         ]
     }
 

BackendServers/WebServer/AppPreLoader.js

@@ -39,109 +39,83 @@ function loadSuperalgos() {
 
     const MODULE_NAME = "App Pre-Loader";
     const INFO_LOG = false;
-    const ERROR_LOG = true;
 
-    if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] loadSuperalgos -> Entering function."); }
+    setupHTMLTextArea()
+    setupHTMLInput()
+    setupHTMLCanvas()
+    loadDebugModule()
 
-    /* The first thing to do here is to add the canvas where all the action is going to happen. */
+    function setupHTMLTextArea() {
+        let textArea = document.createElement('textarea');
+        textArea.id = "textArea";
+        textArea.spellcheck = false;
+        textArea.style = 'resize: none;' +
+            ' border: none;' +
+            ' outline: none;' +
+            'box-shadow: none;' +
+            'overflow:hidden;' +
+            'font-family: ' + 'Saira' + ';' +
+            'font-size: 12px;' +
+            'background-color: rgb(255, 255, 255);' +
+            'color:rgb(255, 255, 255);' +
+            'width: ' + 600 + 'px;' +
+            'height: ' + 400 + 'px'
 
+        let textAreaDiv = document.getElementById('textAreaDiv');
+        textAreaDiv.appendChild(textArea);
+        textAreaDiv.style = 'position:fixed; top:' + -1500 + 'px; left:' + 500 + 'px; z-index:10; '
+    }
 
-    let textArea = document.createElement('textarea');
-    textArea.id = "textArea";
-    textArea.spellcheck = false;
-    textArea.style = 'resize: none;' +
-        ' border: none;' +
-        ' outline: none;' +
-        'box-shadow: none;' +
-        'overflow:hidden;' +
-        'font-family: ' + 'Saira' + ';' +
-        'font-size: 12px;' +
-        'background-color: rgb(255, 255, 255);' +
-        'color:rgb(255, 255, 255);' +
-        'width: ' + 800 + 'px;' +
-        'height: ' + 600 + 'px'
+    function setupHTMLInput() {
+        let input = document.createElement('input');
+        input.id = "input";
+        input.spellcheck = false;
+        input.style = "border: none; outline: none; box-shadow: none; overflow:hidden;  width: 0px; height: 0px;";
 
-    let textAreaDiv = document.getElementById('textAreaDiv');
-    textAreaDiv.appendChild(textArea);
-    textAreaDiv.style = 'position:fixed; top:' + -1500 + 'px; left:' + 500 + 'px; z-index:10; '
+        let inputDiv = document.getElementById('inputDiv');
+        inputDiv.appendChild(input);
+    }
 
-    let input = document.createElement('input');
-    input.id = "input";
-    input.spellcheck = false;
-    input.style = "border: none; outline: none; box-shadow: none; overflow:hidden;  width: 0px; height: 0px;";
+    function setupHTMLCanvas() {
+        let canvas = document.createElement('canvas');
 
-    let inputDiv = document.getElementById('inputDiv');
-    inputDiv.appendChild(input);
+        canvas.id = "canvas";
+        canvas.width = 1400;
+        canvas.height = 600;
+        canvas.style.border = "0";
+        canvas.style = "position:absolute; top:0px; left:0px; z-index:1";
 
+        let canvasApp = document.getElementById('canvasApp');
+        canvasApp.appendChild(canvas);
 
-    let canvas = document.createElement('canvas');
+        browserCanvas = document.getElementById('canvas');
 
-    canvas.id = "canvas";
-    canvas.width = 1400;
-    canvas.height = 600;
-    canvas.style.border = "0";
-    canvas.style = "position:absolute; top:0px; left:0px; z-index:1";
+        browserCanvas.width = window.innerWidth;
+        browserCanvas.height = window.innerHeight;
+        browserCanvas.style.border = "none";
 
-    let canvasApp = document.getElementById('canvasApp');
-    canvasApp.appendChild(canvas);
-
-    browserCanvas = document.getElementById('canvas');
-
-    browserCanvas.width = window.innerWidth;
-    browserCanvas.height = window.innerHeight - window.canvasApp.topMargin;
-    browserCanvas.style.border = "none";
-
-    browserCanvas.style.top = window.canvasApp.topMargin + 'px';
-
-
-
-    loadDebugModule();
+        browserCanvas.style.top = 0 + 'px';
+    }
 
     function loadDebugModule() {
+        let path = "WebDebugLog.js";
+        REQUIREJS([path], onRequired);
 
-        try {
-            if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] loadDebugModule -> Entering function."); }
-
-            let path = window.canvasApp.urlPrefix + "WebDebugLog.js";
-
-            REQUIREJS([path], onRequired);
-
-            function onRequired(pModule) {
-
-                if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] " + path + " downloaded."); }
-
-                loadModules();
-
-            }
-        }
-        catch (err) {
-            console.log(spacePad(MODULE_NAME, 50) + " : " + "[ERROR]  loadDebugModule --> " + path + " --> err = " + err.stack);
+        function onRequired(pModule) {
+            if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] " + path + " downloaded."); }
+            loadModules();
         }
     }
 
     /* And Finally, we start loading all the scripts we will inmediatelly need. */
-
     function loadModules() {
+        let path = "WebServer/AppLoader.js";
+        REQUIREJS([path], onRequired);
 
-        try {
-
-            if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] loadModules -> Entering function."); }
-
-            let path = window.canvasApp.urlPrefix + "WebServer/AppLoader.js";
-
-            REQUIREJS([path], onRequired);
-
-            function onRequired(pModule) {
-
-                if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] " + path + " downloaded."); }
-
-                let APP_LOADER_MODULE = newAppLoader();
-                APP_LOADER_MODULE.loadModules();
-
-            }
-        }
-        catch (err) {
-            console.log(spacePad(MODULE_NAME, 50) + " : " + "[ERROR]  loadModules --> " + path + " --> err = " + err.stack);
+        function onRequired(pModule) {
+            if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] " + path + " downloaded."); }
+            let APP_LOADER_MODULE = newAppLoader();
+            APP_LOADER_MODULE.loadModules();
         }
     }
 }