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

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Barry Low committed 2019-03-20 17:47:46 +01:00
2 parents eca9615596 861bd34fe7
commit ed0fa86853
5 files changed
+234 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

client/package-lock.json
Generated
+198
View File
@@ -1355,6 +1355,127 @@
"react-router-dom": "^4.3.1"
}
},
<<<<<<< HEAD
=======
"@superalgos/strategizer-client": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/@superalgos/strategizer-client/-/strategizer-client-0.0.2.tgz",
"integrity": "sha512-c62Ug2fmRVgLTmKy0o6TNQBp7OOI5jkKu3QB0d1+H36oJCg/uDiWLvr17fGXmAWdSr4o8Y3I1dW9H7P9MubO0g==",
"dev": true,
"requires": {
"@material-ui/core": "^3.2.0",
"@material-ui/icons": "^3.0.1",
"apollo-client": "^2.5.1",
"graphql": "^14.0.2",
"graphql-tag": "^2.10.0",
"lodash": "^4.17.11",
"react": "^16.8.4",
"react-apollo": "^2.5.2",
"react-apollo-hooks": "^0.4.3",
"react-dom": "^16.8.4",
"react-router-dom": "^4.3.1"
},
"dependencies": {
"apollo-cache": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.2.1.tgz",
"integrity": "sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ==",
"dev": true,
"requires": {
"apollo-utilities": "^1.2.1",
"tslib": "^1.9.3"
}
},
"apollo-client": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.5.1.tgz",
"integrity": "sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA==",
"dev": true,
"requires": {
"@types/zen-observable": "^0.8.0",
"apollo-cache": "1.2.1",
"apollo-link": "^1.0.0",
"apollo-link-dedup": "^1.0.0",
"apollo-utilities": "1.2.1",
"symbol-observable": "^1.0.2",
"ts-invariant": "^0.2.1",
"tslib": "^1.9.3",
"zen-observable": "^0.8.0"
}
},
"apollo-utilities": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.1.tgz",
"integrity": "sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==",
"dev": true,
"requires": {
"fast-json-stable-stringify": "^2.0.0",
"ts-invariant": "^0.2.1",
"tslib": "^1.9.3"
}
},
"react": {
"version": "16.8.4",
"resolved": "https://registry.npmjs.org/react/-/react-16.8.4.tgz",
"integrity": "sha512-0GQ6gFXfUH7aZcjGVymlPOASTuSjlQL4ZtVC5YKH+3JL6bBLCVO21DknzmaPlI90LN253ojj02nsapy+j7wIjg==",
"dev": true,
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
"prop-types": "^15.6.2",
"scheduler": "^0.13.4"
}
},
"react-apollo": {
"version": "2.5.2",
"resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.5.2.tgz",
"integrity": "sha512-lmglhG6NQ+lfAUDzx8ZgelWKUbvxBhhy1l7Z2ksgtQ8+FVqwX7i6p5O3zicAZZlIdKzdq82V0kqq5WkxEsffrA==",
"dev": true,
"requires": {
"apollo-utilities": "^1.2.1",
"hoist-non-react-statics": "^3.0.0",
"lodash.isequal": "^4.5.0",
"prop-types": "^15.6.0",
"ts-invariant": "^0.3.0",
"tslib": "^1.9.3"
},
"dependencies": {
"ts-invariant": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.3.2.tgz",
"integrity": "sha512-QsY8BCaRnHiB5T6iE4DPlJMAKEG3gzMiUco9FEt1jUXQf0XP6zi0idT0i0rMTu8A326JqNSDsmlkA9dRSh1TRg==",
"dev": true,
"requires": {
"tslib": "^1.9.3"
}
}
}
},
"react-dom": {
"version": "16.8.4",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.4.tgz",
"integrity": "sha512-Ob2wK7XG2tUDt7ps7LtLzGYYB6DXMCLj0G5fO6WeEICtT4/HdpOi7W/xLzZnR6RCG1tYza60nMdqtxzA8FaPJQ==",
"dev": true,
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
"prop-types": "^15.6.2",
"scheduler": "^0.13.4"
}
},
"scheduler": {
"version": "0.13.4",
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.4.tgz",
"integrity": "sha512-cvSOlRPxOHs5dAhP9yiS/6IDmVAVxmk33f0CtTJRkmUWcb1Us+t7b1wqdzoC0REw2muC9V5f1L/w5R5uKGaepA==",
"dev": true,
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1"
}
}
}
},
>>>>>>> develop
"@superalgos/teams-client": {
"version": "0.0.33",
"resolved": "https://registry.npmjs.org/@superalgos/teams-client/-/teams-client-0.0.33.tgz",
@@ -18717,6 +18838,15 @@
}
}
},
"react-apollo-hooks": {
"version": "0.4.3",
"resolved": "https://registry.npmjs.org/react-apollo-hooks/-/react-apollo-hooks-0.4.3.tgz",
"integrity": "sha512-mRFPb7bk42wOlGnIdwLc4XO43uTczdx7CzpdTmNwjzAgb/H/nKEXeZitoF1Wgtj0Zb6R5wTGs2nBIMfz0/DzEA==",
"dev": true,
"requires": {
"lodash": "^4.17.11"
}
},
"react-app-polyfill": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-0.2.0.tgz",
@@ -19923,6 +20053,7 @@
"requires": {
"ajv": "^6.1.0",
"ajv-keywords": "^3.1.0"
<<<<<<< HEAD
}
},
"source-map": {
@@ -19973,10 +20104,65 @@
"requires": {
"ajv": "^6.1.0",
"ajv-keywords": "^3.1.0"
=======
>>>>>>> develop
}
},
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
}
}
},
<<<<<<< HEAD
=======
"webpack": {
"version": "4.19.1",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.19.1.tgz",
"integrity": "sha512-j7Q/5QqZRqIFXJvC0E59ipLV5Hf6lAnS3ezC3I4HMUybwEDikQBVad5d+IpPtmaQPQArvgUZLXIN6lWijHBn4g==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.7.6",
"@webassemblyjs/helper-module-context": "1.7.6",
"@webassemblyjs/wasm-edit": "1.7.6",
"@webassemblyjs/wasm-parser": "1.7.6",
"acorn": "^5.6.2",
"acorn-dynamic-import": "^3.0.0",
"ajv": "^6.1.0",
"ajv-keywords": "^3.1.0",
"chrome-trace-event": "^1.0.0",
"enhanced-resolve": "^4.1.0",
"eslint-scope": "^4.0.0",
"json-parse-better-errors": "^1.0.2",
"loader-runner": "^2.3.0",
"loader-utils": "^1.1.0",
"memory-fs": "~0.4.1",
"micromatch": "^3.1.8",
"mkdirp": "~0.5.0",
"neo-async": "^2.5.0",
"node-libs-browser": "^2.0.0",
"schema-utils": "^0.4.4",
"tapable": "^1.1.0",
"uglifyjs-webpack-plugin": "^1.2.4",
"watchpack": "^1.5.0",
"webpack-sources": "^1.2.0"
},
"dependencies": {
"schema-utils": {
"version": "0.4.7",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
"integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
"dev": true,
"requires": {
"ajv": "^6.1.0",
"ajv-keywords": "^3.1.0"
}
}
}
},
>>>>>>> develop
"yallist": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
@@ -22765,6 +22951,18 @@
"integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
"dev": true
},
<<<<<<< HEAD
=======
"ts-invariant": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.2.1.tgz",
"integrity": "sha512-Z/JSxzVmhTo50I+LKagEISFJW3pvPCqsMWLamCTX8Kr3N5aMrnGOqcflbe5hLUzwjvgPfnLzQtHZv0yWQ+FIHg==",
"dev": true,
"requires": {
"tslib": "^1.9.3"
}
},
>>>>>>> develop
"tslib": {
"version": "1.9.3",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
client/package.json
+8 -7
View File
@@ -25,20 +25,21 @@
},
"homepage": "https://github.com/Algoteers/MasterApp#readme",
"devDependencies": {
"@superalgos/logs-client": "0.0.1",
"@superalgos/events-client": "0.0.2",
"@advancedalgos/financial-beings-client": "0.0.5",
"@superalgos/operations-client": "0.0.20",
"@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",
"@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/events-client": "0.0.2",
"@superalgos/key-vault-client": "0.0.31",
"@superalgos/logs-client": "0.0.1",
"@superalgos/operations-client": "0.0.20",
"@superalgos/strategizer-client": "0.0.2",
"@superalgos/teams-client": "0.0.33",
"@superalgos/users-client": "0.0.25",
"@superalgos/web-components": "0.0.18",
"autoprefixer": "^9.2.0",
"babel-loader": "^8.0.4",
"babel-preset-flow": "6.23.0",
client/src/App.js
+5
View File
@@ -20,6 +20,7 @@ import Events from '@superalgos/events-client'
import KeyVault from '@superalgos/key-vault-client'
import FinancialBeings from '@advancedalgos/financial-beings-client'
import Operations from '@superalgos/operations-client'
import Strategizer from '@superalgos/strategizer-client'
import Logs from '@superalgos/logs-client'
// import Miners from '@superalgos/miners-client'
@@ -83,6 +84,10 @@ export const MasterApp = props => (
path='/clones'
render={props => <Operations {...props} auth={auth} />}
/>
<Route
path='/strategizer'
render={props => <Strategizer {...props} auth={auth} />}
/>
<Route
path='/logs'
render={props => <Logs {...props} auth={auth} />}
client/src/auth/index.js
+8 -2
View File
@@ -49,7 +49,8 @@ export const defaultOptions = {
languageDictionary: {
title: 'Superalgos Platform'
},
avatar: null
avatar: null,
mustAcceptTerms: true
}
export const inviteOptions = {
@@ -67,7 +68,12 @@ export const inviteOptions = {
scope: `email`
}
},
prefill: { email: '' }
prefill: { email: '' },
languageDictionary: {
title: 'Superalgos Platform'
},
avatar: null,
mustAcceptTerms: true
}
let lock = new Auth0Lock(
client/src/views/layout/header/imports.js
+15 -2
View File
@@ -9,7 +9,8 @@ import {
Group,
VpnKey,
Home,
AddCircleOutline
AddCircleOutline,
ViewModule
} from '@material-ui/icons'
const usersMenus = {
@@ -93,6 +94,17 @@ const minersMenus = {
// ]
// }
const strategizerMenus = {
title: 'Strategizer',
to: '/strategizer',
icon: Home,
authenticated: false,
submenus: [
{ title: 'Your strategies', to: '/strategizer/manage-strategies', icon: ViewModule, authenticated: false },
{ title: 'Report a Bug', to: 'https://github.com/Superalgos/StrategizerClientModule/issues/new', icon: BugReport, externalLink: true }
]
}
const allMenus = [
usersMenus,
teamsMenus,
@@ -100,7 +112,8 @@ const allMenus = [
// financialBeingsMenus,
keyvaultMenus,
operationsMenus,
minersMenus
minersMenus,
strategizerMenus
]
export default allMenus