diff --git a/Client/httpInterface.js b/Client/httpInterface.js index aca478aa4..9a99757e2 100644 --- a/Client/httpInterface.js +++ b/Client/httpInterface.js @@ -1531,17 +1531,33 @@ exports.newHttpInterface = function newHttpInterface(WEB_SERVER, DATA_FILE_SERVE break } } + getAllFilesInDirectoryAndSubdirectories(filePath + folder, onFilesReady) + function onFilesReady(files) { - let schemaArray = [] - let fileList = fs.readdirSync(filePath + '/' + folder) - for (let k = 0; k < fileList.length; k++) { - let name = fileList[k] - let fileContent = fs.readFileSync(filePath + '/' + folder + '/' + name) - let schemaDocument = JSON.parse(fileContent) - schemaArray.push(schemaDocument) + let schemaArray = [] + // let fileList = fs.readdirSync(filePath + '/' + folder) + for (let k = 0; k < files.length; k++) { + let name = files[k] + let nameSplitted = name.split(folder) + let fileName = nameSplitted[1] + for (let i=0; i<10; i++) { + fileName = fileName.replace('\\', '/') + } + let fileToRead = filePath + folder + fileName + + let fileContent = fs.readFileSync(fileToRead) + let schemaDocument = JSON.parse(fileContent) + schemaDocument.filePath = fileName + schemaArray.push(schemaDocument) + } + let schema = JSON.stringify(schemaArray) + respondWithContent(schema, httpResponse) } - let schema = JSON.stringify(schemaArray) - respondWithContent(schema, httpResponse) + + // console.log(filePath + '/' + folder) + + + } catch (err) { if (err.message.indexOf('no such file or directory') < 0) { console.log('Could not send Schema:', filePath, schemaType) @@ -1752,7 +1768,9 @@ exports.newHttpInterface = function newHttpInterface(WEB_SERVER, DATA_FILE_SERVE } callback(pathAndNames) }) - .catch(e => console.error(e)); + .catch(e => { + callback([]) + }); async function getFiles(dir) { const subdirs = await readdir(dir); diff --git a/Projects/Superalgos/Icons/close-execution.png b/Projects/Superalgos/Icons/Close/close-execution.png similarity index 100% rename from Projects/Superalgos/Icons/close-execution.png rename to Projects/Superalgos/Icons/Close/close-execution.png diff --git a/Projects/Superalgos/Icons/close-order.png b/Projects/Superalgos/Icons/Close/close-order.png similarity index 100% rename from Projects/Superalgos/Icons/close-order.png rename to Projects/Superalgos/Icons/Close/close-order.png diff --git a/Projects/Superalgos/Icons/close-position.png b/Projects/Superalgos/Icons/Close/close-position.png similarity index 100% rename from Projects/Superalgos/Icons/close-position.png rename to Projects/Superalgos/Icons/Close/close-position.png diff --git a/Projects/Superalgos/Icons/close-stage-event.png b/Projects/Superalgos/Icons/Close/close-stage-event.png similarity index 100% rename from Projects/Superalgos/Icons/close-stage-event.png rename to Projects/Superalgos/Icons/Close/close-stage-event.png diff --git a/Projects/Superalgos/Icons/close-stage.png b/Projects/Superalgos/Icons/Close/close-stage.png similarity index 100% rename from Projects/Superalgos/Icons/close-stage.png rename to Projects/Superalgos/Icons/Close/close-stage.png diff --git a/Projects/Superalgos/Icons/close.png b/Projects/Superalgos/Icons/Close/close.png similarity index 100% rename from Projects/Superalgos/Icons/close.png rename to Projects/Superalgos/Icons/Close/close.png diff --git a/Projects/Superalgos/Icons/binance-coin.png b/Projects/Superalgos/Icons/Crypto-Assets/binance-coin.png similarity index 100% rename from Projects/Superalgos/Icons/binance-coin.png rename to Projects/Superalgos/Icons/Crypto-Assets/binance-coin.png diff --git a/Projects/Superalgos/Icons/bitcoin-cash.png b/Projects/Superalgos/Icons/Crypto-Assets/bitcoin-cash.png similarity index 100% rename from Projects/Superalgos/Icons/bitcoin-cash.png rename to Projects/Superalgos/Icons/Crypto-Assets/bitcoin-cash.png diff --git a/Projects/Superalgos/Icons/bitcoin.png b/Projects/Superalgos/Icons/Crypto-Assets/bitcoin.png similarity index 100% rename from Projects/Superalgos/Icons/bitcoin.png rename to Projects/Superalgos/Icons/Crypto-Assets/bitcoin.png diff --git a/Projects/Superalgos/Icons/cardano.png b/Projects/Superalgos/Icons/Crypto-Assets/cardano.png similarity index 100% rename from Projects/Superalgos/Icons/cardano.png rename to Projects/Superalgos/Icons/Crypto-Assets/cardano.png diff --git a/Projects/Superalgos/Icons/dash.png b/Projects/Superalgos/Icons/Crypto-Assets/dash.png similarity index 100% rename from Projects/Superalgos/Icons/dash.png rename to Projects/Superalgos/Icons/Crypto-Assets/dash.png diff --git a/Projects/Superalgos/Icons/dogecoin.png b/Projects/Superalgos/Icons/Crypto-Assets/dogecoin.png similarity index 100% rename from Projects/Superalgos/Icons/dogecoin.png rename to Projects/Superalgos/Icons/Crypto-Assets/dogecoin.png diff --git a/Projects/Superalgos/Icons/eos.png b/Projects/Superalgos/Icons/Crypto-Assets/eos.png similarity index 100% rename from Projects/Superalgos/Icons/eos.png rename to Projects/Superalgos/Icons/Crypto-Assets/eos.png diff --git a/Projects/Superalgos/Icons/ethereum-classic.png b/Projects/Superalgos/Icons/Crypto-Assets/ethereum-classic.png similarity index 100% rename from Projects/Superalgos/Icons/ethereum-classic.png rename to Projects/Superalgos/Icons/Crypto-Assets/ethereum-classic.png diff --git a/Projects/Superalgos/Icons/ethereum.png b/Projects/Superalgos/Icons/Crypto-Assets/ethereum.png similarity index 100% rename from Projects/Superalgos/Icons/ethereum.png rename to Projects/Superalgos/Icons/Crypto-Assets/ethereum.png diff --git a/Projects/Superalgos/Icons/monero.png b/Projects/Superalgos/Icons/Crypto-Assets/monero.png similarity index 100% rename from Projects/Superalgos/Icons/monero.png rename to Projects/Superalgos/Icons/Crypto-Assets/monero.png diff --git a/Projects/Superalgos/Icons/qtum.png b/Projects/Superalgos/Icons/Crypto-Assets/qtum.png similarity index 100% rename from Projects/Superalgos/Icons/qtum.png rename to Projects/Superalgos/Icons/Crypto-Assets/qtum.png diff --git a/Projects/Superalgos/Icons/stellar.png b/Projects/Superalgos/Icons/Crypto-Assets/stellar.png similarity index 100% rename from Projects/Superalgos/Icons/stellar.png rename to Projects/Superalgos/Icons/Crypto-Assets/stellar.png diff --git a/Projects/Superalgos/Icons/tether.png b/Projects/Superalgos/Icons/Crypto-Assets/tether.png similarity index 100% rename from Projects/Superalgos/Icons/tether.png rename to Projects/Superalgos/Icons/Crypto-Assets/tether.png diff --git a/Projects/Superalgos/Icons/tron.png b/Projects/Superalgos/Icons/Crypto-Assets/tron.png similarity index 100% rename from Projects/Superalgos/Icons/tron.png rename to Projects/Superalgos/Icons/Crypto-Assets/tron.png diff --git a/Projects/Superalgos/Icons/us-dollar.png b/Projects/Superalgos/Icons/Crypto-Assets/us-dollar.png similarity index 100% rename from Projects/Superalgos/Icons/us-dollar.png rename to Projects/Superalgos/Icons/Crypto-Assets/us-dollar.png diff --git a/Projects/Superalgos/Icons/xrp.png b/Projects/Superalgos/Icons/Crypto-Assets/xrp.png similarity index 100% rename from Projects/Superalgos/Icons/xrp.png rename to Projects/Superalgos/Icons/Crypto-Assets/xrp.png diff --git a/Projects/Superalgos/Icons/binance.png b/Projects/Superalgos/Icons/Crypto-Exchanges/binance.png similarity index 100% rename from Projects/Superalgos/Icons/binance.png rename to Projects/Superalgos/Icons/Crypto-Exchanges/binance.png diff --git a/Projects/Superalgos/Icons/bitfinex.png b/Projects/Superalgos/Icons/Crypto-Exchanges/bitfinex.png similarity index 100% rename from Projects/Superalgos/Icons/bitfinex.png rename to Projects/Superalgos/Icons/Crypto-Exchanges/bitfinex.png diff --git a/Projects/Superalgos/Icons/bitmex.png b/Projects/Superalgos/Icons/Crypto-Exchanges/bitmex.png similarity index 100% rename from Projects/Superalgos/Icons/bitmex.png rename to Projects/Superalgos/Icons/Crypto-Exchanges/bitmex.png diff --git a/Projects/Superalgos/Icons/bittrex.png b/Projects/Superalgos/Icons/Crypto-Exchanges/bittrex.png similarity index 100% rename from Projects/Superalgos/Icons/bittrex.png rename to Projects/Superalgos/Icons/Crypto-Exchanges/bittrex.png diff --git a/Projects/Superalgos/Icons/kraken.png b/Projects/Superalgos/Icons/Crypto-Exchanges/kraken.png similarity index 100% rename from Projects/Superalgos/Icons/kraken.png rename to Projects/Superalgos/Icons/Crypto-Exchanges/kraken.png diff --git a/Projects/Superalgos/Icons/kucoin.png b/Projects/Superalgos/Icons/Crypto-Exchanges/kucoin.png similarity index 100% rename from Projects/Superalgos/Icons/kucoin.png rename to Projects/Superalgos/Icons/Crypto-Exchanges/kucoin.png diff --git a/Projects/Superalgos/Icons/liquid.png b/Projects/Superalgos/Icons/Crypto-Exchanges/liquid.png similarity index 100% rename from Projects/Superalgos/Icons/liquid.png rename to Projects/Superalgos/Icons/Crypto-Exchanges/liquid.png diff --git a/Projects/Superalgos/Icons/luno.png b/Projects/Superalgos/Icons/Crypto-Exchanges/luno.png similarity index 100% rename from Projects/Superalgos/Icons/luno.png rename to Projects/Superalgos/Icons/Crypto-Exchanges/luno.png diff --git a/Projects/Superalgos/Icons/poloniex.png b/Projects/Superalgos/Icons/Crypto-Exchanges/poloniex.png similarity index 100% rename from Projects/Superalgos/Icons/poloniex.png rename to Projects/Superalgos/Icons/Crypto-Exchanges/poloniex.png diff --git a/Projects/Superalgos/Icons/upbit.png b/Projects/Superalgos/Icons/Crypto-Exchanges/upbit.png similarity index 100% rename from Projects/Superalgos/Icons/upbit.png rename to Projects/Superalgos/Icons/Crypto-Exchanges/upbit.png diff --git a/Projects/Superalgos/Icons/DE.png b/Projects/Superalgos/Icons/Languages/DE.png similarity index 100% rename from Projects/Superalgos/Icons/DE.png rename to Projects/Superalgos/Icons/Languages/DE.png diff --git a/Projects/Superalgos/Icons/ZA.png b/Projects/Superalgos/Icons/Languages/ZA.png similarity index 100% rename from Projects/Superalgos/Icons/ZA.png rename to Projects/Superalgos/Icons/Languages/ZA.png diff --git a/Projects/Superalgos/Icons/zar.png b/Projects/Superalgos/Icons/Languages/zar.png similarity index 100% rename from Projects/Superalgos/Icons/zar.png rename to Projects/Superalgos/Icons/Languages/zar.png diff --git a/Projects/Superalgos/Icons/record-definition.png b/Projects/Superalgos/Icons/Record/record-definition.png similarity index 100% rename from Projects/Superalgos/Icons/record-definition.png rename to Projects/Superalgos/Icons/Record/record-definition.png diff --git a/Projects/Superalgos/Icons/record-formula.png b/Projects/Superalgos/Icons/Record/record-formula.png similarity index 100% rename from Projects/Superalgos/Icons/record-formula.png rename to Projects/Superalgos/Icons/Record/record-formula.png diff --git a/Projects/Superalgos/Icons/record-property.png b/Projects/Superalgos/Icons/Record/record-property.png similarity index 100% rename from Projects/Superalgos/Icons/record-property.png rename to Projects/Superalgos/Icons/Record/record-property.png diff --git a/Projects/Superalgos/Icons/record-values.png b/Projects/Superalgos/Icons/Record/record-values.png similarity index 100% rename from Projects/Superalgos/Icons/record-values.png rename to Projects/Superalgos/Icons/Record/record-values.png diff --git a/Projects/Superalgos/Icons/text-condition.png b/Projects/Superalgos/Icons/Text/text-condition.png similarity index 100% rename from Projects/Superalgos/Icons/text-condition.png rename to Projects/Superalgos/Icons/Text/text-condition.png diff --git a/Projects/Superalgos/Icons/text-formula.png b/Projects/Superalgos/Icons/Text/text-formula.png similarity index 100% rename from Projects/Superalgos/Icons/text-formula.png rename to Projects/Superalgos/Icons/Text/text-formula.png diff --git a/Projects/Superalgos/Icons/text-position.png b/Projects/Superalgos/Icons/Text/text-position.png similarity index 100% rename from Projects/Superalgos/Icons/text-position.png rename to Projects/Superalgos/Icons/Text/text-position.png diff --git a/Projects/Superalgos/Icons/text-style.png b/Projects/Superalgos/Icons/Text/text-style.png similarity index 100% rename from Projects/Superalgos/Icons/text-style.png rename to Projects/Superalgos/Icons/Text/text-style.png diff --git a/Projects/Superalgos/Icons/text.png b/Projects/Superalgos/Icons/Text/text.png similarity index 100% rename from Projects/Superalgos/Icons/text.png rename to Projects/Superalgos/Icons/Text/text.png diff --git a/Projects/Superalgos/Icons/time-frame-scale.png b/Projects/Superalgos/Icons/Time/time-frame-scale.png similarity index 100% rename from Projects/Superalgos/Icons/time-frame-scale.png rename to Projects/Superalgos/Icons/Time/time-frame-scale.png diff --git a/Projects/Superalgos/Icons/time-frame.png b/Projects/Superalgos/Icons/Time/time-frame.png similarity index 100% rename from Projects/Superalgos/Icons/time-frame.png rename to Projects/Superalgos/Icons/Time/time-frame.png diff --git a/Projects/Superalgos/Icons/time-frames-filter.png b/Projects/Superalgos/Icons/Time/time-frames-filter.png similarity index 100% rename from Projects/Superalgos/Icons/time-frames-filter.png rename to Projects/Superalgos/Icons/Time/time-frames-filter.png diff --git a/Projects/Superalgos/Icons/time-machine.png b/Projects/Superalgos/Icons/Time/time-machine.png similarity index 100% rename from Projects/Superalgos/Icons/time-machine.png rename to Projects/Superalgos/Icons/Time/time-machine.png diff --git a/Projects/Superalgos/Icons/time-range.png b/Projects/Superalgos/Icons/Time/time-range.png similarity index 100% rename from Projects/Superalgos/Icons/time-range.png rename to Projects/Superalgos/Icons/Time/time-range.png diff --git a/Projects/Superalgos/Icons/time-scale.png b/Projects/Superalgos/Icons/Time/time-scale.png similarity index 100% rename from Projects/Superalgos/Icons/time-scale.png rename to Projects/Superalgos/Icons/Time/time-scale.png diff --git a/Projects/Superalgos/Icons/timeline-chart.png b/Projects/Superalgos/Icons/Time/timeline-chart.png similarity index 100% rename from Projects/Superalgos/Icons/timeline-chart.png rename to Projects/Superalgos/Icons/Time/timeline-chart.png diff --git a/Projects/Superalgos/Icons/tree-connector-elbow.png b/Projects/Superalgos/Icons/Tree/tree-connector-elbow.png similarity index 100% rename from Projects/Superalgos/Icons/tree-connector-elbow.png rename to Projects/Superalgos/Icons/Tree/tree-connector-elbow.png diff --git a/Projects/Superalgos/Icons/tree-connector-fork.png b/Projects/Superalgos/Icons/Tree/tree-connector-fork.png similarity index 100% rename from Projects/Superalgos/Icons/tree-connector-fork.png rename to Projects/Superalgos/Icons/Tree/tree-connector-fork.png diff --git a/Projects/Superalgos/Icons/tree-connector-line.png b/Projects/Superalgos/Icons/Tree/tree-connector-line.png similarity index 100% rename from Projects/Superalgos/Icons/tree-connector-line.png rename to Projects/Superalgos/Icons/Tree/tree-connector-line.png diff --git a/Projects/Superalgos/Icons/tree-spacer.png b/Projects/Superalgos/Icons/Tree/tree-spacer.png similarity index 100% rename from Projects/Superalgos/Icons/tree-spacer.png rename to Projects/Superalgos/Icons/Tree/tree-spacer.png diff --git a/Projects/Superalgos/Schemas/App-Schema/api-data-fetcher-bot-instance.json b/Projects/Superalgos/Schemas/App-Schema/Api/api-data-fetcher-bot-instance.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/api-data-fetcher-bot-instance.json rename to Projects/Superalgos/Schemas/App-Schema/Api/api-data-fetcher-bot-instance.json diff --git a/Projects/Superalgos/Schemas/App-Schema/api-data-fetcher-bot.json b/Projects/Superalgos/Schemas/App-Schema/Api/api-data-fetcher-bot.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/api-data-fetcher-bot.json rename to Projects/Superalgos/Schemas/App-Schema/Api/api-data-fetcher-bot.json diff --git a/Projects/Superalgos/Schemas/App-Schema/api-data-fetcher-process-instance.json b/Projects/Superalgos/Schemas/App-Schema/Api/api-data-fetcher-process-instance.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/api-data-fetcher-process-instance.json rename to Projects/Superalgos/Schemas/App-Schema/Api/api-data-fetcher-process-instance.json diff --git a/Projects/Superalgos/Schemas/App-Schema/api-endpoint.json b/Projects/Superalgos/Schemas/App-Schema/Api/api-endpoint.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/api-endpoint.json rename to Projects/Superalgos/Schemas/App-Schema/Api/api-endpoint.json diff --git a/Projects/Superalgos/Schemas/App-Schema/api-map-reference.json b/Projects/Superalgos/Schemas/App-Schema/Api/api-map-reference.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/api-map-reference.json rename to Projects/Superalgos/Schemas/App-Schema/Api/api-map-reference.json diff --git a/Projects/Superalgos/Schemas/App-Schema/api-map.json b/Projects/Superalgos/Schemas/App-Schema/Api/api-map.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/api-map.json rename to Projects/Superalgos/Schemas/App-Schema/Api/api-map.json diff --git a/Projects/Superalgos/Schemas/App-Schema/api-path-parameter.json b/Projects/Superalgos/Schemas/App-Schema/Api/api-path-parameter.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/api-path-parameter.json rename to Projects/Superalgos/Schemas/App-Schema/Api/api-path-parameter.json diff --git a/Projects/Superalgos/Schemas/App-Schema/api-path-parameters.json b/Projects/Superalgos/Schemas/App-Schema/Api/api-path-parameters.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/api-path-parameters.json rename to Projects/Superalgos/Schemas/App-Schema/Api/api-path-parameters.json diff --git a/Projects/Superalgos/Schemas/App-Schema/api-query-parameter.json b/Projects/Superalgos/Schemas/App-Schema/Api/api-query-parameter.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/api-query-parameter.json rename to Projects/Superalgos/Schemas/App-Schema/Api/api-query-parameter.json diff --git a/Projects/Superalgos/Schemas/App-Schema/api-query-parameters.json b/Projects/Superalgos/Schemas/App-Schema/Api/api-query-parameters.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/api-query-parameters.json rename to Projects/Superalgos/Schemas/App-Schema/Api/api-query-parameters.json diff --git a/Projects/Superalgos/Schemas/App-Schema/api-query-response.json b/Projects/Superalgos/Schemas/App-Schema/Api/api-query-response.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/api-query-response.json rename to Projects/Superalgos/Schemas/App-Schema/Api/api-query-response.json diff --git a/Projects/Superalgos/Schemas/App-Schema/api-query-responses.json b/Projects/Superalgos/Schemas/App-Schema/Api/api-query-responses.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/api-query-responses.json rename to Projects/Superalgos/Schemas/App-Schema/Api/api-query-responses.json diff --git a/Projects/Superalgos/Schemas/App-Schema/api-response-field-reference.json b/Projects/Superalgos/Schemas/App-Schema/Api/api-response-field-reference.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/api-response-field-reference.json rename to Projects/Superalgos/Schemas/App-Schema/Api/api-response-field-reference.json diff --git a/Projects/Superalgos/Schemas/App-Schema/api-response-field.json b/Projects/Superalgos/Schemas/App-Schema/Api/api-response-field.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/api-response-field.json rename to Projects/Superalgos/Schemas/App-Schema/Api/api-response-field.json diff --git a/Projects/Superalgos/Schemas/App-Schema/api-response-schema.json b/Projects/Superalgos/Schemas/App-Schema/Api/api-response-schema.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/api-response-schema.json rename to Projects/Superalgos/Schemas/App-Schema/Api/api-response-schema.json diff --git a/Projects/Superalgos/Schemas/App-Schema/api-version.json b/Projects/Superalgos/Schemas/App-Schema/Api/api-version.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/api-version.json rename to Projects/Superalgos/Schemas/App-Schema/Api/api-version.json diff --git a/Projects/Superalgos/Schemas/App-Schema/apis.json b/Projects/Superalgos/Schemas/App-Schema/Api/apis.json similarity index 100% rename from Projects/Superalgos/Schemas/App-Schema/apis.json rename to Projects/Superalgos/Schemas/App-Schema/Api/apis.json