diff --git a/MacOs-Run-WebServer b/MacOs-Run-WebServer deleted file mode 100644 index aa70df15d..000000000 --- a/MacOs-Run-WebServer +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -cd `dirname $0` -Node server.js \ No newline at end of file diff --git a/Scripts/AppPreLoader.js b/Scripts/AppPreLoader.js index ff8c7c9ad..17da86bdc 100644 --- a/Scripts/AppPreLoader.js +++ b/Scripts/AppPreLoader.js @@ -35,13 +35,13 @@ function spacePad(str, max) { return str.length < max ? spacePad(" " + str, max) : str; } -function loadAdvancedAlgosPlatform() { +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] loadAdvancedAlgosPlatform -> Entering function."); } + if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] loadSuperalgos -> Entering function."); } /* The first thing to do here is to add the canvas where all the action is going to happen. */ diff --git a/build-mac-exe-superalgos-desktop.bat b/build-mac-exe-superalgos-desktop.bat deleted file mode 100644 index b7df890a9..000000000 --- a/build-mac-exe-superalgos-desktop.bat +++ /dev/null @@ -1 +0,0 @@ -nexe server.js -o MacOs-Superalgos-Desktop.app --target "mac-x64-10.16.0" --ico "./Images/favicon.ico" \ No newline at end of file diff --git a/build-windows-exe-superalgos-desktop.bat b/build-windows-exe-superalgos-desktop.bat deleted file mode 100644 index 71d92ec1e..000000000 --- a/build-windows-exe-superalgos-desktop.bat +++ /dev/null @@ -1,2 +0,0 @@ - -nexe server.js -o Windows-Superalgos-Desktop.exe --ico "./Images/favicon.ico" \ No newline at end of file diff --git a/index.html b/index.html index a69173e48..44e8b1482 100644 --- a/index.html +++ b/index.html @@ -37,9 +37,9 @@ }; try { - loadAdvancedAlgosPlatform(); + loadSuperalgos(); } catch (err) { - console.log("[ERROR] CanvasApp can not be started. Please check that AAWeb is running.", err); + console.log("[ERROR] CanvasApp can not be started. Please check that WebServer is running.", err); } } } diff --git a/server.js b/server.js index ab843cae5..a99b24051 100644 --- a/server.js +++ b/server.js @@ -156,7 +156,7 @@ function onBrowserRequest (request, response) { } case 'MQService': { - let filePath = './node_modules/@superalgos/mqservice/orderLifeCicle/webDependency.js' + let filePath = process.env.PATH_TO_WEB_SERVER + 'node_modules/@superalgos/mqservice/orderLifeCicle/webDependency.js' respondWithFile(filePath, response) break @@ -164,25 +164,25 @@ function onBrowserRequest (request, response) { case 'Plotter.js': { - respondWithFile('./Plotter.js', response) + respondWithFile(process.env.PATH_TO_WEB_SERVER + 'Plotter.js', response) } break case 'PlotterPanel.js': { - respondWithFile('./PlotterPanel.js', response) + respondWithFile(process.env.PATH_TO_WEB_SERVER + 'PlotterPanel.js', response) } break case 'Ecosystem.js': { - respondWithFile('./Ecosystem.js', response) + respondWithFile(process.env.PATH_TO_WEB_SERVER + 'Ecosystem.js', response) } break case 'Images': // This means the Scripts folder. { - let path = './Images/' + requestParameters[2] + let path = process.env.PATH_TO_WEB_SERVER + 'Images/' + requestParameters[2] if (requestParameters[3] !== undefined) { path = path + '/' + requestParameters[3] @@ -204,7 +204,7 @@ function onBrowserRequest (request, response) { case 'favicon.ico': // This means the Scripts folder. { - respondWithImage('./Images/' + 'favicon.ico', response) + respondWithImage(process.env.PATH_TO_WEB_SERVER + 'Images/' + 'favicon.ico', response) } break @@ -252,7 +252,7 @@ function onBrowserRequest (request, response) { case 'Scripts': // This means the Scripts folder. { - respondWithFile('./Scripts/' + requestParameters[2], response) + respondWithFile(process.env.PATH_TO_WEB_SERVER + 'Scripts/' + requestParameters[2], response) } break @@ -395,7 +395,7 @@ function onBrowserRequest (request, response) { if (requestParameters[1] === '') { let fs = require('fs') try { - let fileName = 'index.html' + let fileName = process.env.PATH_TO_WEB_SERVER + 'index.html' fs.readFile(fileName, onFileRead) function onFileRead (err, file) {