diff --git a/client/babel.config.js b/client/babel.config.js index cd4607f1c..dc0a08776 100644 --- a/client/babel.config.js +++ b/client/babel.config.js @@ -11,7 +11,7 @@ module.exports = (api) => { '@babel/plugin-proposal-class-properties', '@babel/plugin-syntax-dynamic-import', 'dynamic-import-node', - '@babel/plugin-transform-runtime' + ['@babel/plugin-transform-runtime', { useESModules: true }] ] return { diff --git a/client/package-lock.json b/client/package-lock.json index 7f50ce408..559b8856c 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -970,24 +970,6 @@ "regenerator-runtime": "^0.12.0" } }, - "@babel/runtime-corejs2": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.3.4.tgz", - "integrity": "sha512-QwPuQE65kNxjsNKk34Rfgen2R5fk0J2So99SD45uXBp34QOfyz11SqVgJ4xvyCpnCIieSQ0X0hSSc9z/ymlJJw==", - "dev": true, - "requires": { - "core-js": "^2.5.7", - "regenerator-runtime": "^0.12.0" - }, - "dependencies": { - "core-js": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz", - "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==", - "dev": true - } - } - }, "@babel/template": { "version": "7.2.2", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz", @@ -1107,21 +1089,6 @@ "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==", "dev": true }, - "@date-io/core": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@date-io/core/-/core-1.1.0.tgz", - "integrity": "sha512-PyjhyR2fbp7Q8xpB5zoOyT3dqr8Bn4kXfREf1w6AnQalwdftNxChB2/p88fI1qsx8KNmHDJY12eCgLoZaPegTw==", - "dev": true - }, - "@date-io/date-fns": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-1.1.0.tgz", - "integrity": "sha512-FMRhYWfoGiIXdN4xWAArpkdEbqsg2Fr+6Yda7Np2eVWCNx6gSMYsHIM51IIcI+3762ajYbhoEYjHYXVFNZIk1g==", - "dev": true, - "requires": { - "@date-io/core": "^1.1.0" - } - }, "@emotion/babel-utils": { "version": "0.6.10", "resolved": "https://registry.npmjs.org/@emotion/babel-utils/-/babel-utils-0.6.10.tgz", @@ -1367,139 +1334,6 @@ "react-router-dom": "^4.3.1" } }, - "@superalgos/miners-client": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/@superalgos/miners-client/-/miners-client-0.0.1.tgz", - "integrity": "sha512-3C5qJuApb9YR0Ru2NMrUUob/EV+V1vRZ40dJWdzgop6lXx6LdiECrUwx2b1su0ZchQsOLBiAr7jf8M7ZX9s/tA==", - "dev": true, - "requires": { - "@material-ui/core": "3.9.2", - "@material-ui/icons": "3.0.2", - "apollo-client": "2.4.4", - "graphql": "14.1.1", - "graphql-tag": "2.10.1", - "material-table": "^1.21.0", - "react": "16.5.2", - "react-apollo": "2.5.2", - "react-dom": "16.6.0", - "react-router-dom": "4.3.1" - }, - "dependencies": { - "@types/async": { - "version": "2.0.50", - "resolved": "https://registry.npmjs.org/@types/async/-/async-2.0.50.tgz", - "integrity": "sha512-VMhZMMQgV1zsR+lX/0IBfAk+8Eb7dPVMWiQGFAt3qjo5x7Ml6b77jUo0e1C3ToD+XRDXqtrfw+6AB0uUsPEr3Q==", - "dev": true, - "optional": true - }, - "apollo-cache": { - "version": "1.1.19", - "resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.19.tgz", - "integrity": "sha512-p163+GVne1Gyw2v9L5kHEQhUhih7btWvyUFOl4uKf7brieqd4tHZt8ZA3vT1SaXbCeQZNSp/tFI3yFyi8RPKzw==", - "dev": true, - "requires": { - "apollo-utilities": "^1.0.24" - } - }, - "apollo-client": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.4.tgz", - "integrity": "sha512-i29w/+aa9O4fe8NxzJNOViHdsjpN2723Q2mNl0HiOJFwG+VjA4RXdTpyZHPZqcO8FwgK1k43l8nULD4Cdlx/Ww==", - "dev": true, - "requires": { - "@types/async": "2.0.50", - "@types/zen-observable": "^0.8.0", - "apollo-cache": "1.1.19", - "apollo-link": "^1.0.0", - "apollo-link-dedup": "^1.0.0", - "apollo-utilities": "1.0.24", - "symbol-observable": "^1.0.2", - "zen-observable": "^0.8.0" - } - }, - "apollo-utilities": { - "version": "1.0.24", - "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.24.tgz", - "integrity": "sha512-cOXtrkio3wKfggp/zKCzQYxSZZRND/njNVmUksM1cckoJF3g/2o3bhh6z0HPhNhee8qzJzVXtl+3vmwXYGh0Gg==", - "dev": true, - "requires": { - "fast-json-stable-stringify": "^2.0.0" - } - }, - "react": { - "version": "16.5.2", - "resolved": "https://registry.npmjs.org/react/-/react-16.5.2.tgz", - "integrity": "sha512-FDCSVd3DjVTmbEAjUNX6FgfAmQ+ypJfHUsqUJOYNCBUp1h8lqmtC+0mXJ+JjsWx4KAVTkk1vKd1hLQPvEviSuw==", - "dev": true, - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "schedule": "^0.5.0" - } - }, - "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": { - "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" - }, - "dependencies": { - "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" - } - } - } - } - } - }, - "react-dom": { - "version": "16.6.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.6.0.tgz", - "integrity": "sha512-Stm2D9dXEUUAQdvpvhvFj/DEXwC2PAL/RwEMhoN4dvvD2ikTlJegEXf97xryg88VIAU22ZAP7n842l+9BTz6+w==", - "dev": true, - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "scheduler": "^0.10.0" - } - }, - "scheduler": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.10.0.tgz", - "integrity": "sha512-+TSTVTCBAA3h8Anei3haDc1IRwMeDmtI/y/o3iBe3Mjl2vwYF9DtPDt929HyRmV/e7au7CLu8sc4C4W0VOs29w==", - "dev": true, - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } - } - } - }, "@superalgos/operations-client": { "version": "0.0.20", "resolved": "https://registry.npmjs.org/@superalgos/operations-client/-/operations-client-0.0.20.tgz", @@ -1521,6 +1355,124 @@ "react-router-dom": "^4.3.1" } }, + "@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" + } + } + } + }, "@superalgos/teams-client": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/@superalgos/teams-client/-/teams-client-0.0.33.tgz", @@ -1707,15 +1659,6 @@ "csstype": "^2.2.0" } }, - "@types/react-text-mask": { - "version": "5.4.4", - "resolved": "https://registry.npmjs.org/@types/react-text-mask/-/react-text-mask-5.4.4.tgz", - "integrity": "sha512-mnwyDgUwFtJVAZ8f+tzPGmYjpH7TLXxHSGty338abca6aAjdjRLCOC4h+CxlvB8xrVAIU5pkNllpHhfJCA3hXQ==", - "dev": true, - "requires": { - "@types/react": "*" - } - }, "@types/react-transition-group": { "version": "2.0.15", "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-2.0.15.tgz", @@ -2797,7 +2740,7 @@ "dependencies": { "fbjs": { "version": "0.3.2", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.3.2.tgz", + "resolved": "http://registry.npmjs.org/fbjs/-/fbjs-0.3.2.tgz", "integrity": "sha1-AzpUBZUIS13jUJpAXQbxoqjlufs=", "requires": { "core-js": "^1.0.0", @@ -2864,7 +2807,7 @@ }, "whatwg-fetch": { "version": "0.9.0", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz", + "resolved": "http://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz", "integrity": "sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA=" } } @@ -2905,7 +2848,7 @@ }, "axios": { "version": "0.18.0", - "resolved": "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "dev": true, "requires": { @@ -5147,12 +5090,6 @@ "shallow-clone": "^0.1.2" } }, - "clsx": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.0.3.tgz", - "integrity": "sha512-xLoSw6DMp7YvbEeLrQJBcWWRRerdHrU1WHoL1hYJOKUeDpVMRq7pv7NI2JHQbCRAe5ptINNzhdYmtfN6MsdCUw==", - "dev": true - }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -5498,13 +5435,13 @@ "dependencies": { "node-fetch": { "version": "2.1.2", - "resolved": "http://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz", "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=", "dev": true }, "whatwg-fetch": { "version": "2.0.4", - "resolved": "http://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==", "dev": true } @@ -5547,15 +5484,6 @@ "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz", "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=" }, - "css-box-model": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/css-box-model/-/css-box-model-1.1.1.tgz", - "integrity": "sha512-ZxbuLFeAPEDb0wPbGfT7783Vb00MVAkvOlMKwr0kA2PD5EGxk6P3MAhedvVuyVJCWb54bb+6HQ7pdPYENf8AZw==", - "dev": true, - "requires": { - "tiny-invariant": "^1.0.3" - } - }, "css-color-names": { "version": "0.0.4", "resolved": "http://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", @@ -5890,12 +5818,6 @@ "whatwg-url": "^7.0.0" } }, - "date-fns": { - "version": "2.0.0-alpha.27", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.0.0-alpha.27.tgz", - "integrity": "sha512-cqfVLS+346P/Mpj2RpDrBv0P4p2zZhWWvfY5fuWrXNR/K38HaAGEkeOwb47hIpQP9Jr/TIxjZ2/sNMQwdXuGMg==", - "dev": true - }, "date-now": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", @@ -6868,7 +6790,7 @@ }, "load-json-file": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { @@ -7763,12 +7685,6 @@ "schema-utils": "^1.0.0" } }, - "filefy": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/filefy/-/filefy-0.1.9.tgz", - "integrity": "sha512-M+9HcR+Hu0LTh5qYTHRnmA2dm+WBHCG6WU+Biw/84RamiV41DzEArSLockUQ0qCSV1fJI0BoCpnniVG/Ch5tMw==", - "dev": true - }, "filename-regex": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", @@ -9830,7 +9746,7 @@ }, "html-webpack-plugin": { "version": "3.2.0", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", + "resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=", "dev": true, "requires": { @@ -12688,49 +12604,6 @@ "object-visit": "^1.0.0" } }, - "material-table": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/material-table/-/material-table-1.24.0.tgz", - "integrity": "sha512-TwG+pyRrbisMNGhicvdSkdR5fh/nVo6Oeb8wLw763AhGFQeS0wzw+q74uCbrQJm+JOwnWYEfz9goTe3DQKqw8w==", - "dev": true, - "requires": { - "@date-io/date-fns": "^1.1.0", - "@material-ui/core": "^3.9.2", - "classnames": "^2.2.6", - "date-fns": "^2.0.0-alpha.27", - "debounce": "^1.2.0", - "filefy": "0.1.9", - "material-ui-pickers": "2.2.4", - "prop-types": "^15.6.2", - "react-beautiful-dnd": "10.0.4", - "react-double-scrollbar": "0.0.15" - }, - "dependencies": { - "material-ui-pickers": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/material-ui-pickers/-/material-ui-pickers-2.2.4.tgz", - "integrity": "sha512-QCQh08Ylmnt+o4laW+rPs92QRAcESv3sPXl50YadLm++rAZAXAOh3K8lreGdynCMYFgZfdyu81Oz9xzTlAZNfw==", - "dev": true, - "requires": { - "@types/react-text-mask": "^5.4.3", - "clsx": "^1.0.2", - "react-event-listener": "^0.6.6", - "react-text-mask": "^5.4.3", - "react-transition-group": "^2.5.3", - "tslib": "^1.9.3" - } - }, - "react-text-mask": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/react-text-mask/-/react-text-mask-5.4.3.tgz", - "integrity": "sha1-mR77QpnjDC5sLEbRP2FxaUY+DS0=", - "dev": true, - "requires": { - "prop-types": "^15.5.6" - } - } - } - }, "material-ui-pickers": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/material-ui-pickers/-/material-ui-pickers-1.0.1.tgz", @@ -13373,7 +13246,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -18348,7 +18221,7 @@ }, "acorn-jsx": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "resolved": "http://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", "dev": true, "requires": { @@ -18357,7 +18230,7 @@ "dependencies": { "acorn": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", "dev": true } @@ -18415,7 +18288,7 @@ }, "eslint": { "version": "4.19.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", + "resolved": "http://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", "dev": true, "requires": { @@ -18461,7 +18334,7 @@ }, "espree": { "version": "3.5.4", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz", + "resolved": "http://registry.npmjs.org/espree/-/espree-3.5.4.tgz", "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", "dev": true, "requires": { @@ -18471,7 +18344,7 @@ }, "external-editor": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", + "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", "dev": true, "requires": { @@ -18599,7 +18472,7 @@ }, "regexpp": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz", "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==", "dev": true }, @@ -18843,12 +18716,6 @@ "performance-now": "^2.1.0" } }, - "raf-schd": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.0.tgz", - "integrity": "sha512-m7zq0JkIrECzw9mO5Zcq6jN4KayE34yoIS9hJoiZNXyOAT06PPA8PrR+WtJIeFW09YjUfNkMMN9lrmAt6BURCA==", - "dev": true - }, "randomatic": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", @@ -18968,6 +18835,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", @@ -19007,30 +18883,6 @@ } } }, - "react-beautiful-dnd": { - "version": "10.0.4", - "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-10.0.4.tgz", - "integrity": "sha512-j2Ra/mW48tXz1Mk6bNBuiENpRBt8wQcPbJgHSswmLDonUE8JPwVikaONoMavdowoMKQJoOJ9IwPTo82d/8aKKg==", - "dev": true, - "requires": { - "@babel/runtime-corejs2": "^7.3.0", - "css-box-model": "^1.1.1", - "memoize-one": "^5.0.0", - "prop-types": "^15.6.1", - "raf-schd": "^4.0.0", - "react-redux": "^5.0.7", - "redux": "^4.0.1", - "tiny-invariant": "^1.0.3" - }, - "dependencies": { - "memoize-one": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.0.0.tgz", - "integrity": "sha512-7g0+ejkOaI9w5x6LvQwmj68kUj6rxROywPSCqmclG/HBacmFnZqhVscQ8kovkn9FBCNJmOz6SY42+jnvZzDWdw==", - "dev": true - } - } - }, "react-d3-tree": { "version": "1.12.2", "resolved": "https://registry.npmjs.org/react-d3-tree/-/react-d3-tree-1.12.2.tgz", @@ -19189,12 +19041,6 @@ "scheduler": "^0.13.1" } }, - "react-double-scrollbar": { - "version": "0.0.15", - "resolved": "https://registry.npmjs.org/react-double-scrollbar/-/react-double-scrollbar-0.0.15.tgz", - "integrity": "sha1-6RWrjLO5WYdwdfSUNt6/2wQoj+Q=", - "dev": true - }, "react-dropzone": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-5.1.1.tgz", @@ -19479,7 +19325,7 @@ }, "cacache": { "version": "10.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", + "resolved": "http://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "dev": true, "requires": { @@ -22902,12 +22748,6 @@ "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=" }, - "tiny-invariant": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.3.tgz", - "integrity": "sha512-ytQx8T4DL8PjlX53yYzcIC0WhIZbpR0p1qcYjw2pHu3w6UtgWwFJQ/02cnhOnBBhlFx/edUIfcagCaQSe3KMWg==", - "dev": true - }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -23053,9 +22893,9 @@ "dev": true }, "ts-invariant": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.3.2.tgz", - "integrity": "sha512-QsY8BCaRnHiB5T6iE4DPlJMAKEG3gzMiUco9FEt1jUXQf0XP6zi0idT0i0rMTu8A326JqNSDsmlkA9dRSh1TRg==", + "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" @@ -24729,7 +24569,7 @@ }, "xmlbuilder": { "version": "9.0.7", - "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", "dev": true }, diff --git a/client/package.json b/client/package.json index 631bbf844..bab074396 100644 --- a/client/package.json +++ b/client/package.json @@ -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", diff --git a/client/src/App.js b/client/src/App.js index b413ad28c..105c11189 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -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 => } /> + } + /> } diff --git a/client/src/auth/index.js b/client/src/auth/index.js index 2ed00e1b2..8ef99e1ff 100644 --- a/client/src/auth/index.js +++ b/client/src/auth/index.js @@ -32,7 +32,7 @@ const VERIFY_TEAM_INVITE = gql` export const defaultOptions = { oidcConformant: true, autoclose: true, - allowedConnections: ['Username-Password-Authentication'], + allowedConnections: ['Username-Password-Authentication', 'github'], auth: { sso: true, redirectUrl: window.location.origin + '/callback', @@ -49,13 +49,14 @@ export const defaultOptions = { languageDictionary: { title: 'Superalgos Platform' }, - avatar:null + avatar: null, + mustAcceptTerms: true } export const inviteOptions = { oidcConformant: true, autoclose: false, - allowedConnections: ['Username-Password-Authentication'], + allowedConnections: ['Username-Password-Authentication', 'github'], allowShowPassword: true, auth: { sso: false, @@ -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( diff --git a/client/src/views/layout/header/imports.js b/client/src/views/layout/header/imports.js index dda190aea..ec03f89f5 100644 --- a/client/src/views/layout/header/imports.js +++ b/client/src/views/layout/header/imports.js @@ -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