From 5b7dbb505233b05302d427b703bd42578dc83666 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Mon, 27 May 2019 11:17:10 +0200
Subject: [PATCH 1/2] Workspace Reorg

---
 Scripts/AppLoader.js | 24 ++++++++++++++++--------
 server.js            | 15 +++++++++++++--
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/Scripts/AppLoader.js b/Scripts/AppLoader.js
index d03210f60..8a8567dc5 100644
--- a/Scripts/AppLoader.js
+++ b/Scripts/AppLoader.js
@@ -28,26 +28,34 @@ function newAppLoader () {
 
         'Globals.js',
         'Ecosystem.js',
-          'MQService',
+        'MQService',
 
-          'ChartsSpace/ChartUtilities.js',
-          'ChartsSpace/PlottersManager.js',
-          'ChartsSpace/TimelineChart.js',
-          'ChartsSpace/TimeMachine.js',
-          'ChartsSpace/ViewPort.js',
-          'ChartsSpace/TimeLineCoordinateSystem.js',
+        'ChartsSpace/ChartUtilities.js',
+        'ChartsSpace/PlottersManager.js',
+        'ChartsSpace/TimelineChart.js',
+        'ChartsSpace/TimeMachine.js',
+        'ChartsSpace/ViewPort.js',
+        'ChartsSpace/TimeLineCoordinateSystem.js',
 
         'TopSpace/CurrentEvent.js',
         'TopSpace/EndUser.js',
         'TopSpace/Login.js',
 
         'StrategySpace/StrategizerGateway.js',
-        'StrategySpace/Workspace.js',
+        
         'StrategySpace/ConstGetStrategies.js',
         'StrategySpace/ConstNewStrategy.js',
         'StrategySpace/ConstUpdateStrategy.js',
         'StrategySpace/ConstDeleteStrategy.js',
 
+        'StrategySpace/Workspace/Workspace.js',
+        'StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js',
+        'StrategySpace/Workspace/FunctionLibraries/AttachDetach.js',
+        'StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js',
+        'StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js',
+          'StrategySpace/Workspace/FunctionLibraries/WorkspaceNode.js',
+                                                     
+
         'Utilities/RoundedCornersBackground.js',
 
         'Panels/TimeControlPanel.js',
diff --git a/server.js b/server.js
index f8c4d9294..8c7ce9eb9 100644
--- a/server.js
+++ b/server.js
@@ -468,8 +468,19 @@ function onBrowserRequest (request, response) {
       break
 
     case 'StrategySpace': // This means the StrategySpace folder.
-        {
-              respondWithFile(serverConfig.pathToCanvasApp + '/StrategySpace/' + requestParameters[2], response)
+          {     
+              if (requestParameters[3] === undefined) {
+                  respondWithFile(serverConfig.pathToCanvasApp + '/StrategySpace/' + requestParameters[2], response)
+                  return
+              }
+              if (requestParameters[4] === undefined) {
+                  respondWithFile(serverConfig.pathToCanvasApp + '/StrategySpace/' + requestParameters[2] + '/' + requestParameters[3] , response)
+                  return
+              }
+              if (requestParameters[5] === undefined) {
+                  respondWithFile(serverConfig.pathToCanvasApp + '/StrategySpace/' + requestParameters[2] + '/' + requestParameters[3] + '/' + requestParameters[4], response)
+                  return
+              }              
         }
         break
 

From 19921cae4e5483fbdd5255623fc80f3075b60c9c Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Wed, 29 May 2019 21:50:35 +0200
Subject: [PATCH 2/2] Merging Matis version

---
 Project.njsproj | 33 ++-------------------------------
 index.html      |  2 +-
 server.js       |  6 +++---
 3 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/Project.njsproj b/Project.njsproj
index b5e15d9cd..20de3b807 100644
--- a/Project.njsproj
+++ b/Project.njsproj
@@ -33,47 +33,18 @@
     <Compile Include="Ecosystem.js" />
     <Compile Include="Plotter.js" />
     <Compile Include="PlotterPanel.js" />
-    <Compile Include="Server\BotsScripts.js" />
-    <Compile Include="Server\Exchange\exchangeUtils.js" />
-    <Compile Include="Server\Exchange\Wrappers\beautifier.js" />
-    <Compile Include="Server\Exchange\Wrappers\binance.js" />
-    <Compile Include="Server\Exchange\Wrappers\binanceClient.js" />
-    <Compile Include="Server\Exchange\Wrappers\poloniex.js" />
-    <Compile Include="Server\Exchange\Wrappers\poloniexClient.js" />
     <Compile Include="Scripts\AppLoader.js">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scripts\AppPreLoader.js">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Server\MinioStorage.js">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Server\SessionManager.js">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Server\AzureStorageAccessManager.js">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Scripts\require.js" />
-    <Compile Include="Server\ConfigReader.js">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Server\Github.js">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Server\AzureStorage.js">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="server.js" />
+    <Compile Include="Server\FileCloud.js" />
     <Content Include="index.html" />
-    <Content Include="Server\Exchange\Wrappers\binanceProperties.json" />
-    <Content Include="Server\Exchange\Wrappers\poloniexProperties.json" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Azure\" />
-    <Folder Include="Server\Exchange\" />
-    <Folder Include="Server\Exchange\Wrappers\" />
     <Folder Include="Scripts\" />
     <Folder Include="Server\" />
   </ItemGroup>
@@ -118,4 +89,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/index.html b/index.html
index 4146a22e7..8a460174c 100644
--- a/index.html
+++ b/index.html
@@ -22,7 +22,7 @@
         topMargin: 85,
         urlPrefix: 'http://localhost:1337/',
         graphQL: {
-            masterAppApiUrl: 'http://localhost:4100/graphql',
+            masterAppApiUrl: 'https://platform-api-dev.superalgos.org/graphql/',
         },
         context: {}
     };
diff --git a/server.js b/server.js
index 0f84eba92..1ce4a8ab0 100644
--- a/server.js
+++ b/server.js
@@ -156,15 +156,15 @@ function onBrowserRequest (request, response) {
 
       {
         if (requestParameters[3] === undefined) {
-          respondWithFile(serverConfig.pathToCanvasApp + '/StrategySpace/' + requestParameters[2], response)
+            respondWithFile(process.env.PATH_TO_CANVAS_APP + '/StrategySpace/' + requestParameters[2], response)
           return
         }
         if (requestParameters[4] === undefined) {
-          respondWithFile(serverConfig.pathToCanvasApp + '/StrategySpace/' + requestParameters[2] + '/' + requestParameters[3], response)
+            respondWithFile(process.env.PATH_TO_CANVAS_APP + '/StrategySpace/' + requestParameters[2] + '/' + requestParameters[3], response)
           return
         }
         if (requestParameters[5] === undefined) {
-          respondWithFile(serverConfig.pathToCanvasApp + '/StrategySpace/' + requestParameters[2] + '/' + requestParameters[3] + '/' + requestParameters[4], response)
+            respondWithFile(process.env.PATH_TO_CANVAS_APP + '/StrategySpace/' + requestParameters[2] + '/' + requestParameters[3] + '/' + requestParameters[4], response)
           return
         }
       }