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

pulling from main

Browse Source
This commit is contained in:
Unknown committed 2019-02-18 12:27:35 +01:00
2 parents c57fad1aaf 1f5352f98e
commit df113ec99f
8 files changed
+105 -103
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
+76 -60
View File
@@ -10,21 +10,21 @@
"integrity": "sha512-N2g7LQ+bWeznV7gDqaxoVsgQuBaZENIZhfpmBtKd6NcSXOU69RUfzo3rMnhJ2ZGE4iVCo7odCPADAHhE+Qting==",
"dev": true,
"requires": {
"@material-ui/core": "^3.2.0",
"@material-ui/icons": "^3.0.1",
"apollo-client": "^2.4.4",
"classnames": "^2.2.6",
"graphql": "^14.0.2",
"graphql-tag": "^2.10.0",
"luxon": "^1.4.4",
"material-ui-pickers": "^1.0.1",
"react": "^16.5.2",
"react-apollo": "^2.2.4",
"react-d3-tree": "^1.12.0",
"react-dom": "^16.6.0",
"react-router-dom": "^4.3.1",
"react-select": "^2.1.1",
"react-sortable-hoc": "^0.8.3"
"@material-ui/core": "3.6.2",
"@material-ui/icons": "3.0.1",
"apollo-client": "2.4.7",
"classnames": "2.2.6",
"graphql": "14.0.2",
"graphql-tag": "2.10.0",
"luxon": "1.8.2",
"material-ui-pickers": "1.0.1",
"react": "16.6.3",
"react-apollo": "2.3.3",
"react-d3-tree": "1.12.1",
"react-dom": "16.6.3",
"react-router-dom": "4.3.1",
"react-select": "2.1.2",
"react-sortable-hoc": "0.8.4"
}
},
"@azure/ms-rest-js": {
@@ -1344,33 +1344,33 @@
"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"
}
},
"@superalgos/users-client": {
@@ -2361,7 +2361,7 @@
},
"array-equal": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
"resolved": "http://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
"integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
"dev": true
},
@@ -2555,9 +2555,9 @@
},
"dependencies": {
"core-js": {
"version": "2.6.4",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.4.tgz",
"integrity": "sha512-05qQ5hXShcqGkPZpXEFLIpxayZscVD2kuMBZewxiIPPEagukO4mqgPA9CWhUvFBJfy3ODdK2p9xyHh7FTU9/7A==",
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.2.tgz",
"integrity": "sha512-NdBPF/RVwPW6jr0NCILuyN9RiqLo2b1mddWHkUL+VnvcB7dzlnBJ1bXYntjpTGOgkZiiLWj2JxmOr7eGE3qK6g==",
"dev": true
}
}
@@ -2836,7 +2836,7 @@
"dependencies": {
"jsesc": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
"resolved": "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
"dev": true
},
@@ -3963,6 +3963,12 @@
"integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
"dev": true
},
"builtin-modules": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
"dev": true
},
"builtin-status-codes": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
@@ -7987,9 +7993,9 @@
}
},
"follow-redirects": {
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.1.tgz",
"integrity": "sha512-t2JCjbzxQpWvbhts3l6SH1DKzSrx8a+SsaVf4h6bG4kOXUuPYS/kg2Lr4gQSb7eemaHqJkOThF1BGyjlUkO1GQ==",
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
"integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
"dev": true,
"requires": {
"debug": "=3.1.0"
@@ -9469,7 +9475,7 @@
},
"hoek": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
"resolved": "http://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
"integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==",
"dev": true
},
@@ -10410,6 +10416,15 @@
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
"dev": true
},
"is-builtin-module": {
"version": "1.0.0",
"resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
"integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
"dev": true,
"requires": {
"builtin-modules": "1.1.1"
}
},
"is-callable": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
@@ -11256,7 +11271,7 @@
},
"jest-get-type": {
"version": "22.4.3",
"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz",
"resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz",
"integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==",
"dev": true
},
@@ -13136,9 +13151,9 @@
}
},
"normalize-package-data": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
"integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
"dev": true,
"requires": {
"hosted-git-info": "^2.1.4",
@@ -22024,9 +22039,9 @@
}
},
"spdx-license-ids": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
"integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==",
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz",
"integrity": "sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg==",
"dev": true
},
"spdy": {
@@ -22636,7 +22651,7 @@
},
"topo": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/topo/-/topo-2.0.2.tgz",
"resolved": "http://registry.npmjs.org/topo/-/topo-2.0.2.tgz",
"integrity": "sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI=",
"dev": true,
"requires": {
@@ -22712,7 +22727,8 @@
"tslib": {
"version": "1.9.3",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
"dev": true
},
"tty-browserify": {
"version": "0.0.0",
@@ -24377,7 +24393,7 @@
},
"xmlbuilder": {
"version": "9.0.7",
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
"resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
"integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
"dev": true
},
client/package.json
+2 -2
View File
@@ -27,14 +27,14 @@
"devDependencies": {
"@superalgos/events-client": "0.0.1",
"@advancedalgos/financial-beings-client": "0.0.5",
"@superalgos/operations-client": "0.0.13",
"@superalgos/operations-client": "0.0.15",
"@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.31",
"@superalgos/teams-client": "0.0.33",
"@superalgos/users-client": "0.0.25",
"@superalgos/web-components": "0.0.18",
client/src/App.js
+2 -2
View File
@@ -74,11 +74,11 @@ export const MasterApp = props => (
render={props => <FinancialBeings {...props} auth={auth}/>}
/>
<Route
path='/key-vault'
path='/keys'
render={props => <KeyVault {...props} auth={auth} />}
/>
<Route
path='/operations'
path='/clones'
render={props => <Operations {...props} auth={auth} />}
/>
</Switch>
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;'
client/src/views/layout/header/imports.js
+9 -10
View File
@@ -7,7 +7,6 @@ import {
BugReport,
People,
Group,
// Adb,
VpnKey,
Home,
AddCircleOutline
@@ -50,26 +49,26 @@ const eventsMenus = {
}
const keyvaultMenus = {
title: 'Key Vault',
to: '/key-vault',
title: 'Keys',
to: '/keys',
icon: Home,
authenticated: true,
submenus: [
{ title: 'Your keys', to: '/key-vault/browse', icon: VpnKey },
{ title: 'Add key', to: '/key-vault/addKey', icon: AddCircleOutline },
{ title: 'Your keys', to: '/keys/browse', icon: VpnKey },
{ title: 'Add key', to: '/keys/addKey', icon: AddCircleOutline },
{ title: 'Report a Bug', to: 'https://github.com/Superalgos/KeyVaultModule/issues/new', icon: BugReport, externalLink: true }
]
}
const operationsMenus = {
title: 'Operations',
to: '/operations',
title: 'Clones',
to: '/clones',
icon: Home,
authenticated: true,
submenus: [
{ title: 'Active clones', to: '/operations/browse', icon: ImportContacts },
{ title: 'History', to: '/operations/history', icon: LibraryAdd },
{ title: 'Clone a bot', to: '/operations/add', icon: AddCircleOutline },
{ title: 'Active Clones', to: '/clones/browse', icon: ImportContacts },
{ title: 'History Clones', to: '/clones/history', icon: LibraryAdd },
{ title: 'Create Clone', to: '/clones/add', icon: AddCircleOutline },
{ title: 'Report a Bug', to: 'https://github.com/Superalgos/OperationsModule/issues/new', icon: BugReport, externalLink: true }
]
}
server/src/index.js
+2 -25
View File
@@ -166,8 +166,8 @@ async function run () {
schema,
context,
formatError: error => {
logger.error(`An error ocurred inside a module: ${JSON.stringify(error)}`)
return error
logger.error('An error ocurred inside a module: %s', error.message)
return error.message
},
formatResponse: response => {
logger.debug('Response from Apollo Server: ' + response)
@@ -181,29 +181,6 @@ async function run () {
}
})
const whitelist = [
process.env.PROJECT_SITE_URL,
process.env.PLATFORM_URL,
process.env.GRAPHQL_API_URL,
process.env.TEAMS_API_URL,
process.env.USERS_API_URL,
process.env.EVENTS_API_URL,
process.env.KEYVAULT_API_URL,
process.env.FINANCIAL_BEINGS_API_URL,
process.env.NOTIFICATIONS_API_URL
]
const corsOptionsDelegate = (req, callback) => {
let corsOptions
if (whitelist.indexOf(req.header('Origin')) !== -1) {
corsOptions = { origin: true, credentials: true }
} else {
corsOptions = { origin: false, credentials: true }
}
callback(null, corsOptions)
}
// server.applyMiddleware({ app, cors: corsOptionsDelegate })
server.applyMiddleware({ app, cors: { origin: true, credentials: true, methods:'GET,PUT,POST,DELETE,OPTIONS'}})
app.listen(4100)