diff --git a/client/package-lock.json b/client/package-lock.json
index 6a9e61048..8906b58a3 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1335,9 +1335,9 @@
}
},
"@superalgos/operations-client": {
- "version": "0.0.17",
- "resolved": "https://registry.npmjs.org/@superalgos/operations-client/-/operations-client-0.0.17.tgz",
- "integrity": "sha512-T0OydK2mGov+mxYn4z8z8mHtOL40nhwFCXiQUMT7WduaxElKc5L7bL1/+lLW8/lURSXIwi0AGkCXcCGCld3nFg==",
+ "version": "0.0.18",
+ "resolved": "https://registry.npmjs.org/@superalgos/operations-client/-/operations-client-0.0.18.tgz",
+ "integrity": "sha512-kiNq2IcCXSzavPYz7RUBnA22eQPE8Rui7qIO0WiHUEKnItVXjj5MxEFhIm9LdNBSTICoVuFTLoK/l707q/XKpQ==",
"dev": true,
"requires": {
"@material-ui/core": "^3.2.2",
diff --git a/client/package.json b/client/package.json
index 406b4625d..3d1ea3793 100644
--- a/client/package.json
+++ b/client/package.json
@@ -25,20 +25,21 @@
},
"homepage": "https://github.com/Algoteers/MasterApp#readme",
"devDependencies": {
+ "@superalgos/miners-client": "0.0.1",
"@superalgos/logs-client": "0.0.1",
"@superalgos/events-client": "0.0.2",
"@advancedalgos/financial-beings-client": "0.0.5",
- "@superalgos/operations-client": "0.0.18",
+ "@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/key-vault-client": "0.0.31",
- "@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",
diff --git a/client/src/App.js b/client/src/App.js
index 3a4e95f43..7baf16484 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -21,6 +21,7 @@ import KeyVault from '@superalgos/key-vault-client'
import FinancialBeings from '@advancedalgos/financial-beings-client'
import Operations from '@superalgos/operations-client'
import Logs from '@superalgos/logs-client'
+import Miners from '@superalgos/miners-client'
export const auth = new Auth(
result => console.log('Authentication successful.'),
@@ -86,6 +87,10 @@ export const MasterApp = props => (
path='/logs'
render={props => }
/>
+ }
+ />
diff --git a/client/src/views/layout/header/imports.js b/client/src/views/layout/header/imports.js
index 953a7ddf5..dda190aea 100644
--- a/client/src/views/layout/header/imports.js
+++ b/client/src/views/layout/header/imports.js
@@ -73,6 +73,16 @@ const operationsMenus = {
]
}
+const minersMenus = {
+ title: 'Miners',
+ to: '/miners',
+ icon: Home,
+ authenticated: false,
+ submenus: [
+ { title: 'Report a Bug', to: 'https://github.com/Superalgos/minersClient/issues/new', icon: BugReport, externalLink: true }
+ ]
+}
+
// const financialBeingsMenus = {
// title: 'FBs',
// to: '/financial-beings',
@@ -89,7 +99,8 @@ const allMenus = [
eventsMenus,
// financialBeingsMenus,
keyvaultMenus,
- operationsMenus
+ operationsMenus,
+ minersMenus
]
export default allMenus
diff --git a/server/src/index.js b/server/src/index.js
index 425989969..4bb79559f 100644
--- a/server/src/index.js
+++ b/server/src/index.js
@@ -74,6 +74,10 @@ async function run () {
'logs_',
process.env.LOGS_API_URL,
process.env.LOGS_API_PRESHARED)
+ const transformedMinersSchema = await createTransformedRemoteSchema(
+ 'miners_',
+ process.env.MINERS_API_URL,
+ process.env.MINERS_PRESHARED)
var schemas = []
var resolvers = {}
@@ -114,6 +118,9 @@ async function run () {
if (transformedLogsSchema) {
schemas.push(transformedLogsSchema)
}
+ if (transformedMinersSchema) {
+ schemas.push(transformedMinersSchema)
+ }
const schema = mergeSchemas({
schemas,