diff --git a/client/package-lock.json b/client/package-lock.json index b061edbc9..d539e78b3 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -58,9 +58,9 @@ } }, "@advancedalgos/users-client": { - "version": "0.0.12", - "resolved": "https://registry.npmjs.org/@advancedalgos/users-client/-/users-client-0.0.12.tgz", - "integrity": "sha512-GCV54OgowhBukM8a/95zTV2psPKU2MGKIr9vaVqDruAe9YZFm2QbRecAMeUtyOlJLfWxvA/dx6FO4AjmLZhspw==", + "version": "0.0.13", + "resolved": "https://registry.npmjs.org/@advancedalgos/users-client/-/users-client-0.0.13.tgz", + "integrity": "sha512-8nhHHDAPpf4l25FPHYjBREu/StdoQy3OwqinRXh1XOcLtnqCKKk1xI9dwP4iNGVZRC9rPVk2mYV4U0fsXcPxhg==", "dev": true, "requires": { "@material-ui/core": "3.2.2", @@ -5441,7 +5441,7 @@ "requires": { "is-number": "2.1.0", "isobject": "2.1.0", - "randomatic": "3.1.0", + "randomatic": "3.1.1", "repeat-element": "1.1.3", "repeat-string": "1.6.1" } @@ -8060,9 +8060,9 @@ "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" }, "isemail": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.1.4.tgz", - "integrity": "sha512-yE/W5osEWuAGSLVixV9pAexhkbZzglmuhO2CxdHu7IBh7uzuZogQ4bk0lE26HoZ6HD4ZYfKRKilkNuCnuJIBJw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.2.0.tgz", + "integrity": "sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg==", "dev": true, "requires": { "punycode": "2.1.1" @@ -8351,7 +8351,7 @@ "jest-watcher": "23.4.0", "jest-worker": "23.2.0", "micromatch": "2.3.11", - "node-notifier": "5.2.1", + "node-notifier": "5.3.0", "prompts": "0.1.14", "realpath-native": "1.0.2", "rimraf": "2.6.2", @@ -8719,7 +8719,7 @@ }, "jest-get-type": { "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", + "resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==", "dev": true }, @@ -9379,7 +9379,7 @@ "dev": true, "requires": { "hoek": "4.2.1", - "isemail": "3.1.4", + "isemail": "3.2.0", "topo": "2.0.2" } }, @@ -10660,9 +10660,9 @@ } }, "node-notifier": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz", - "integrity": "sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.3.0.tgz", + "integrity": "sha512-AhENzCSGZnZJgBARsUjnQ7DnZbzyP+HxlVXuD0xqAnvL8q+OqtSX7lGg9e8nHzwXkMMXNdVeqq4E2M3EUAqX6Q==", "dev": true, "requires": { "growly": "1.3.0", @@ -14385,9 +14385,9 @@ } }, "postcss-custom-media": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.6.tgz", - "integrity": "sha512-Txk5Ve0XWw105N6490xoq1aAHkLWIBGowBxHrLqbfsPfv/nzPvP2txyPMwn6OW87eeTO7H0a7P/BVJ4WMPEgJA==", + "version": "7.0.7", + "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.7.tgz", + "integrity": "sha512-bWPCdZKdH60wKOTG4HKEgxWnZVjAIVNOJDvi3lkuTa90xo/K0YHa2ZnlKLC5e2qF8qCcMQXt0yzQITBp8d0OFA==", "dev": true, "requires": { "postcss": "7.0.5" @@ -15291,7 +15291,7 @@ "postcss-color-hex-alpha": "5.0.2", "postcss-color-mod-function": "3.0.3", "postcss-color-rebeccapurple": "4.0.1", - "postcss-custom-media": "7.0.6", + "postcss-custom-media": "7.0.7", "postcss-custom-properties": "8.0.8", "postcss-custom-selectors": "5.1.2", "postcss-dir-pseudo-class": "5.0.0", @@ -16180,9 +16180,9 @@ } }, "randomatic": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.0.tgz", - "integrity": "sha512-KnGPVE0lo2WoXxIZ7cPR8YBpiol4gsSuOwDSg410oHh80ZMp5EiypNqL2K4Z77vJn6lB5rap7IkAmcUlalcnBQ==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", + "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==", "dev": true, "requires": { "is-number": "4.0.0", @@ -17373,7 +17373,7 @@ }, "pify": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, @@ -19217,9 +19217,9 @@ "dev": true }, "terser": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-3.10.1.tgz", - "integrity": "sha512-GE0ShECt1/dZUZt9Kyr/IC6xXG46pTbm1C1WfzQbbnRB5LhdJlF8p5NBZ38RjspD7hEM9O5ud8aIcOFY6evl4A==", + "version": "3.10.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.10.2.tgz", + "integrity": "sha512-+QrFoqBImmsQGB4c/HvaqgZynmbNvNBwoBxuu7fYXtq5EEtlLUzph+WimDj+xMkuqawXPMl2lgCIz81CdXvt+w==", "dev": true, "requires": { "commander": "2.17.1", @@ -19256,7 +19256,7 @@ "schema-utils": "1.0.0", "serialize-javascript": "1.5.0", "source-map": "0.6.1", - "terser": "3.10.1", + "terser": "3.10.2", "webpack-sources": "1.3.0", "worker-farm": "1.6.0" }, @@ -20634,27 +20634,27 @@ "dev": true }, "workbox-background-sync": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-3.6.2.tgz", - "integrity": "sha512-K34wiTM50gSpzJUuRmGRqbd91IpJj0vwMBSHCpixw/jiTg10uytSfnixMNGzeTK0i7LTd/bkA8ptx4HXP+MliA==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-3.6.3.tgz", + "integrity": "sha512-ypLo0B6dces4gSpaslmDg5wuoUWrHHVJfFWwl1udvSylLdXvnrfhFfriCS42SNEe5lsZtcNZF27W/SMzBlva7Q==", "dev": true, "requires": { - "workbox-core": "3.6.2" + "workbox-core": "3.6.3" } }, "workbox-broadcast-cache-update": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/workbox-broadcast-cache-update/-/workbox-broadcast-cache-update-3.6.2.tgz", - "integrity": "sha512-wmN3k94Kv3/lYOqRy08ymp8RyTPCpgLI9UW/BrQ1XuZHJyFejWnBoy/pCKk9mRZYZX7EyvnzA4O1PLILgLC43g==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/workbox-broadcast-cache-update/-/workbox-broadcast-cache-update-3.6.3.tgz", + "integrity": "sha512-pJl4lbClQcvp0SyTiEw0zLSsVYE1RDlCPtpKnpMjxFtu8lCFTAEuVyzxp9w7GF4/b3P4h5nyQ+q7V9mIR7YzGg==", "dev": true, "requires": { - "workbox-core": "3.6.2" + "workbox-core": "3.6.3" } }, "workbox-build": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-3.6.2.tgz", - "integrity": "sha512-PYw4SRbfbUE/+DDhb89zbspDLBi86hpra+l6SsX7yBqCthw4sHyH8IIQw5MMHI04HPV5ZDYru8A5SNLXVDGMcg==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-3.6.3.tgz", + "integrity": "sha512-w0clZ/pVjL8VXy6GfthefxpEXs0T8uiRuopZSFVQ8ovfbH6c6kUpEh6DcYwm/Y6dyWPiCucdyAZotgjz+nRz8g==", "dev": true, "requires": { "babel-runtime": "6.26.0", @@ -20666,19 +20666,19 @@ "pretty-bytes": "4.0.2", "stringify-object": "3.3.0", "strip-comments": "1.0.2", - "workbox-background-sync": "3.6.2", - "workbox-broadcast-cache-update": "3.6.2", - "workbox-cache-expiration": "3.6.2", - "workbox-cacheable-response": "3.6.2", - "workbox-core": "3.6.2", - "workbox-google-analytics": "3.6.2", - "workbox-navigation-preload": "3.6.2", - "workbox-precaching": "3.6.2", - "workbox-range-requests": "3.6.2", - "workbox-routing": "3.6.2", - "workbox-strategies": "3.6.2", - "workbox-streams": "3.6.2", - "workbox-sw": "3.6.2" + "workbox-background-sync": "3.6.3", + "workbox-broadcast-cache-update": "3.6.3", + "workbox-cache-expiration": "3.6.3", + "workbox-cacheable-response": "3.6.3", + "workbox-core": "3.6.3", + "workbox-google-analytics": "3.6.3", + "workbox-navigation-preload": "3.6.3", + "workbox-precaching": "3.6.3", + "workbox-range-requests": "3.6.3", + "workbox-routing": "3.6.3", + "workbox-strategies": "3.6.3", + "workbox-streams": "3.6.3", + "workbox-sw": "3.6.3" }, "dependencies": { "fs-extra": { @@ -20695,99 +20695,99 @@ } }, "workbox-cache-expiration": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/workbox-cache-expiration/-/workbox-cache-expiration-3.6.2.tgz", - "integrity": "sha512-LJLYfqG7ItYucppun5I92fcN21kDZFEVqZ8uAOz5t8piOsHh1ThAiiLv/4ubG/d7CUgqW/1bmcX6DM4xqackzg==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/workbox-cache-expiration/-/workbox-cache-expiration-3.6.3.tgz", + "integrity": "sha512-+ECNph/6doYx89oopO/UolYdDmQtGUgo8KCgluwBF/RieyA1ZOFKfrSiNjztxOrGJoyBB7raTIOlEEwZ1LaHoA==", "dev": true, "requires": { - "workbox-core": "3.6.2" + "workbox-core": "3.6.3" } }, "workbox-cacheable-response": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-3.6.2.tgz", - "integrity": "sha512-WvICMN3SfEi48C96KEfkLDIqnU0rkQeajdLjYXuzbUID3EX31gzUVlIbqQGrc+9xtIlvxs2+ZoaTR3Rjdtbh/Q==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-3.6.3.tgz", + "integrity": "sha512-QpmbGA9SLcA7fklBLm06C4zFg577Dt8u3QgLM0eMnnbaVv3rhm4vbmDpBkyTqvgK/Ly8MBDQzlXDtUCswQwqqg==", "dev": true, "requires": { - "workbox-core": "3.6.2" + "workbox-core": "3.6.3" } }, "workbox-core": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-3.6.2.tgz", - "integrity": "sha512-5T5WBFy5nMm7zx+P2RwdzEVu5CK++bqwiEsGF+INwUxsOKpH9oXUlUdJE/KfUaMsKcZtHXEb74mMB6vvE88a/w==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-3.6.3.tgz", + "integrity": "sha512-cx9cx0nscPkIWs8Pt98HGrS9/aORuUcSkWjG25GqNWdvD/pSe7/5Oh3BKs0fC+rUshCiyLbxW54q0hA+GqZeSQ==", "dev": true }, "workbox-google-analytics": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-3.6.2.tgz", - "integrity": "sha512-NXBbo9xyHQvkHcvYoZkNJw7DB53dJUnmusKdSPg138A6HGt2ilycwTUuXNDWpkXXp3YHxcslrBMdptolwbzidg==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-3.6.3.tgz", + "integrity": "sha512-RQBUo/6SXtIaQTRFj4RQZ9e1gAl7D8oS5S+Hi173Kk70/BgJjzPwXpC5A249Jv5YfkCOLMQCeF9A27BiD0b0ig==", "dev": true, "requires": { - "workbox-background-sync": "3.6.2", - "workbox-core": "3.6.2", - "workbox-routing": "3.6.2", - "workbox-strategies": "3.6.2" + "workbox-background-sync": "3.6.3", + "workbox-core": "3.6.3", + "workbox-routing": "3.6.3", + "workbox-strategies": "3.6.3" } }, "workbox-navigation-preload": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-3.6.2.tgz", - "integrity": "sha512-fN/CWSFZiySQH/OEJQsIizAM4ob6IgZVDfWvA58jAwiyI5QziqfFtL/EiHHNvmIa5jTdcoXfuNNv1WUdpRV18A==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-3.6.3.tgz", + "integrity": "sha512-dd26xTX16DUu0i+MhqZK/jQXgfIitu0yATM4jhRXEmpMqQ4MxEeNvl2CgjDMOHBnCVMax+CFZQWwxMx/X/PqCw==", "dev": true, "requires": { - "workbox-core": "3.6.2" + "workbox-core": "3.6.3" } }, "workbox-precaching": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-3.6.2.tgz", - "integrity": "sha512-oQmBfvCzCUfLcwTokfbVhIIcyNS9aF692EhdqAz/SB2e40ehUgcctAUhQOezsedZFqBBnwphJQUhs+hD3mu72A==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-3.6.3.tgz", + "integrity": "sha512-aBqT66BuMFviPTW6IpccZZHzpA8xzvZU2OM1AdhmSlYDXOJyb1+Z6blVD7z2Q8VNtV1UVwQIdImIX+hH3C3PIw==", "dev": true, "requires": { - "workbox-core": "3.6.2" + "workbox-core": "3.6.3" } }, "workbox-range-requests": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-3.6.2.tgz", - "integrity": "sha512-y1MFB97ydbT8PxBiihndLzG66sNIRzL0lkyoeaWPGfaPGWTP8ghMe4SkGqqdiY+E54rhd7lTdb7RZdv3Av1lTg==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-3.6.3.tgz", + "integrity": "sha512-R+yLWQy7D9aRF9yJ3QzwYnGFnGDhMUij4jVBUVtkl67oaVoP1ymZ81AfCmfZro2kpPRI+vmNMfxxW531cqdx8A==", "dev": true, "requires": { - "workbox-core": "3.6.2" + "workbox-core": "3.6.3" } }, "workbox-routing": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-3.6.2.tgz", - "integrity": "sha512-rhoH1AlETUfffJXJSlc0/T5rBB6vatxpD/8IZgxgHByBnYokV+/HxO7It6wBbxIzdO31UrWVroYm0iVa5sO7Jw==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-3.6.3.tgz", + "integrity": "sha512-bX20i95OKXXQovXhFOViOK63HYmXvsIwZXKWbSpVeKToxMrp0G/6LZXnhg82ijj/S5yhKNRf9LeGDzaqxzAwMQ==", "dev": true, "requires": { - "workbox-core": "3.6.2" + "workbox-core": "3.6.3" } }, "workbox-strategies": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-3.6.2.tgz", - "integrity": "sha512-4jAyL3n0Fl1BLB3QDUoUoBTzBsE8FwH0K7He1JvLzFiDtYp1ewcKjDecYCNZyTsFVgaLL7WClEQCOKSBquBfOg==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-3.6.3.tgz", + "integrity": "sha512-Pg5eulqeKet2y8j73Yw6xTgLdElktcWExGkzDVCGqfV9JCvnGuEpz5eVsCIK70+k4oJcBCin9qEg3g3CwEIH3g==", "dev": true, "requires": { - "workbox-core": "3.6.2" + "workbox-core": "3.6.3" } }, "workbox-streams": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-3.6.2.tgz", - "integrity": "sha512-lKTh5fOAf+Qae7GHYXZve40ZXULCf9kxlkrWjTXqGcTh6cxeibuWl6Mnt4aroChNB8jOEbHfGOy0iaG0R159ew==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-3.6.3.tgz", + "integrity": "sha512-rqDuS4duj+3aZUYI1LsrD2t9hHOjwPqnUIfrXSOxSVjVn83W2MisDF2Bj+dFUZv4GalL9xqErcFW++9gH+Z27w==", "dev": true, "requires": { - "workbox-core": "3.6.2" + "workbox-core": "3.6.3" } }, "workbox-sw": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-3.6.2.tgz", - "integrity": "sha512-EwQZaeGB+tEogABMj9FaEDuszaSBQgjAUEqTFiizZWSU8owZrt0BFfi69TMAhILOfWLFh3aASMzQnPMDY7id4w==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-3.6.3.tgz", + "integrity": "sha512-IQOUi+RLhvYCiv80RP23KBW/NTtIvzvjex28B8NW1jOm+iV4VIu3VXKXTA6er5/wjjuhmtB28qEAUqADLAyOSg==", "dev": true }, "workbox-webpack-plugin": { @@ -20798,7 +20798,7 @@ "requires": { "babel-runtime": "6.26.0", "json-stable-stringify": "1.0.1", - "workbox-build": "3.6.2" + "workbox-build": "3.6.3" } }, "worker-farm": { diff --git a/client/src/views/header/index.js b/client/src/views/header/index.js index 07c819807..236d66842 100644 --- a/client/src/views/header/index.js +++ b/client/src/views/header/index.js @@ -7,6 +7,7 @@ import Toolbar from '@material-ui/core/Toolbar' import Typography from '@material-ui/core/Typography' import IconButton from '@material-ui/core/IconButton' import Button from '@material-ui/core/Button' +import classNames from 'classnames' // icons import HomeIcon from '@material-ui/icons/Home' @@ -24,7 +25,6 @@ import AALogo from '../../assets/advanced-algos/aa-logo-dark.svg' const UsersLink = props => const TeamsLink = props => const KeyVaultLink = props => -const DashboardLink = props => const HomeLink = props => const styles = theme => ({ @@ -56,6 +56,9 @@ const styles = theme => ({ display: 'block', maxWidth: 240, maxHeight: 48 + }, + externalLink: { + textDecoration: 'none' } }) @@ -114,18 +117,28 @@ class Header extends Component { + + ) : ( + + )} - + + + {this.state.user !== undefined && this.state.user !== null ? ( + ) : ( )} +