diff --git a/client/html/index.html b/client/html/index.html index 5d7ced121..e637b9577 100644 --- a/client/html/index.html +++ b/client/html/index.html @@ -10,8 +10,26 @@ + + + + - -
+ + +
+
+ diff --git a/client/package-lock.json b/client/package-lock.json index d3c6d98f4..c1b9c6a13 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -5,32 +5,21 @@ "requires": true, "dependencies": { "@advancedalgos/key-vault-client": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/@advancedalgos/key-vault-client/-/key-vault-client-0.0.7.tgz", - "integrity": "sha512-yG5NN8zHqqaThKeNQ0ECvTOlDBlxAZPr1H055IBuSIUIYrrVjVQTxoQPzEfl9hhKDSB+9oZuWfNJVnAKOA676g==", + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/@advancedalgos/key-vault-client/-/key-vault-client-0.0.9.tgz", + "integrity": "sha512-MSEI63lyw6uFk5cuyu62W0Pra5sI+FZYmKOGeUNvBC0fAF3MJQh/RO6pnnpVv+0yIPMeVBhsPD0O+2iRxFYjUg==", "dev": true, "requires": { - "@material-ui/core": "3.2.0", + "@material-ui/core": "3.2.2", "@material-ui/icons": "3.0.1", - "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", - "auth0-lock": "11.10.0", "classnames": "2.2.6", "graphql": "14.0.2", "graphql-tag": "2.10.0", - "prop-types": "15.6.2", "react": "16.5.2", "react-apollo": "2.2.4", "react-dom": "16.5.2", - "react-hot-loader": "4.3.11", - "react-router": "4.3.1", - "react-router-dom": "4.3.1", - "react-scripts": "2.0.4", - "recompose": "0.30.0" + "react-router-dom": "4.3.1" } }, "@advancedalgos/teams-client": { @@ -41,7 +30,7 @@ "requires": { "@advancedalgos/web-components": "0.0.10", "@azure/storage-blob": "10.0.0-preview", - "@material-ui/core": "3.2.0", + "@material-ui/core": "3.2.2", "@material-ui/icons": "3.0.1", "apollo-cache-inmemory": "1.3.5", "apollo-client": "2.4.2", @@ -122,31 +111,20 @@ } }, "@advancedalgos/users-client": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/@advancedalgos/users-client/-/users-client-0.0.8.tgz", - "integrity": "sha512-k3rJNSel2/pMYFQlZ1AP+g7oK3AD+KrbU6id6NSQdoH6ZnqQQybwCJtOClLYFYRJR4TKVLxaaPs/WExw3s78wQ==", + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/@advancedalgos/users-client/-/users-client-0.0.11.tgz", + "integrity": "sha512-ZmcPJBY96UnAAws3MXQhm7I6mOYzNmdQ4Eh9dbM4UDdYPvZ9CRMQYxtpTDEqyWf+KPDYUGsuvpCh39jbhxc0Fw==", "dev": true, "requires": { - "@material-ui/core": "3.2.0", + "@material-ui/core": "3.2.2", "@material-ui/icons": "3.0.1", - "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", - "auth0-lock": "11.10.0", - "classnames": "2.2.6", - "filestack-js": "1.7.2", - "filestack-react": "2.0.0", "graphql": "14.0.2", "graphql-tag": "2.10.0", "prop-types": "15.6.2", "react": "16.5.2", "react-apollo": "2.2.4", "react-dom": "16.5.2", - "react-hot-loader": "4.3.11", - "react-router": "4.3.1", "react-router-dom": "4.3.1", "react-scripts": "2.0.4", "recompose": "0.30.0" @@ -159,7 +137,7 @@ "dev": true, "requires": { "@azure/storage-blob": "10.1.0-preview", - "@material-ui/core": "3.2.0", + "@material-ui/core": "3.2.2", "@material-ui/icons": "3.0.1", "apollo-client": "2.4.2", "blob-util": "2.0.2", @@ -1090,9 +1068,9 @@ "dev": true }, "@material-ui/core": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.2.0.tgz", - "integrity": "sha512-fThWolLWQoUMV8exLxe9NqfegFFHmV8T7kJBvk3iX47c7TrAw4Vgyvft4CApnQoYIZbrRfPMig5ovYDvmTmMCg==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.2.2.tgz", + "integrity": "sha512-wDTJyR76+OBdlltiPs3lc1gD6zR+dSA6nITtgkBeLf1NvWfNotMWdvldIDnF3bu24ySAX9imfzDfkBu4Edtqww==", "requires": { "@babel/runtime": "7.1.2", "@types/jss": "9.5.6", @@ -1302,9 +1280,9 @@ "dev": true }, "@types/react": { - "version": "16.4.16", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.4.16.tgz", - "integrity": "sha512-lxyoipLWweAnLnSsV4Ho2NAZTKKmxeYgkTQ6PaDiPDU9JJBUY2zJVVGiK1smzYv8+ZgbqEmcm5xM74GCpunSEA==", + "version": "16.4.17", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.4.17.tgz", + "integrity": "sha512-x6js/YqbLIXC9TarM4hP6SEctMrsPgKZBUEgyazwpu8LbYFulnHblu+zAyE+pWWAPKwcvt6QQ8SDDA4JtlNaNA==", "requires": { "@types/prop-types": "15.5.6", "csstype": "2.5.7" @@ -1315,7 +1293,7 @@ "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-2.0.14.tgz", "integrity": "sha512-pa7qB0/mkhwWMBFoXhX8BcntK8G4eQl4sIfSrJCxnivTYRQWjOWf2ClR9bWdm0EUFBDHzMbKYS+QYfDtBzkY4w==", "requires": { - "@types/react": "16.4.16" + "@types/react": "16.4.17" } }, "@types/serve-static": { @@ -1569,12 +1547,6 @@ "integrity": "sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==", "dev": true }, - "abab": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", - "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=", - "dev": true - }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -2193,17 +2165,51 @@ } }, "autoprefixer": { - "version": "9.1.5", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.1.5.tgz", - "integrity": "sha512-kk4Zb6RUc58ld7gdosERHMF3DzIYJc2fp5sX46qEsGXQQy5bXsu8qyLjoxuY1NuQ/cJuCYnx99BfjwnRggrYIw==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.2.0.tgz", + "integrity": "sha512-OuxUyTvzRe9EvKyouPqfr8QUkQ0pH400NOFzI1LFINO8zwgJr7ZTybLql03P//LjR0iWile2lCoy2vRTRSFpMw==", "dev": true, "requires": { - "browserslist": "4.2.0", + "browserslist": "4.2.1", "caniuse-lite": "1.0.30000890", "normalize-range": "0.1.2", "num2fraction": "1.2.2", "postcss": "7.0.5", - "postcss-value-parser": "3.3.0" + "postcss-value-parser": "3.3.1" + }, + "dependencies": { + "browserslist": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.2.1.tgz", + "integrity": "sha512-1oO0c7Zhejwd+LXihS89WqtKionSbz298rJZKJgfrHIZhrV8AC15gw553VcB0lcEugja7IhWD7iAlrsamfYVPA==", + "dev": true, + "requires": { + "caniuse-lite": "1.0.30000890", + "electron-to-chromium": "1.3.79", + "node-releases": "1.0.0-alpha.14" + } + }, + "electron-to-chromium": { + "version": "1.3.79", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.79.tgz", + "integrity": "sha512-LQdY3j4PxuUl6xfxiFruTSlCniTrTrzAd8/HfsLEMi0PUpaQ0Iy+Pr4N4VllDYjs0Hyu2lkTbvzqlG+PX9NsNw==", + "dev": true + }, + "node-releases": { + "version": "1.0.0-alpha.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.0.0-alpha.14.tgz", + "integrity": "sha512-G8nnF9cP9QPP/jUmYWw/uUUhumHmkm+X/EarCugYFjYm2uXRMFeOD6CVT3RLdoyCvDUNy51nirGfUItKWs/S1g==", + "dev": true, + "requires": { + "semver": "5.5.1" + } + }, + "postcss-value-parser": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", + "dev": true + } } }, "aws-sign2": { @@ -2905,12 +2911,6 @@ "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, - "bowser": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/bowser/-/bowser-1.9.4.tgz", - "integrity": "sha512-9IdMmj2KjigRq6oWhmwv1W36pDuA4STQZ8q6YO9um+x07xgYNCD3Oou+WP/3L1HNz7iqythGet3/p4wvc8AAwQ==", - "dev": true - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -4703,9 +4703,9 @@ } }, "eslint": { - "version": "5.6.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.6.1.tgz", - "integrity": "sha512-hgrDtGWz368b7Wqf+v1Z69O3ZebNR0+GA7PtDdbmuz4rInFVUV9uw7whjZEiWyLzCjVb5Rs5WRN1TAS6eo7AYA==", + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.7.0.tgz", + "integrity": "sha512-zYCeFQahsxffGl87U2aJ7DPyH8CbWgxBC213Y8+TCanhUTf2gEvfq3EKpHmEcozTLyPmGe9LZdMAwC/CpJBM5A==", "dev": true, "requires": { "@babel/code-frame": "7.0.0", @@ -4744,7 +4744,7 @@ "semver": "5.5.1", "strip-ansi": "4.0.0", "strip-json-comments": "2.0.1", - "table": "4.0.3", + "table": "5.1.0", "text-table": "0.2.0" }, "dependencies": { @@ -4769,15 +4769,6 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, - "debug": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz", - "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==", - "dev": true, - "requires": { - "ms": "2.1.1" - } - }, "doctrine": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", @@ -4873,14 +4864,12 @@ } }, "table": { - "version": "4.0.3", - "resolved": "http://registry.npmjs.org/table/-/table-4.0.3.tgz", - "integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/table/-/table-5.1.0.tgz", + "integrity": "sha512-e542in22ZLhD/fOIuXs/8yDZ9W61ltF8daM88rkRNtgTIct+vI2fTnAyu/Db2TCfEcI8i7mjZz6meLq0nW7TYg==", "dev": true, "requires": { "ajv": "6.5.4", - "ajv-keywords": "3.2.0", - "chalk": "2.4.1", "lodash": "4.17.11", "slice-ansi": "1.0.0", "string-width": "2.1.1" @@ -5744,12 +5733,6 @@ "schema-utils": "1.0.0" } }, - "file-type": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz", - "integrity": "sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==", - "dev": true - }, "filename-regex": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", @@ -5772,37 +5755,6 @@ "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==", "dev": true }, - "filestack-js": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/filestack-js/-/filestack-js-1.7.2.tgz", - "integrity": "sha512-8I+1i2Sm9U+Yb2x/cFsCGvh2RU+XvBZDu0Y9lr5CtiDUVlwKzV9DFCug/N03r9sbkV3lKwn+sxMUhDz9RZjADw==", - "dev": true, - "requires": { - "abab": "1.0.4", - "bowser": "1.9.4", - "file-type": "8.1.0", - "filestack-loader": "3.0.4", - "is-svg": "3.0.0", - "isutf8": "2.0.2", - "mime-types": "2.1.20", - "spark-md5": "3.0.0", - "superagent": "3.8.3", - "tcomb-validation": "3.4.1", - "tslib": "1.9.3" - } - }, - "filestack-loader": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/filestack-loader/-/filestack-loader-3.0.4.tgz", - "integrity": "sha512-b6uOCWHd1gM0+5KBA1rA4qfEgTqyTr5umLM4bBWT4z98WUwxa6KzCiq+z0VnR4rN+NCx6kyZ/wLXjGcPU32TxQ==", - "dev": true - }, - "filestack-react": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/filestack-react/-/filestack-react-2.0.0.tgz", - "integrity": "sha512-+lOqPx2XYsvm3pJutjlDTyG8fdrJAefN0QLi8crJfwI1dJffOjK84dnQJHQ9aQzxF37A1cHI8ZbPscv7w6bRTA==", - "dev": true - }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -8219,12 +8171,6 @@ "handlebars": "4.0.12" } }, - "isutf8": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/isutf8/-/isutf8-2.0.2.tgz", - "integrity": "sha512-9lNbG6k+PE6vuFnPTHjhtX79/LDMQrXoFx1MOEjXXCyqFCSahWKAzuAb9G5ct+lfS12aQxNmC0tiZuyujvr4Uw==", - "dev": true - }, "iterall": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz", @@ -12818,7 +12764,7 @@ "integrity": "sha512-W1Wtqngl7BMe4s9o76odTaVs4HXVLhOHD+L5Ez+7x15yiA+98W/WVO6IPlC1q9BIkgAckRtUFmEDr0sNufXZIQ==", "dev": true, "requires": { - "autoprefixer": "9.1.5", + "autoprefixer": "9.2.0", "browserslist": "4.2.0", "caniuse-lite": "1.0.30000890", "cssdb": "3.2.1", @@ -16019,12 +15965,6 @@ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "dev": true }, - "spark-md5": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.0.tgz", - "integrity": "sha1-NyIifFTi+vJLHcbZM8wUTm9xv+8=", - "dev": true - }, "spdx-correct": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz", @@ -16704,21 +16644,6 @@ "integrity": "sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==", "dev": true }, - "tcomb": { - "version": "3.2.27", - "resolved": "https://registry.npmjs.org/tcomb/-/tcomb-3.2.27.tgz", - "integrity": "sha512-XWdJW7F/M3YzXhDEUP8ycmNWoYymBtsHwCHoda0YF44RthJsls95TqDrmpAlC1sB/KXaCvkdBlcNRq+AaV6klA==", - "dev": true - }, - "tcomb-validation": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/tcomb-validation/-/tcomb-validation-3.4.1.tgz", - "integrity": "sha512-urVVMQOma4RXwiVCa2nM2eqrAomHROHvWPuj6UkDGz/eb5kcy0x6P0dVt6kzpUZtYMNoAqJLWmz1BPtxrtjtrA==", - "dev": true, - "requires": { - "tcomb": "3.2.27" - } - }, "terser": { "version": "3.10.0", "resolved": "https://registry.npmjs.org/terser/-/terser-3.10.0.tgz", diff --git a/client/package.json b/client/package.json index 2e426feb7..79a46f271 100644 --- a/client/package.json +++ b/client/package.json @@ -21,18 +21,18 @@ }, "homepage": "https://github.com/Algoteers/MasterApp#readme", "devDependencies": { - "@advancedalgos/key-vault-client": "^0.0.7", + "@advancedalgos/key-vault-client": "^0.0.9", "@advancedalgos/teams-client": "^0.0.20", - "@advancedalgos/users-client": "^0.0.8", + "@advancedalgos/users-client": "^0.0.11", "@advancedalgos/web-components": "^0.0.10", "@babel/core": "^7.1.2", - "autoprefixer": "^9.1.5", + "autoprefixer": "^9.2.0", "babel-loader": "^8.0.4", "connect-history-api-fallback": "^1.5.0", "css-loader": "^1.0.0", "debug": "^4.1.0", "dotenv-webpack": "^1.5.7", - "eslint": "^5.6.1", + "eslint": "^5.7.0", "eslint-config-standard": "^12.0.0", "eslint-config-standard-react": "^7.0.2", "eslint-plugin-import": "^2.14.0", @@ -61,7 +61,7 @@ ] }, "dependencies": { - "@material-ui/core": "^3.2.0", + "@material-ui/core": "^3.2.2", "@material-ui/icons": "^3.0.1", "apollo-cache-inmemory": "^1.3.5", "apollo-client": "^2.4.2", diff --git a/client/src/assets/advanced-algos/evolution.jpg b/client/src/assets/advanced-algos/evolution.jpg deleted file mode 100644 index 12071e5fd..000000000 Binary files a/client/src/assets/advanced-algos/evolution.jpg and /dev/null differ diff --git a/client/src/views/footer/index.js b/client/src/views/footer/index.js index 9de1f2bb9..bd9442544 100644 --- a/client/src/views/footer/index.js +++ b/client/src/views/footer/index.js @@ -39,107 +39,111 @@ const styles = theme => ({ }) const Footer = ({ classes }) => { - return ( - + ) + } } Footer.propTypes = { diff --git a/client/src/views/home/index.js b/client/src/views/home/index.js index 88827d722..178f3cf3b 100644 --- a/client/src/views/home/index.js +++ b/client/src/views/home/index.js @@ -1,12 +1,10 @@ -import React from 'react' +import React, { Component } from 'react' import PropTypes from 'prop-types' import CssBaseline from '@material-ui/core/CssBaseline' import Typography from '@material-ui/core/Typography' import { withStyles } from '@material-ui/core/styles' -import BackgroundImage from '../../assets/advanced-algos/evolution.jpg' - const styles = theme => ({ '@global': { body: { @@ -14,7 +12,6 @@ const styles = theme => ({ } }, layout: { - backgroundImage: `url(${BackgroundImage})`, width: '100%', height: '100%' }, @@ -27,31 +24,29 @@ const styles = theme => ({ } }) -const Home = ({ classes }) => ( - - -
-
- - Collaborate. Innovate. Evolve. - - - Welcome to Advanced Algos - -
-
-
-) +class Home extends Component { + + componentDidMount () { + window.CANVAS_VISIBLE = true + let body = document.getElementById('body') + body.style = 'margin: 0px; padding: 0px; border: 0px; overflow:hidden;' + window.HIDE_FOOTER = true + } + + componentWillUnmount () { + window.CANVAS_VISIBLE = false + let body = document.getElementById('body') + body.style = '' + window.HIDE_FOOTER = false + } + + render () { + const { classes } = this.props + return ( + + ) + } +} Home.propTypes = { classes: PropTypes.object.isRequired