diff --git a/Images/Icons/pause.png b/Images/Icons/pause.png deleted file mode 100644 index 2cfc0ff09..000000000 Binary files a/Images/Icons/pause.png and /dev/null differ diff --git a/Images/Icons/play.png b/Images/Icons/play.png deleted file mode 100644 index 81862cec5..000000000 Binary files a/Images/Icons/play.png and /dev/null differ diff --git a/Images/Icons/style-01/analysis-1.png b/Images/Icons/style-01/analysis-1.png new file mode 100644 index 000000000..8b3d61b9e Binary files /dev/null and b/Images/Icons/style-01/analysis-1.png differ diff --git a/Images/Icons/style-01/analysis.png b/Images/Icons/style-01/analysis.png new file mode 100644 index 000000000..80ede07af Binary files /dev/null and b/Images/Icons/style-01/analysis.png differ diff --git a/Images/Icons/style-01/approve.png b/Images/Icons/style-01/approve.png new file mode 100644 index 000000000..2145a1626 Binary files /dev/null and b/Images/Icons/style-01/approve.png differ diff --git a/Images/Icons/style-01/attach.png b/Images/Icons/style-01/attach.png new file mode 100644 index 000000000..678806e32 Binary files /dev/null and b/Images/Icons/style-01/attach.png differ diff --git a/Images/Icons/style-01/attractive.png b/Images/Icons/style-01/attractive.png new file mode 100644 index 000000000..62e6fe2e7 Binary files /dev/null and b/Images/Icons/style-01/attractive.png differ diff --git a/Images/Icons/style-01/brainstorming.png b/Images/Icons/style-01/brainstorming.png new file mode 100644 index 000000000..993bf0ec2 Binary files /dev/null and b/Images/Icons/style-01/brainstorming.png differ diff --git a/Images/Icons/style-01/broken-link.png b/Images/Icons/style-01/broken-link.png new file mode 100644 index 000000000..1d13ad8ac Binary files /dev/null and b/Images/Icons/style-01/broken-link.png differ diff --git a/Images/Icons/style-01/chat.png b/Images/Icons/style-01/chat.png new file mode 100644 index 000000000..0b424a267 Binary files /dev/null and b/Images/Icons/style-01/chat.png differ diff --git a/Images/Icons/style-01/chronometer.png b/Images/Icons/style-01/chronometer.png new file mode 100644 index 000000000..9f4821359 Binary files /dev/null and b/Images/Icons/style-01/chronometer.png differ diff --git a/Images/Icons/style-01/compass.png b/Images/Icons/style-01/compass.png new file mode 100644 index 000000000..e9b80e7b7 Binary files /dev/null and b/Images/Icons/style-01/compass.png differ diff --git a/Images/Icons/style-01/competition.png b/Images/Icons/style-01/competition.png new file mode 100644 index 000000000..96082a10d Binary files /dev/null and b/Images/Icons/style-01/competition.png differ diff --git a/Images/Icons/style-01/content.png b/Images/Icons/style-01/content.png new file mode 100644 index 000000000..b46362501 Binary files /dev/null and b/Images/Icons/style-01/content.png differ diff --git a/Images/Icons/style-01/design-tool.png b/Images/Icons/style-01/design-tool.png new file mode 100644 index 000000000..7eb24f192 Binary files /dev/null and b/Images/Icons/style-01/design-tool.png differ diff --git a/Images/Icons/style-01/grid.png b/Images/Icons/style-01/grid.png new file mode 100644 index 000000000..b68f70a44 Binary files /dev/null and b/Images/Icons/style-01/grid.png differ diff --git a/Images/Icons/style-01/headphones.png b/Images/Icons/style-01/headphones.png new file mode 100644 index 000000000..d7c099510 Binary files /dev/null and b/Images/Icons/style-01/headphones.png differ diff --git a/Images/Icons/style-01/html.png b/Images/Icons/style-01/html.png new file mode 100644 index 000000000..fa46b2b7b Binary files /dev/null and b/Images/Icons/style-01/html.png differ diff --git a/Images/Icons/style-01/image.png b/Images/Icons/style-01/image.png new file mode 100644 index 000000000..60b436b12 Binary files /dev/null and b/Images/Icons/style-01/image.png differ diff --git a/Images/Icons/style-01/layout.png b/Images/Icons/style-01/layout.png new file mode 100644 index 000000000..eb93ce845 Binary files /dev/null and b/Images/Icons/style-01/layout.png differ diff --git a/Images/Icons/style-01/loading.png b/Images/Icons/style-01/loading.png new file mode 100644 index 000000000..845c02cbd Binary files /dev/null and b/Images/Icons/style-01/loading.png differ diff --git a/Images/Icons/style-01/login.png b/Images/Icons/style-01/login.png new file mode 100644 index 000000000..16a99c7b1 Binary files /dev/null and b/Images/Icons/style-01/login.png differ diff --git a/Images/Icons/style-01/pantone.png b/Images/Icons/style-01/pantone.png new file mode 100644 index 000000000..0ea9cae40 Binary files /dev/null and b/Images/Icons/style-01/pantone.png differ diff --git a/Images/Icons/style-01/paper-plane.png b/Images/Icons/style-01/paper-plane.png new file mode 100644 index 000000000..b61292bbc Binary files /dev/null and b/Images/Icons/style-01/paper-plane.png differ diff --git a/Images/Icons/style-01/photo-camera.png b/Images/Icons/style-01/photo-camera.png new file mode 100644 index 000000000..77336bdff Binary files /dev/null and b/Images/Icons/style-01/photo-camera.png differ diff --git a/Images/Icons/style-01/piggy-bank.png b/Images/Icons/style-01/piggy-bank.png new file mode 100644 index 000000000..5fe9f5062 Binary files /dev/null and b/Images/Icons/style-01/piggy-bank.png differ diff --git a/Images/Icons/style-01/pipette.png b/Images/Icons/style-01/pipette.png new file mode 100644 index 000000000..5d854018c Binary files /dev/null and b/Images/Icons/style-01/pipette.png differ diff --git a/Images/Icons/style-01/pixel.png b/Images/Icons/style-01/pixel.png new file mode 100644 index 000000000..0dd36069e Binary files /dev/null and b/Images/Icons/style-01/pixel.png differ diff --git a/Images/Icons/style-01/placeholder.png b/Images/Icons/style-01/placeholder.png new file mode 100644 index 000000000..b9d3765cf Binary files /dev/null and b/Images/Icons/style-01/placeholder.png differ diff --git a/Images/Icons/style-01/planning.png b/Images/Icons/style-01/planning.png new file mode 100644 index 000000000..d6e3db3d5 Binary files /dev/null and b/Images/Icons/style-01/planning.png differ diff --git a/Images/Icons/style-01/promotion.png b/Images/Icons/style-01/promotion.png new file mode 100644 index 000000000..2d38a607d Binary files /dev/null and b/Images/Icons/style-01/promotion.png differ diff --git a/Images/Icons/style-01/pyramid.png b/Images/Icons/style-01/pyramid.png new file mode 100644 index 000000000..4b940968b Binary files /dev/null and b/Images/Icons/style-01/pyramid.png differ diff --git a/Images/Icons/style-01/quality.png b/Images/Icons/style-01/quality.png new file mode 100644 index 000000000..10ee8b6bd Binary files /dev/null and b/Images/Icons/style-01/quality.png differ diff --git a/Images/Icons/style-01/responsive.png b/Images/Icons/style-01/responsive.png new file mode 100644 index 000000000..3de364530 Binary files /dev/null and b/Images/Icons/style-01/responsive.png differ diff --git a/Images/Icons/style-01/schedule.png b/Images/Icons/style-01/schedule.png new file mode 100644 index 000000000..cf928a0ea Binary files /dev/null and b/Images/Icons/style-01/schedule.png differ diff --git a/Images/Icons/style-01/search.png b/Images/Icons/style-01/search.png new file mode 100644 index 000000000..595845f03 Binary files /dev/null and b/Images/Icons/style-01/search.png differ diff --git a/Images/Icons/style-01/security.png b/Images/Icons/style-01/security.png new file mode 100644 index 000000000..cc32f2462 Binary files /dev/null and b/Images/Icons/style-01/security.png differ diff --git a/Images/Icons/style-01/settings.png b/Images/Icons/style-01/settings.png new file mode 100644 index 000000000..878a9aa46 Binary files /dev/null and b/Images/Icons/style-01/settings.png differ diff --git a/Images/Icons/style-01/sitemap.png b/Images/Icons/style-01/sitemap.png new file mode 100644 index 000000000..0c864590f Binary files /dev/null and b/Images/Icons/style-01/sitemap.png differ diff --git a/Images/Icons/style-01/startup.png b/Images/Icons/style-01/startup.png new file mode 100644 index 000000000..7ed8d6cb0 Binary files /dev/null and b/Images/Icons/style-01/startup.png differ diff --git a/Images/Icons/style-01/support.png b/Images/Icons/style-01/support.png new file mode 100644 index 000000000..fcafb34f3 Binary files /dev/null and b/Images/Icons/style-01/support.png differ diff --git a/Images/Icons/style-01/tap.png b/Images/Icons/style-01/tap.png new file mode 100644 index 000000000..7f958daf5 Binary files /dev/null and b/Images/Icons/style-01/tap.png differ diff --git a/Images/Icons/style-01/target.png b/Images/Icons/style-01/target.png new file mode 100644 index 000000000..d574717bf Binary files /dev/null and b/Images/Icons/style-01/target.png differ diff --git a/Images/Icons/style-01/targeting.png b/Images/Icons/style-01/targeting.png new file mode 100644 index 000000000..ef53bb1e6 Binary files /dev/null and b/Images/Icons/style-01/targeting.png differ diff --git a/Images/Icons/style-01/task.png b/Images/Icons/style-01/task.png new file mode 100644 index 000000000..e85e1ba2b Binary files /dev/null and b/Images/Icons/style-01/task.png differ diff --git a/Images/Icons/style-01/testing.png b/Images/Icons/style-01/testing.png new file mode 100644 index 000000000..2c3a28848 Binary files /dev/null and b/Images/Icons/style-01/testing.png differ diff --git a/Images/Icons/style-01/text.png b/Images/Icons/style-01/text.png new file mode 100644 index 000000000..959e64e90 Binary files /dev/null and b/Images/Icons/style-01/text.png differ diff --git a/Images/Icons/style-01/timeline.png b/Images/Icons/style-01/timeline.png new file mode 100644 index 000000000..8a7051d9f Binary files /dev/null and b/Images/Icons/style-01/timeline.png differ diff --git a/Images/Icons/style-01/tools.png b/Images/Icons/style-01/tools.png new file mode 100644 index 000000000..a22d7f0a3 Binary files /dev/null and b/Images/Icons/style-01/tools.png differ diff --git a/Images/Icons/style-01/trash.png b/Images/Icons/style-01/trash.png new file mode 100644 index 000000000..613aa7e8c Binary files /dev/null and b/Images/Icons/style-01/trash.png differ diff --git a/Images/Icons/style-01/upload.png b/Images/Icons/style-01/upload.png new file mode 100644 index 000000000..50e4d79c2 Binary files /dev/null and b/Images/Icons/style-01/upload.png differ diff --git a/Images/Icons/style-01/vector.png b/Images/Icons/style-01/vector.png new file mode 100644 index 000000000..b9b1e7a02 Binary files /dev/null and b/Images/Icons/style-01/vector.png differ diff --git a/Images/Icons/style-01/video-player.png b/Images/Icons/style-01/video-player.png new file mode 100644 index 000000000..b382fe80e Binary files /dev/null and b/Images/Icons/style-01/video-player.png differ diff --git a/Images/Icons/trash.png b/Images/Icons/trash.png deleted file mode 100644 index 427c65d5d..000000000 Binary files a/Images/Icons/trash.png and /dev/null differ diff --git a/Images/calendar.svg b/Images/calendar.svg new file mode 100644 index 000000000..725e88798 --- /dev/null +++ b/Images/calendar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Scripts/AppLoader.js b/Scripts/AppLoader.js index d86855b4b..aa68afbe2 100644 --- a/Scripts/AppLoader.js +++ b/Scripts/AppLoader.js @@ -1,27 +1,24 @@ -let dashboard; +let dashboard -function newAppLoader() { +function newAppLoader () { + const MODULE_NAME = 'App Loader' + const INFO_LOG = false + const ERROR_LOG = true + const INTENSIVE_LOG = false + const logger = newWebDebugLog() + logger.fileName = MODULE_NAME - const MODULE_NAME = "App Loader"; - const INFO_LOG = false; - const ERROR_LOG = true; - const INTENSIVE_LOG = false; - const logger = newWebDebugLog(); - logger.fileName = MODULE_NAME; + let thisObject = { + loadModules: loadModules + } - let thisObject = { - loadModules: loadModules - }; + return thisObject - return thisObject; + function loadModules () { + try { + if (INFO_LOG === true) { logger.write('[INFO] loadModules -> Entering function.') } - function loadModules() { - - try { - - if (INFO_LOG === true) { logger.write("[INFO] loadModules -> Entering function."); } - - let modulesArray = [ + let modulesArray = [ /* CloudWebScripts */ @@ -29,136 +26,133 @@ function newAppLoader() { /* PlotterPanels */ + 'Globals.js', + 'Ecosystem.js', + 'MQService', - "Globals.js", - "Ecosystem.js", - "MQService", + 'TopSpace/CurrentEvent.js', + 'TopSpace/EndUser.js', + 'TopSpace/Login.js', - "TopSpace/CurrentEvent.js", - "TopSpace/EndUser.js", - "TopSpace/Login.js", + 'StrategySpace/Workspace.js', + 'StrategySpace/TradingSystem.js', + 'StrategySpace/ConstGetStrategies.js', + 'StrategySpace/ConstNewStrategy.js', + 'StrategySpace/ConstUpdateStrategy.js', + 'StrategySpace/ConstDeleteStrategy.js', - "StrategySpace/StrategyCollection.js", - "StrategySpace/StrategyCollectionItem.js", + 'Utilities/RoundedCornersBackground.js', - "Utilities/RoundedCornersBackground.js", + 'Panels/TimeControlPanel.js', + 'Panels/ProductsPanel.js', + 'Panels/PanelTabButton.js', + 'Panels/ProductCard.js', - "Panels/TimeControlPanel.js", - "Panels/ProductsPanel.js", - "Panels/PanelTabButton.js", + 'ControlsToolBox/SidePanel.js', + 'ControlsToolBox/SidePanelTab.js', - "ControlsToolBox/SidePanel.js", - "ControlsToolBox/SidePanelTab.js", + 'Spaces/BottomSpace.js', + 'Spaces/TopSpace.js', + 'Spaces/PanelsSpace.js', + 'Spaces/ChartSpace.js', + 'Spaces/FloatingSpace.js', + 'Spaces/StrategySpace.js', - "Spaces/BottomSpace.js", - "Spaces/TopSpace.js", - "Spaces/PanelsSpace.js", - "Spaces/ChartSpace.js", - "Spaces/FloatingSpace.js", - "Spaces/StrategySpace.js", + 'Files/SingleFile.js', + 'Files/FileCloud.js', + 'Files/MarketFiles.js', + 'Files/DailyFiles.js', + 'Files/FileCursor.js', + 'Files/FileSequence.js', + 'Files/FileStorage.js', - "Files/SingleFile.js", - "Files/FileCloud.js", - "Files/MarketFiles.js", - "Files/DailyFiles.js", - "Files/FileCursor.js", - "Files/FileSequence.js", - "Files/FileStorage.js", + 'FloatingSpace/NoteSets.js', + 'FloatingSpace/Note.js', + 'FloatingSpace/ProfileBalls.js', + 'FloatingSpace/ProfileBall.js', + 'FloatingSpace/FloatingObject.js', + 'FloatingSpace/FloatingLayer.js', + 'FloatingSpace/StrategyPartConstructor.js', + 'FloatingSpace/StrategyPart.js', + 'FloatingSpace/StrategyPartTitle.js', + 'FloatingSpace/CircularMenu.js', + 'FloatingSpace/CircularMenuItem.js', + 'FloatingSpace/CodeEditor.js', - "FloatingSpace/NoteSets.js", - "FloatingSpace/Note.js", - "FloatingSpace/ProfileBalls.js", - "FloatingSpace/ProfileBall.js", - "FloatingSpace/FloatingObject.js", - "FloatingSpace/FloatingLayer.js", - "FloatingSpace/StrategyParts.js", - "FloatingSpace/StrategyPart.js", + 'Scales/RateScale.js', + 'Scales/TimeScale.js', + 'Scales/TimePeriodScale.js', - "Scales/RateScale.js", - "Scales/TimeScale.js", - "Scales/TimePeriodScale.js", + 'ChartsSpace/ChartUtilities.js', + 'ChartsSpace/PlottersManager.js', + 'ChartsSpace/TimelineChart.js', + 'ChartsSpace/TimeMachine.js', + 'ChartsSpace/ViewPort.js', + 'ChartsSpace/TimeLineCoordinateSystem.js', - "Plotter.js", - "PlotterPanel.js", - "UIControl.js", + 'BottomSpace/UIControl.js', - "PlottersManager.js", - "ProductStorage.js", - "CompetitionStorage.js", - "ProductCard.js", + 'Plotter.js', + 'PlotterPanel.js', - "SplashScreen.js", - "Canvas.js", - "EventHandler.js", - "Frame.js", + 'ProductStorage.js', + 'CompetitionStorage.js', - "ViewPort.js", - "TimeMachine.js", + 'SplashScreen.js', + 'Canvas.js', + 'EventHandler.js', + 'Frame.js', - "ChartUtilities.js", - "TimelineChart.js", + 'Animation.js', - "Animation.js", + 'Container.js', + 'Displace.js', - "Container.js", - "Displace.js", + 'Azure/azure-storage.blob.js', - "Azure/azure-storage.blob.js", - "TimeLineCoordinateSystem.js", - "Utilities.js", - "Dashboard.js" - ]; + 'Utilities.js', + 'Dashboard.js' + ] - let downloadedCounter = 0; - let versionParam = window.canvasApp.version; - if (versionParam === undefined) { versionParam = ''; } - else { - versionParam = '?' + versionParam; + 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 + + REQUIREJS([path], onRequired) + + if (INFO_LOG === true) { logger.write('[INFO] loadModules -> Module Requested.') } + if (INFO_LOG === true) { logger.write('[INFO] loadModules -> path = ' + path) } + if (INFO_LOG === true) { logger.write('[INFO] loadModules -> total requested = ' + (i + 1)) } + + function onRequired (pModule) { + try { + if (INFO_LOG === true) { logger.write('[INFO] loadModules -> onRequired -> Entering function.') } + if (INFO_LOG === true) { logger.write('[INFO] loadModules -> onRequired -> Module Downloaded.') } + if (INFO_LOG === true) { logger.write('[INFO] loadModules -> onRequired -> path = ' + path) } + + downloadedCounter++ + + if (INFO_LOG === true) { logger.write('[INFO] loadModules -> onRequired -> downloadedCounter = ' + downloadedCounter) } + + if (downloadedCounter === modulesArray.length) { + if (INFO_LOG === true) { logger.write('[INFO] loadModules -> onRequired -> Starting Advanced Algos Platform.') } + + dashboard = newDashboard() + + dashboard.start() } - - for (let i = 0; i < modulesArray.length; i++) { - - let path = window.canvasApp.urlPrefix + modulesArray[i] + versionParam; - - REQUIREJS([path], onRequired); - - if (INFO_LOG === true) { logger.write("[INFO] loadModules -> Module Requested."); } - if (INFO_LOG === true) { logger.write("[INFO] loadModules -> path = " + path); } - if (INFO_LOG === true) { logger.write("[INFO] loadModules -> total requested = " + (i + 1)); } - - function onRequired(pModule) { - - try { - - if (INFO_LOG === true) { logger.write("[INFO] loadModules -> onRequired -> Entering function."); } - if (INFO_LOG === true) { logger.write("[INFO] loadModules -> onRequired -> Module Downloaded."); } - if (INFO_LOG === true) { logger.write("[INFO] loadModules -> onRequired -> path = " + path); } - - downloadedCounter++; - - if (INFO_LOG === true) { logger.write("[INFO] loadModules -> onRequired -> downloadedCounter = " + downloadedCounter); } - - if (downloadedCounter === modulesArray.length) { - - if (INFO_LOG === true) { logger.write("[INFO] loadModules -> onRequired -> Starting Advanced Algos Platform."); } - - dashboard = newDashboard(); - - dashboard.start(); - } - - } catch (err) { - - if (ERROR_LOG === true) { logger.write("[ERROR] loadModules -> onRequired -> err = " + err); } - - } - } - } - - } catch (err) { - - if (ERROR_LOG === true) { logger.write("[ERROR] loadModules -> err = " + err); } - + } catch (err) { + if (ERROR_LOG === true) { logger.write('[ERROR] loadModules -> onRequired -> err = ' + err) } + } } + } + } catch (err) { + if (ERROR_LOG === true) { logger.write('[ERROR] loadModules -> err = ' + err) } } + } } diff --git a/index.html b/index.html index f2ebc41fe..35850533a 100644 --- a/index.html +++ b/index.html @@ -34,5 +34,12 @@
+
+ +
+
+ +
+ \ No newline at end of file diff --git a/server.js b/server.js index 17abcbb2a..826479d03 100644 --- a/server.js +++ b/server.js @@ -856,6 +856,12 @@ function onBrowserRequest (request, response) { } break + case 'ChartsSpace': + { + respondWithFile(serverConfig.pathToCanvasApp + '/' + requestParameters[1] + '/' + requestParameters[2], response) + } + break + default: { homePage()