From d5b062a87a430dc1651b3fdcbbd7efe446679c66 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 9 Nov 2018 17:45:09 +0100 Subject: [PATCH 001/139] updating packages version --- client/package-lock.json | 90 ++++++++++++++++++++-------------------- client/package.json | 6 +-- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 0dbd8d1b6..f4b06401a 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@advancedalgos/events-client": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/@advancedalgos/events-client/-/events-client-0.0.2.tgz", - "integrity": "sha512-VtM158wFdArNrjYGMnB6XCn9Bo0ziBGU3Qy1+1w81zCDLeF+bGJdBtUnGPjz7nMcZnJDkCjryst/7RIM6NxPgQ==", + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/@advancedalgos/events-client/-/events-client-0.0.3.tgz", + "integrity": "sha512-f586U8Uf8HQr0cgB7Rtte7hPRCJO/RXHHBBQcZ9o1yapHdgrd+SF/LvhDbw53lXgz9mdPNeWKLhk1cbXyoRoEg==", "dev": true, "requires": { "@material-ui/core": "^3.2.0", @@ -44,9 +44,9 @@ } }, "@advancedalgos/teams-client": { - "version": "0.0.24", - "resolved": "https://registry.npmjs.org/@advancedalgos/teams-client/-/teams-client-0.0.24.tgz", - "integrity": "sha512-xJV3GgJRHgjVJeSDGBeR2YjBN5KYczLMYJr0ry/i41a9W2MEilyxeA50j69H+r0zFM5jzr6GwSJp9x+mAnUSyw==", + "version": "0.0.26", + "resolved": "https://registry.npmjs.org/@advancedalgos/teams-client/-/teams-client-0.0.26.tgz", + "integrity": "sha512-7WgJ3OFDZql2h7A1AlAGq7PevfhNs9KL2hnd1oBNyjKSezsJ4j6JUIQt/GTl+0W19S22EHUjUhUVpnnCi8g0mg==", "dev": true, "requires": { "@advancedalgos/web-components": "0.0.13", @@ -70,18 +70,18 @@ "minilog": "^3.1.0", "prop-types": "^15.6.2", "query-string": "^6.2.0", - "react": "^16.5.2", + "react": "^16.6.1", "react-apollo": "^2.2.4", - "react-dom": "^16.5.2", + "react-dom": "^16.6.1", "react-router-dom": "^4.3.1", "recompose": "^0.30.0", "subscriptions-transport-ws": "^0.9.15" } }, "@advancedalgos/users-client": { - "version": "0.0.18", - "resolved": "https://registry.npmjs.org/@advancedalgos/users-client/-/users-client-0.0.18.tgz", - "integrity": "sha512-uxHVl8hOyMeAbKdyP+Jt7BmX4Gw/gE4Wm2lWvgxQxLjf6lZxwMfrQPaGZgfv/qxEkbaK0rkJzCMVT71LRyMhFg==", + "version": "0.0.19", + "resolved": "https://registry.npmjs.org/@advancedalgos/users-client/-/users-client-0.0.19.tgz", + "integrity": "sha512-quYzZvQVIN4UFQFPIvt21Dko7mRdRpRbQXxRdvithoIB5ej/NNamwJAIZJ0ILXRkEQiuEfAi/f4DEmAKOShVGA==", "dev": true, "requires": { "@material-ui/core": "^3.2.0", @@ -90,9 +90,9 @@ "graphql": "^14.0.2", "graphql-tag": "^2.10.0", "prop-types": "^15.6.2", - "react": "^16.5.2", + "react": "^16.6.1", "react-apollo": "^2.2.4", - "react-dom": "^16.5.2", + "react-dom": "^16.6.1", "react-router-dom": "^4.3.1", "react-scripts": "^2.0.4", "recompose": "^0.30.0" @@ -2269,7 +2269,7 @@ }, "array-equal": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=", "dev": true }, @@ -2729,7 +2729,7 @@ "dependencies": { "jsesc": { "version": "1.3.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", "dev": true }, @@ -4528,7 +4528,7 @@ }, "regjsgen": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", "dev": true }, @@ -4922,7 +4922,7 @@ "dependencies": { "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 } @@ -5101,7 +5101,7 @@ "dependencies": { "domelementtype": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=" } } @@ -5698,7 +5698,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 }, @@ -7839,7 +7839,7 @@ "dependencies": { "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 } @@ -7992,7 +7992,7 @@ }, "fast-deep-equal": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", "dev": true }, @@ -8161,7 +8161,7 @@ }, "hoek": { "version": "4.2.1", - "resolved": "http://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==", "dev": true }, @@ -8260,7 +8260,7 @@ }, "html-webpack-harddisk-plugin": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/html-webpack-harddisk-plugin/-/html-webpack-harddisk-plugin-0.2.0.tgz", + "resolved": "http://registry.npmjs.org/html-webpack-harddisk-plugin/-/html-webpack-harddisk-plugin-0.2.0.tgz", "integrity": "sha1-RlQUpTQhm2nB/YEntYX42GiX+y0=", "dev": true, "requires": { @@ -8299,7 +8299,7 @@ }, "htmlparser2": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz", + "resolved": "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz", "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=", "dev": true, "requires": { @@ -10826,7 +10826,7 @@ }, "media-typer": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", "dev": true }, @@ -15842,7 +15842,7 @@ }, "fast-deep-equal": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", "dev": true }, @@ -16086,7 +16086,7 @@ }, "fast-deep-equal": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", "dev": true }, @@ -16525,14 +16525,14 @@ } }, "react": { - "version": "16.6.0", - "resolved": "https://registry.npmjs.org/react/-/react-16.6.0.tgz", - "integrity": "sha512-zJPnx/jKtuOEXCbQ9BKaxDMxR0001/hzxXwYxG8septeyYGfsgAei6NgfbVgOhbY1WOP2o3VPs/E9HaN+9hV3Q==", + "version": "16.6.1", + "resolved": "https://registry.npmjs.org/react/-/react-16.6.1.tgz", + "integrity": "sha512-OtawJThYlvRgm9BXK+xTL7BIlDx8vv21j+fbQDjRRUyok6y7NyjlweGorielTahLZHYIdKUoK2Dp9ByVWuMqxw==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "scheduler": "^0.10.0" + "scheduler": "^0.11.0" } }, "react-apollo": { @@ -16690,14 +16690,14 @@ } }, "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==", + "version": "16.6.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.6.1.tgz", + "integrity": "sha512-zm+wBuEMGm009Wt1uE4Zw5KcXOW7qC4E/xW/fpJsCsbOco4U/R84u+DzzO/S4SYSdNBcqcaulcp4w3FXl8pImw==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "scheduler": "^0.10.0" + "scheduler": "^0.11.0" } }, "react-dropzone": { @@ -16963,7 +16963,7 @@ }, "cacache": { "version": "10.0.4", - "resolved": "http://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "dev": true, "requires": { @@ -17978,7 +17978,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 }, @@ -18788,7 +18788,7 @@ }, "safe-regex": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { @@ -19287,9 +19287,9 @@ } }, "scheduler": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.10.0.tgz", - "integrity": "sha512-+TSTVTCBAA3h8Anei3haDc1IRwMeDmtI/y/o3iBe3Mjl2vwYF9DtPDt929HyRmV/e7au7CLu8sc4C4W0VOs29w==", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.11.0.tgz", + "integrity": "sha512-MAYbBfmiEHxF0W+c4CxMpEqMYK+rYF584VP/qMKSiHM6lTkBKKYOJaDiSILpJHla6hBOsVd6GucPL46o2Uq3sg==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -20189,7 +20189,7 @@ }, "strip-eof": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, @@ -20362,7 +20362,7 @@ }, "tar": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz", "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", "dev": true, "requires": { @@ -20541,7 +20541,7 @@ }, "topo": { "version": "2.0.2", - "resolved": "http://registry.npmjs.org/topo/-/topo-2.0.2.tgz", + "resolved": "https://registry.npmjs.org/topo/-/topo-2.0.2.tgz", "integrity": "sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI=", "dev": true, "requires": { @@ -22106,7 +22106,7 @@ "dependencies": { "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 } diff --git a/client/package.json b/client/package.json index f2db3866e..673edc55c 100644 --- a/client/package.json +++ b/client/package.json @@ -21,10 +21,10 @@ }, "homepage": "https://github.com/Algoteers/MasterApp#readme", "devDependencies": { - "@advancedalgos/events-client": "0.0.2", + "@advancedalgos/events-client": "^0.0.3", "@advancedalgos/key-vault-client": "^0.0.20", - "@advancedalgos/teams-client": "0.0.25", - "@advancedalgos/users-client": "^0.0.18", + "@advancedalgos/teams-client": "^0.0.26", + "@advancedalgos/users-client": "^0.0.19", "@advancedalgos/web-components": "0.0.13", "@babel/core": "^7.1.2", "@babel/plugin-proposal-class-properties": "^7.1.0", From 8450e33bef88f6ae020c67fccc2a15319dde4ee0 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 9 Nov 2018 17:45:15 +0100 Subject: [PATCH 002/139] centering topbar banner --- client/src/styles/styles.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/styles/styles.scss b/client/src/styles/styles.scss index 2934fe72d..a257fd6ca 100644 --- a/client/src/styles/styles.scss +++ b/client/src/styles/styles.scss @@ -326,6 +326,7 @@ header.menu{ } .bannerTopBar{ + background-position: center center; background-image: url(https://advancedalgos.net/img/photos/teams.jpg); width: 100%; height: 220px; From 366cb2bf2e977121fbd0d9fec62292232cd9ddaf Mon Sep 17 00:00:00 2001 From: Barry Low Date: Fri, 9 Nov 2018 08:50:50 -0800 Subject: [PATCH 003/139] Add copyright to footer --- client/src/views/layout/footer/index.js | 1 + client/src/views/layout/footer/styles.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/client/src/views/layout/footer/index.js b/client/src/views/layout/footer/index.js index 23006ca4c..7be97c6c3 100644 --- a/client/src/views/layout/footer/index.js +++ b/client/src/views/layout/footer/index.js @@ -43,6 +43,7 @@ class Footer extends Component { Privacy Statement | Terms of Service + © Advanced Algos, Ltd. 2018 | All Rights Reserved. diff --git a/client/src/views/layout/footer/styles.js b/client/src/views/layout/footer/styles.js index bfe901139..4eac95289 100644 --- a/client/src/views/layout/footer/styles.js +++ b/client/src/views/layout/footer/styles.js @@ -10,6 +10,9 @@ const styles = theme => ({ textSuccess: { color: lightGreen[400] }, + copyright: { + paddingTop: theme.spacing.unit * 3 + }, linkLight: { color: theme.palette.secondary.main, textDecoration: 'none' From 94c1a8bb5a8fe2e00b47a36e914f1e1dce8636bd Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 9 Nov 2018 17:59:09 +0100 Subject: [PATCH 004/139] updating modules versions --- client/package-lock.json | 18 ++++++++++-------- client/package.json | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index f4b06401a..2525c6b33 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@advancedalgos/events-client": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/@advancedalgos/events-client/-/events-client-0.0.3.tgz", - "integrity": "sha512-f586U8Uf8HQr0cgB7Rtte7hPRCJO/RXHHBBQcZ9o1yapHdgrd+SF/LvhDbw53lXgz9mdPNeWKLhk1cbXyoRoEg==", + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/@advancedalgos/events-client/-/events-client-0.0.4.tgz", + "integrity": "sha512-8kwr6IB7AaoZzhLzeGZFTLowTxetOWOwSX4vb0YJQZBA1FJ/CQSU7ARD3WPdyTQAWOOSrquddC6SzLgg11MuiA==", "dev": true, "requires": { "@material-ui/core": "^3.2.0", @@ -26,9 +26,9 @@ } }, "@advancedalgos/key-vault-client": { - "version": "0.0.20", - "resolved": "https://registry.npmjs.org/@advancedalgos/key-vault-client/-/key-vault-client-0.0.20.tgz", - "integrity": "sha512-YCzmzmEK2jOSDl0o9bT+2vYefbq1gXSlQDnQR5ZBVxWoachK+02yLDXRD5LNdu77962aR7auX+pReJ9wy7BT5A==", + "version": "0.0.21", + "resolved": "https://registry.npmjs.org/@advancedalgos/key-vault-client/-/key-vault-client-0.0.21.tgz", + "integrity": "sha512-qLuWI/mcHO8UuebUtHQM4U0uTWOcpIpmo7nhNzue6/al0hHH0NYziqmPET5N0dKjtImX9pTr3uj802GyMfAI0A==", "dev": true, "requires": { "@material-ui/core": "^3.2.2", @@ -37,9 +37,11 @@ "classnames": "^2.2.6", "graphql": "^14.0.2", "graphql-tag": "^2.10.0", - "react": "^16.5.2", + "luxon": "^1.4.4", + "material-ui-pickers": "^1.0.1", + "react": "^16.6.1", "react-apollo": "^2.2.4", - "react-dom": "^16.5.2", + "react-dom": "^16.6.1", "react-router-dom": "^4.3.1" } }, diff --git a/client/package.json b/client/package.json index 673edc55c..ba2b863e8 100644 --- a/client/package.json +++ b/client/package.json @@ -21,8 +21,8 @@ }, "homepage": "https://github.com/Algoteers/MasterApp#readme", "devDependencies": { - "@advancedalgos/events-client": "^0.0.3", - "@advancedalgos/key-vault-client": "^0.0.20", + "@advancedalgos/events-client": "^0.0.4", + "@advancedalgos/key-vault-client": "^0.0.21", "@advancedalgos/teams-client": "^0.0.26", "@advancedalgos/users-client": "^0.0.19", "@advancedalgos/web-components": "0.0.13", From 4ea49076a5459cd733625e8424886b9268e31c23 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 9 Nov 2018 18:13:37 +0100 Subject: [PATCH 005/139] Image size at chart --- client/src/views/charts/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/views/charts/index.js b/client/src/views/charts/index.js index 8bffc4f5c..7ef41532f 100644 --- a/client/src/views/charts/index.js +++ b/client/src/views/charts/index.js @@ -41,9 +41,9 @@ class Charts extends Component { render () { return ( ) From c4528d67c389d1bb404faf1329ca12caa0c99436 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 9 Nov 2018 18:21:47 +0100 Subject: [PATCH 006/139] authentificated only links --- client/src/views/layout/header/imports.js | 17 ++++++++--------- client/src/views/layout/header/index.js | 10 ++++++++-- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/client/src/views/layout/header/imports.js b/client/src/views/layout/header/imports.js index 269e2ada2..df03073b2 100644 --- a/client/src/views/layout/header/imports.js +++ b/client/src/views/layout/header/imports.js @@ -3,7 +3,6 @@ import { GamepadRounded, AccessibilityNew, LibraryAdd, - Home, ImportContacts, BugReport, People @@ -13,11 +12,10 @@ const usersMenus = { title: 'Users', to: '/users', submenus: [ - { title: 'Home', to: '/users/', icon: Home }, { title: 'Directory', to: '/users/browse', icon: ImportContacts }, { title: 'Search', to: '/users/search', icon: Search }, { title: 'Report', to: 'https://github.com/AdvancedAlgos/UsersModule/issues/new', icon: BugReport, externalLink: true }, - { title: 'Your Profile', to: '/users/user', icon: People } + { title: 'Your Profile', to: '/users/user', icon: People, authenticated: true } ] } @@ -26,9 +24,9 @@ const teamsMenus = { to: '/teams', submenus: [ { title: 'All teams', to: '/teams', icon: Search }, - { title: 'Your teams', to: '/teams/manage-teams', icon: GamepadRounded }, - { title: 'Team members', to: '/teams/team-members', icon: GamepadRounded }, - { title: 'Financial beings', to: '/teams/financial-beings', icon: GamepadRounded }, + { title: 'Your teams', to: '/teams/manage-teams', icon: GamepadRounded, authenticated: true }, + { title: 'Team members', to: '/teams/team-members', icon: GamepadRounded, authenticated: true }, + { title: 'Financial beings', to: '/teams/financial-beings', icon: GamepadRounded, authenticated: true }, { title: 'Report', to: 'https://github.com/AdvancedAlgos/TeamsModule/issues/new', icon: LibraryAdd, externalLink: true } ] } @@ -38,9 +36,9 @@ const eventsMenus = { to: '/events', submenus: [ { title: 'All events', to: '/events', icon: Search }, - { title: 'Your events', to: '/events/my', icon: GamepadRounded }, - { title: 'Your hosted events', to: '/events/host', icon: AccessibilityNew }, - { title: 'Host an event', to: '/events/create', icon: LibraryAdd }, + { title: 'Your events', to: '/events/my', icon: GamepadRounded, authenticated: true }, + { title: 'Your hosted events', to: '/events/host', icon: AccessibilityNew, authenticated: true }, + { title: 'Host an event', to: '/events/create', icon: LibraryAdd, authenticated: true }, { title: 'Report', to: 'https://github.com/AdvancedAlgos/UsersModule/issues/new', icon: LibraryAdd, externalLink: true } ] } @@ -48,6 +46,7 @@ const eventsMenus = { const keyvaultMenus = { title: 'Key Vault', to: '/key-vault', + authenticated: true, submenus: [ { title: 'Manage keys', to: '/key-vault/browse', icon: Search }, { title: 'Add key', to: '/key-vault/addKey', icon: GamepadRounded }, diff --git a/client/src/views/layout/header/index.js b/client/src/views/layout/header/index.js index 5fb90adbb..1cabf7ceb 100644 --- a/client/src/views/layout/header/index.js +++ b/client/src/views/layout/header/index.js @@ -75,7 +75,10 @@ class Header extends Component { } let user = JSON.parse(this.state.user) - const menus = allMenus.map(({ to, title, submenus }, index) => { + const menus = allMenus.map(({ to, title, submenus, authenticated }, index) => { + if (authenticated) { + return + } return (
  • this.toggleMenuOpen(index, bigScreen)} @@ -86,7 +89,10 @@ class Header extends Component { this.toggleMenuOpen(index, true)}> {title}