From a276d439da31f682a5a3b9b8d53a434eb6c5abb6 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 14 May 2019 16:14:17 +0200 Subject: [PATCH 1/2] Refactoring to Cockpit Space --- Scripts/AppLoader.js | 4 ++-- server.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Scripts/AppLoader.js b/Scripts/AppLoader.js index aa68afbe2..0923a0e98 100644 --- a/Scripts/AppLoader.js +++ b/Scripts/AppLoader.js @@ -51,7 +51,7 @@ function newAppLoader () { 'ControlsToolBox/SidePanel.js', 'ControlsToolBox/SidePanelTab.js', - 'Spaces/BottomSpace.js', + 'Spaces/CockpitSpace.js', 'Spaces/TopSpace.js', 'Spaces/PanelsSpace.js', 'Spaces/ChartSpace.js', @@ -90,7 +90,7 @@ function newAppLoader () { 'ChartsSpace/ViewPort.js', 'ChartsSpace/TimeLineCoordinateSystem.js', - 'BottomSpace/UIControl.js', + 'CockpitSpace/UIControl.js', 'Plotter.js', 'PlotterPanel.js', diff --git a/server.js b/server.js index 826479d03..f8c4d9294 100644 --- a/server.js +++ b/server.js @@ -455,9 +455,9 @@ function onBrowserRequest (request, response) { } break - case 'BottomSpace': // This means the BottomSpace folder. + case 'CockpitSpace': // This means the CockpitSpace folder. { - respondWithFile(serverConfig.pathToCanvasApp + '/BottomSpace/' + requestParameters[2], response) + respondWithFile(serverConfig.pathToCanvasApp + '/CockpitSpace/' + requestParameters[2], response) } break From 7936a79ba82b3590cb67afbc07240878be75045a Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 14 May 2019 19:14:47 +0200 Subject: [PATCH 2/2] Cockpit files --- .gitignore | 1 + Scripts/AppLoader.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0390319c6..73453af37 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ this.server.config.dev.json /.nyc_output /coverage +debug.log diff --git a/Scripts/AppLoader.js b/Scripts/AppLoader.js index 0923a0e98..ae46f2657 100644 --- a/Scripts/AppLoader.js +++ b/Scripts/AppLoader.js @@ -90,7 +90,8 @@ function newAppLoader () { 'ChartsSpace/ViewPort.js', 'ChartsSpace/TimeLineCoordinateSystem.js', - 'CockpitSpace/UIControl.js', + 'CockpitSpace/AssetBalances.js', + 'CockpitSpace/Speedometer.js', 'Plotter.js', 'PlotterPanel.js',