fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Superalgos/MasterApp into develop

Browse Source
This commit is contained in:
Barry Low committed 2019-02-14 16:13:16 -08:00
2 parents 3211589ed4 8401950a5f
commit 5197ed3163
5 files changed
+168 -80
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitignore
+1
View File
@@ -12,3 +12,4 @@ npm-debug.log*
#Mac specific files
.DS_Store
client/package-lock.json
client/html/index.html
+9 -4
View File
@@ -20,6 +20,7 @@
function loadCanvas(){
if (window.canvasApp.visible === undefined) {
window.canvasApp = {
version: '1.0.0', // This is used to avoid catching problems at the browser level.
sessionToken: '',
executingAt: 'Master App',
visible: false,
@@ -31,9 +32,13 @@
context: {}
};
let delay = 0
if (window.innerHeight === 0) {delay = 3000} // Inside IFRAMES the onload event is reaised before the window has its real size.
setTimeout(loadAdvancedAlgosPlatform, delay)
try {
loadAdvancedAlgosPlatform();
}
catch(err) {
console.log("[ERROR] MasterApp -> Index -> CanvasApp can not be started. Please check that AAWeb is running.");
console.log("[ERROR] MasterApp -> Index -> err = " + err);
}
}
}
@@ -45,7 +50,7 @@
</script>
</head>
<body id="body" onload="loadCanvas()" onresize="onResize()">
<body id="body" onload="" onresize="onResize()">
<div id="masterApp"></div>
<div id="canvasApp"></div>
</body>
client/package-lock.json
Generated
+152 -74
View File
@@ -62,17 +62,6 @@
"xml2js": "^0.4.19"
}
},
"@azure/storage-blob": {
"version": "10.3.0",
"resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-10.3.0.tgz",
"integrity": "sha512-KZbJ3q8RpAdeIB5Em1lgXkiq7Mll9bSHHbHavOFMepkkF7HQa3Sez9FdkAVIkVVWK5YoBlshBGZ+mtiSQiS9Fw==",
"dev": true,
"requires": {
"@azure/ms-rest-js": "1.2.3",
"events": "3.0.0",
"tslib": "^1.9.3"
}
},
"@babel/code-frame": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
@@ -1309,9 +1298,9 @@
"dev": true
},
"@superalgos/key-vault-client": {
"version": "0.0.26",
"resolved": "https://registry.npmjs.org/@superalgos/key-vault-client/-/key-vault-client-0.0.26.tgz",
"integrity": "sha512-guMBD1pCT7pR0zEwvWi1+w5OstTgFRUCfSHTvp3hGycRmDChQ2OqazEl9eMAQsFDqP9znirOayxEyK90bN7aow==",
"version": "0.0.28",
"resolved": "https://registry.npmjs.org/@superalgos/key-vault-client/-/key-vault-client-0.0.28.tgz",
"integrity": "sha512-MkOk+bUF8rg0CAHIJoYexAKJG3mfTfC1JnqoJjwSzUETqh1EUuuSur7ZComDIhC6bhkfQdT2Ox9DDiYqZWDjGA==",
"dev": true,
"requires": {
"@material-ui/core": "^3.2.2",
@@ -1329,9 +1318,9 @@
}
},
"@superalgos/operations-client": {
"version": "0.0.13",
"resolved": "https://registry.npmjs.org/@superalgos/operations-client/-/operations-client-0.0.13.tgz",
"integrity": "sha512-t7LZI3qu34qfY2+mX6jT52QYZDK/GQ86CNVdCNqEDkqwTVxzJs3XSeaIdBqiKxRJGW/zvz3GG/i6XqPvfBU+/w==",
"version": "0.0.14",
"resolved": "https://registry.npmjs.org/@superalgos/operations-client/-/operations-client-0.0.14.tgz",
"integrity": "sha512-RJepMVz8wDit7plaJI+ygNX7BuASTICRe4JVyv3KpT+247vai0yhla0gEwrYkYCJQQftw+cq3cRz/fBLl+y6Lg==",
"dev": true,
"requires": {
"@material-ui/core": "^3.2.2",
@@ -1355,33 +1344,53 @@
"integrity": "sha512-bfz/4FpOnSt67ixELNy1iSHouKAznGAHBWPxyRD+sWNIABlSfMR9unm1J2y0lo5MKlxWRQI5W3iJlKDCslgpqQ==",
"dev": true,
"requires": {
"@azure/storage-blob": "^10.0.0-preview",
"@azure/storage-blob": "10.0.0-preview",
"@superalgos/web-components": "0.0.18",
"apollo-cache-inmemory": "^1.3.5",
"apollo-client": "^2.4.2",
"apollo-link": "^1.2.3",
"apollo-link-context": "^1.0.9",
"apollo-link-error": "^1.1.1",
"apollo-link-http": "^1.5.5",
"apollo-link-ws": "^1.0.9",
"apollo-utilities": "^1.0.21",
"auth0-lock": "^11.10.0",
"babel-polyfill": "^6.26.0",
"blob-util": "^2.0.2",
"classnames": "^2.2.6",
"cross-fetch": "^2.2.2",
"dotenv-webpack": "^1.5.7",
"graphql": "^14.0.2",
"graphql-tag": "^2.10.0",
"minilog": "^3.1.0",
"prop-types": "^15.6.2",
"query-string": "^6.2.0",
"react": "^16.6.1",
"react-apollo": "^2.2.4",
"react-dom": "^16.6.1",
"react-router-dom": "^4.3.1",
"recompose": "^0.30.0",
"subscriptions-transport-ws": "^0.9.15"
"apollo-cache-inmemory": "1.3.11",
"apollo-client": "2.4.7",
"apollo-link": "1.2.6",
"apollo-link-context": "1.0.12",
"apollo-link-error": "1.1.5",
"apollo-link-http": "1.5.9",
"apollo-link-ws": "1.0.12",
"apollo-utilities": "1.0.26",
"auth0-lock": "11.12.1",
"babel-polyfill": "6.26.0",
"blob-util": "2.0.2",
"classnames": "2.2.6",
"cross-fetch": "2.2.3",
"dotenv-webpack": "1.5.7",
"graphql": "14.0.2",
"graphql-tag": "2.10.0",
"minilog": "3.1.0",
"prop-types": "15.6.2",
"query-string": "6.2.0",
"react": "16.6.3",
"react-apollo": "2.3.3",
"react-dom": "16.6.3",
"react-router-dom": "4.3.1",
"recompose": "0.30.0",
"subscriptions-transport-ws": "0.9.15"
},
"dependencies": {
"@azure/storage-blob": {
"version": "10.0.0-preview",
"resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-10.0.0-preview.tgz",
"integrity": "sha512-PFXKm+gipKDfg5h08hPiEr0Za4RMiFzzte+ewh4ACZeRQa0XZK55NAZxW67ZytGBd7WXdQq6pcAgo5dBnwQANQ==",
"dev": true,
"requires": {
"ms-rest-js": "0.21.413"
}
},
"apollo-link-ws": {
"version": "1.0.12",
"resolved": "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.12.tgz",
"integrity": "sha512-BjbskhfuuIgk9e4XHdrqmjxkY+RkD1tuerrs4PLiPTkJYcQrvA8t27lGBSrDUKHWH4esCdhQF1UhKPwhlouEHw==",
"dev": true,
"requires": {
"apollo-link": "^1.2.6"
}
}
}
},
"@superalgos/users-client": {
@@ -1520,6 +1529,55 @@
"integrity": "sha512-VMhZMMQgV1zsR+lX/0IBfAk+8Eb7dPVMWiQGFAt3qjo5x7Ml6b77jUo0e1C3ToD+XRDXqtrfw+6AB0uUsPEr3Q==",
"optional": true
},
"@types/body-parser": {
"version": "1.17.0",
"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.0.tgz",
"integrity": "sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==",
"dev": true,
"requires": {
"@types/connect": "*",
"@types/node": "*"
}
},
"@types/connect": {
"version": "3.4.32",
"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz",
"integrity": "sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==",
"dev": true,
"requires": {
"@types/node": "*"
}
},
"@types/express": {
"version": "4.16.1",
"resolved": "https://registry.npmjs.org/@types/express/-/express-4.16.1.tgz",
"integrity": "sha512-V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg==",
"dev": true,
"requires": {
"@types/body-parser": "*",
"@types/express-serve-static-core": "*",
"@types/serve-static": "*"
}
},
"@types/express-serve-static-core": {
"version": "4.16.1",
"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.1.tgz",
"integrity": "sha512-QgbIMRU1EVRry5cIu1ORCQP4flSYqLM1lS5LYyGWfKnFT3E58f0gKto7BR13clBFVrVZ0G0rbLZ1hUpSkgQQOA==",
"dev": true,
"requires": {
"@types/node": "*",
"@types/range-parser": "*"
}
},
"@types/form-data": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz",
"integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==",
"dev": true,
"requires": {
"@types/node": "*"
}
},
"@types/jss": {
"version": "9.5.7",
"resolved": "https://registry.npmjs.org/@types/jss/-/jss-9.5.7.tgz",
@@ -1529,6 +1587,12 @@
"indefinite-observable": "^1.0.1"
}
},
"@types/mime": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz",
"integrity": "sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==",
"dev": true
},
"@types/node": {
"version": "9.6.40",
"resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.40.tgz",
@@ -1545,6 +1609,12 @@
"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.1.tgz",
"integrity": "sha512-eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA=="
},
"@types/range-parser": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz",
"integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==",
"dev": true
},
"@types/react": {
"version": "16.7.17",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.7.17.tgz",
@@ -1562,6 +1632,16 @@
"@types/react": "*"
}
},
"@types/serve-static": {
"version": "1.13.2",
"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.2.tgz",
"integrity": "sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==",
"dev": true,
"requires": {
"@types/express-serve-static-core": "*",
"@types/mime": "*"
}
},
"@types/tapable": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.2.tgz",
@@ -1577,6 +1657,15 @@
"source-map": "^0.6.1"
}
},
"@types/uuid": {
"version": "3.4.4",
"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz",
"integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==",
"dev": true,
"requires": {
"@types/node": "*"
}
},
"@types/webpack": {
"version": "3.8.17",
"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-3.8.17.tgz",
@@ -2307,35 +2396,6 @@
"apollo-link": "^1.2.6"
}
},
"apollo-link-ws": {
"version": "1.0.14",
"resolved": "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.14.tgz",
"integrity": "sha512-KwHVnhKKDUA5PmmzpiqkyahjBcwGdf2eFlTZg4DIwgH1R0KcBmn/A6rkZnmClBbUNgV6t+kR46dW2fyx64Jm3A==",
"dev": true,
"requires": {
"apollo-link": "^1.2.8"
},
"dependencies": {
"apollo-link": {
"version": "1.2.8",
"resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.8.tgz",
"integrity": "sha512-lfzGRxhK9RmiH3HPFi7TIEBhhDY9M5a2ZDnllcfy5QDk7cCQHQ1WQArcw1FK0g1B+mV4Kl72DSrlvZHZJEolrA==",
"dev": true,
"requires": {
"zen-observable-ts": "^0.8.15"
}
},
"zen-observable-ts": {
"version": "0.8.15",
"resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.15.tgz",
"integrity": "sha512-sXKPWiw6JszNEkRv5dQ+lQCttyjHM2Iks74QU5NP8mMPS/NrzTlHDr780gf/wOBqmHkPO6NCLMlsa+fAQ8VE8w==",
"dev": true,
"requires": {
"zen-observable": "^0.8.0"
}
}
}
},
"apollo-utilities": {
"version": "1.0.26",
"resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.26.tgz",
@@ -4766,13 +4826,13 @@
"dependencies": {
"node-fetch": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz",
"resolved": "http://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz",
"integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=",
"dev": true
},
"whatwg-fetch": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz",
"resolved": "http://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz",
"integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==",
"dev": true
}
@@ -11586,6 +11646,24 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
},
"ms-rest-js": {
"version": "0.21.413",
"resolved": "https://registry.npmjs.org/ms-rest-js/-/ms-rest-js-0.21.413.tgz",
"integrity": "sha512-eX+M98Y9s+zo85Unt83TYkpuJkW4d0wuiHrpWjAxx/7YzZd3uVq8HRhJHXGDqCd22nlEvtwlchfgwILmBcWnOg==",
"dev": true,
"requires": {
"@types/express": "^4.11.1",
"@types/form-data": "^2.2.1",
"@types/node": "^9.4.6",
"@types/uuid": "^3.4.3",
"axios": "^0.18.0",
"form-data": "^2.3.2",
"tough-cookie": "^2.4.3",
"tslib": "^1.9.2",
"uuid": "^3.2.1",
"xml2js": "^0.4.19"
}
},
"multicast-dns": {
"version": "6.2.3",
"resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
client/package.json
+2 -2
View File
@@ -27,14 +27,14 @@
"devDependencies": {
"@advancedalgos/events-client": "0.0.4",
"@advancedalgos/financial-beings-client": "0.0.5",
"@superalgos/operations-client": "0.0.13",
"@superalgos/operations-client": "0.0.14",
"@babel/core": "^7.1.2",
"@babel/plugin-proposal-class-properties": "^7.1.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.1.0",
"@babel/preset-env": "^7.1.0",
"@babel/preset-react": "^7.0.0",
"@superalgos/key-vault-client": "0.0.26",
"@superalgos/key-vault-client": "0.0.28",
"@superalgos/teams-client": "0.0.33",
"@superalgos/users-client": "0.0.25",
"@superalgos/web-components": "0.0.18",
client/src/views/charts/index.js
+4
View File
@@ -25,6 +25,10 @@ const styles = theme => ({
class Charts extends Component {
componentDidMount () {
if (window.canvasApp.visible === undefined) {
loadCanvas() // This happens only once.
}
window.canvasApp.visible = true
let body = document.getElementById('body')
body.style = 'margin: 0px; padding: 0px; border: 0px; overflow:hidden;'