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

Merge remote-tracking branch 'upstream/develop'

Browse Source
This commit is contained in:
Matias committed 2019-03-23 10:43:16 +01:00
2 parents 24dbaa9085 a786c054ae
commit b370fc836e
4 files changed
+113 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

client/package-lock.json
Generated
+93 -30
View File
@@ -1277,6 +1277,24 @@
"integrity": "sha512-aalIRUtcR6nPf50kEwnYvepSJIdpulrbMeeNMwiOmFgBg4MgScCmlI7SqOmsGJNqaH65+benoqt0H4N0RR2Okg==",
"dev": true
},
"@superalgos/cockpit-client": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/@superalgos/cockpit-client/-/cockpit-client-0.0.1.tgz",
"integrity": "sha512-8ZU2oOCQKPch5RuERdpAID74w5T//zd3meXxktiftpqqE5jpRdEcRQUtwfMqkSDZjH3x72FR20AeOwmJv9ulsg==",
"requires": {
"@material-ui/core": "^3.2.0",
"@material-ui/icons": "^3.0.1",
"apollo-client": "^2.4.4",
"graphql": "^14.0.2",
"graphql-tag": "^2.10.0",
"react": "^16.5.2",
"react-apollo": "^2.2.4",
"react-dom": "^16.6.0",
"react-json-editor-ajrm": "^2.5.9",
"react-json-view": "^1.19.1",
"react-router-dom": "^4.3.1"
}
},
"@superalgos/events-client": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/@superalgos/events-client/-/events-client-0.0.2.tgz",
@@ -1334,27 +1352,6 @@
"react-router-dom": "^4.3.1"
}
},
"@superalgos/operations-client": {
"version": "0.0.20",
"resolved": "https://registry.npmjs.org/@superalgos/operations-client/-/operations-client-0.0.20.tgz",
"integrity": "sha512-PZtr3XIzkGS3RezInDoUrbL00mFmhjskNrFQ3HV8AAz9RprwKE3YivcZdGzQGcrnerB2caa6Da7aX+jpbUkdnQ==",
"dev": true,
"requires": {
"@material-ui/core": "^3.2.2",
"@material-ui/icons": "^3.0.1",
"apollo-client": "^2.4.2",
"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.6.1",
"react-apollo": "^2.2.4",
"react-dom": "^16.6.1",
"react-number-format": "^4.0.6",
"react-router-dom": "^4.3.1"
}
},
"@superalgos/strategizer-client": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/@superalgos/strategizer-client/-/strategizer-client-0.0.7.tgz",
@@ -3699,6 +3696,11 @@
}
}
},
"base16": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/base16/-/base16-1.0.0.tgz",
"integrity": "sha1-4pf2DX7BAUp6lxo568ipjAtoHnA="
},
"base64-js": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
@@ -7548,6 +7550,14 @@
"bser": "^2.0.0"
}
},
"fbemitter": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-2.1.1.tgz",
"integrity": "sha1-Uj4U/a9SSIBbsC9i78M75wP1GGU=",
"requires": {
"fbjs": "^0.8.4"
}
},
"fbjs": {
"version": "0.8.17",
"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
@@ -8049,6 +8059,15 @@
"readable-stream": "^2.3.6"
}
},
"flux": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/flux/-/flux-3.1.3.tgz",
"integrity": "sha1-0jvtUVp5oi2TOrU6tK2hnQWy8Io=",
"requires": {
"fbemitter": "^2.0.0",
"fbjs": "^0.8.0"
}
},
"follow-redirects": {
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
@@ -12294,6 +12313,16 @@
"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
"dev": true
},
"lodash.curry": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz",
"integrity": "sha1-JI42By7ekGUB11lmIAqG2riyMXA="
},
"lodash.flow": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz",
"integrity": "sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o="
},
"lodash.isequal": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
@@ -18582,6 +18611,11 @@
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
},
"pure-color": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/pure-color/-/pure-color-1.3.0.tgz",
"integrity": "sha1-H+Bk+wrIUfDeYTIKi/eWg2Qi8z4="
},
"q": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
@@ -18794,6 +18828,17 @@
}
}
},
"react-base16-styling": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/react-base16-styling/-/react-base16-styling-0.6.0.tgz",
"integrity": "sha1-7yFW1mz0E5aVyKFniGy2nqZgeSw=",
"requires": {
"base16": "^1.0.0",
"lodash.curry": "^4.0.1",
"lodash.flow": "^3.3.0",
"pure-color": "^1.2.0"
}
},
"react-d3-tree": {
"version": "1.12.2",
"resolved": "https://registry.npmjs.org/react-d3-tree/-/react-d3-tree-1.12.2.tgz",
@@ -19035,20 +19080,30 @@
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.1.tgz",
"integrity": "sha512-ioMCzVDWvCvKD8eeT+iukyWrBGrA3DiFYkXfBsVYIRdaREZuBjENG+KjrikavCLasozqRWTwFUagU/O4vPpRMA=="
},
"react-json-editor-ajrm": {
"version": "2.5.9",
"resolved": "https://registry.npmjs.org/react-json-editor-ajrm/-/react-json-editor-ajrm-2.5.9.tgz",
"integrity": "sha512-76FQtcIU3O88I5i/QUx+Lw7zB8OpyKap7eyHZOIhbsMdbMiT+sRdbIhxXchKoTOMnYmmw0vG8D9YCzX80iew9w==",
"requires": {
"@babel/runtime": "^7.0.0-rc.0"
}
},
"react-json-view": {
"version": "1.19.1",
"resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.19.1.tgz",
"integrity": "sha512-u5e0XDLIs9Rj43vWkKvwL8G3JzvXSl6etuS5G42a8klMohZuYFQzSN6ri+/GiBptDqlrXPTdExJVU7x9rrlXhg==",
"requires": {
"flux": "^3.1.3",
"react-base16-styling": "^0.6.0",
"react-lifecycles-compat": "^3.0.4",
"react-textarea-autosize": "^6.1.0"
}
},
"react-lifecycles-compat": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
},
"react-number-format": {
"version": "4.0.7",
"resolved": "https://registry.npmjs.org/react-number-format/-/react-number-format-4.0.7.tgz",
"integrity": "sha512-boRHwPzkNDuyqeQ9zyHp0XgVAqT5RyS+BsohOhiTz6VMxEQr3DuSuNdg0Q8c3CYTgNESYlxnH278DPqaQFO72w==",
"dev": true,
"requires": {
"prop-types": "^15.6.0"
}
},
"react-redux": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.1.1.tgz",
@@ -20068,6 +20123,14 @@
"prop-types": "^15.5.6"
}
},
"react-textarea-autosize": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz",
"integrity": "sha512-F6bI1dgib6fSvG8so1HuArPUv+iVEfPliuLWusLF+gAKz0FbB4jLrWUrTAeq1afnPT2c9toEZYUdz/y1uKMy4A==",
"requires": {
"prop-types": "^15.6.0"
}
},
"react-transition-group": {
"version": "2.5.3",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.5.3.tgz",
client/package.json
+1
View File
@@ -85,6 +85,7 @@
"@fortawesome/react-fontawesome": "^0.1.3",
"@material-ui/core": "^3.6.2",
"@material-ui/icons": "^3.0.1",
"@superalgos/cockpit-client": "0.0.1",
"apollo-cache-inmemory": "^1.3.5",
"apollo-client": "^2.5.1",
"apollo-link": "^1.2.3",
client/src/App.js
+6 -2
View File
@@ -23,6 +23,7 @@ import Operations from '@superalgos/operations-client'
import Strategizer from '@superalgos/strategizer-client'
import Logs from '@superalgos/logs-client'
// import Miners from '@superalgos/miners-client'
import Cockpit from '@superalgos/cockpit-client'
export const auth = new Auth(
result => console.log('Authentication successful.'),
@@ -74,7 +75,7 @@ export const MasterApp = props => (
/>
<Route
path='/financial-beings'
render={props => <FinancialBeings {...props} auth={auth}/>}
render={props => <FinancialBeings {...props} auth={auth} />}
/>
<Route
path='/keys'
@@ -92,7 +93,10 @@ export const MasterApp = props => (
path='/logs'
render={props => <Logs {...props} auth={auth} />}
/>
<Route
path='/cockpit'
render={props => <Cockpit {...props} auth={auth} />}
/>
</Switch>
</Layout>
</MuiThemeProvider>
client/src/views/layout/header/imports.js
+13 -1
View File
@@ -84,6 +84,17 @@ const minersMenus = {
]
}
const cockpitMenus = {
title: 'Cockpit',
to: '/cockpit',
icon: Home,
authenticated: true,
submenus: [
{ title: 'Signals', to: '/cockpit/signals', icon: GamepadRounded },
{ title: 'Report a Bug', to: 'https://github.com/Superalgos/CockpitClientModule/issues/new', icon: BugReport, externalLink: true }
]
}
// const financialBeingsMenus = {
// title: 'FBs',
// to: '/financial-beings',
@@ -113,7 +124,8 @@ const allMenus = [
keyvaultMenus,
operationsMenus,
minersMenus,
strategizerMenus
strategizerMenus,
cockpitMenus
]
export default allMenus