From 6a2a9233ade28840c2511d8bae1f29c3e3a681ac Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 12 Nov 2018 20:48:17 +0100 Subject: [PATCH 01/32] removing useless lines from .gitignore --- .gitignore | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.gitignore b/.gitignore index b7ca75522..d6cff3458 100644 --- a/.gitignore +++ b/.gitignore @@ -12,10 +12,3 @@ npm-debug.log* #Mac specific files .DS_Store -client/package-lock.json -client/package-lock.json -server/package-lock.json -server/package-lock.json -client/package-lock.json -server/package-lock.json -client/package-lock.json From 3947942f3632a1f585459bd0563cdf018e3139aa Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 12 Nov 2018 20:49:36 +0100 Subject: [PATCH 02/32] package-lock wasn't updated for lastest version of the users module --- client/package-lock.json | 60 +++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 2525c6b33..66b1d8d17 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -81,9 +81,9 @@ } }, "@advancedalgos/users-client": { - "version": "0.0.19", - "resolved": "https://registry.npmjs.org/@advancedalgos/users-client/-/users-client-0.0.19.tgz", - "integrity": "sha512-quYzZvQVIN4UFQFPIvt21Dko7mRdRpRbQXxRdvithoIB5ej/NNamwJAIZJ0ILXRkEQiuEfAi/f4DEmAKOShVGA==", + "version": "0.0.21", + "resolved": "https://registry.npmjs.org/@advancedalgos/users-client/-/users-client-0.0.21.tgz", + "integrity": "sha512-u51GZOIVLtE6asigUx+2fOEtEgmikWS5wDUENyd4jyXMGsn5JgFWpD+psonSbWFgFL8FdiKmMrKwpqHyvHVFWQ==", "dev": true, "requires": { "@material-ui/core": "^3.2.0", @@ -2271,7 +2271,7 @@ }, "array-equal": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=", "dev": true }, @@ -2731,7 +2731,7 @@ "dependencies": { "jsesc": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", "dev": true }, @@ -6112,16 +6112,16 @@ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" }, "fast-glob": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.3.tgz", - "integrity": "sha512-NiX+JXjnx43RzvVFwRWfPKo4U+1BrK5pJPsHQdKMlLoFHrrGktXglQhHliSihWAq+m1z6fHk3uwGHrtRbS9vLA==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.4.tgz", + "integrity": "sha512-FjK2nCGI/McyzgNtTESqaWP3trPvHyRyoyY70hxjc3oKPNmDe8taohLZpoVKoUjW85tbU5txaYUZCNtVzygl1g==", "dev": true, "requires": { "@mrmlnc/readdir-enhanced": "^2.2.1", - "@nodelib/fs.stat": "^1.0.1", + "@nodelib/fs.stat": "^1.1.2", "glob-parent": "^3.1.0", "is-glob": "^4.0.0", - "merge2": "^1.2.1", + "merge2": "^1.2.3", "micromatch": "^3.1.10" }, "dependencies": { @@ -7136,12 +7136,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7156,17 +7158,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -7283,7 +7288,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -7295,6 +7301,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7309,6 +7316,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7316,12 +7324,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -7340,6 +7350,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7420,7 +7431,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -7432,6 +7444,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -7553,6 +7566,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -8163,7 +8177,7 @@ }, "hoek": { "version": "4.2.1", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", + "resolved": "http://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==", "dev": true }, @@ -14299,9 +14313,9 @@ } }, "object-hash": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.0.tgz", - "integrity": "sha512-05KzQ70lSeGSrZJQXE5wNDiTkBJDlUT/myi6RX9dVIvz7a7Qh4oH93BQdiPMn27nldYvVQCKMUaM83AfizZlsQ==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz", + "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==", "dev": true }, "object-keys": { @@ -16965,7 +16979,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": { @@ -20543,7 +20557,7 @@ }, "topo": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/topo/-/topo-2.0.2.tgz", + "resolved": "http://registry.npmjs.org/topo/-/topo-2.0.2.tgz", "integrity": "sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI=", "dev": true, "requires": { From 7708f40d23a8f636b44360c4f78172ac2165037f Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 12 Nov 2018 22:21:38 +0100 Subject: [PATCH 03/32] changing breakpoints and adapting css in order to align with bootstrap --- client/src/styles/index.js | 9 ++++ client/src/styles/styles.scss | 91 ++++++++++++++++++----------------- 2 files changed, 57 insertions(+), 43 deletions(-) diff --git a/client/src/styles/index.js b/client/src/styles/index.js index 272bbcf66..f039c7dca 100644 --- a/client/src/styles/index.js +++ b/client/src/styles/index.js @@ -1,6 +1,15 @@ import { createMuiTheme } from '@material-ui/core/styles' export const theme = createMuiTheme({ + breakpoints: { + values: { + xs: 0, + sm: 768, + md: 992, + lg: 1200, + xl: 1920 + } + }, palette: { primary: { main: '#303036', diff --git a/client/src/styles/styles.scss b/client/src/styles/styles.scss index 55ee88646..a1aee330a 100644 --- a/client/src/styles/styles.scss +++ b/client/src/styles/styles.scss @@ -1,15 +1,15 @@ -$break-big: 1280px; -$break-middle: 992px; -$break-small: 768px; -$break-extra-small: 532px; +$break-lg: 1200px; +$break-md: 992px; +$break-sm: 768px; +$break-xs: 540px; -$height-large-device: 131px; -$height-small-device: 220px; +$height-nav-bar: 131px; $height-not-top: 87px; $image-height-big: 75px; $image-height-small: 45px; +$image-height-xsmall: 35px; $text-height: 25px; @@ -65,6 +65,23 @@ body{ } } +.container{ + padding: 70px 15px 70px 15px; + margin-left: auto; + margin-right: auto; + + width: 100%; + @media screen and (min-width: $break-sm) { + width: 768px; + } + @media screen and (min-width: $break-md) { + width: 970px; + } + @media screen and (min-width: $break-lg) { + width: 1170px; + } +} + header.menu{ transition: $transition-time; &.notOnTop{ @@ -82,7 +99,7 @@ header.menu{ margin-bottom: ( $height-not-top - $mobile-handle-height ) / 2 ; } nav.links{ - @media screen and (min-width: $break-big) { + @media screen and (min-width: $break-lg) { ul.primaryMenu{ li.primaryLink{ padding-top: ( $height-not-top - $text-height ) / 2; @@ -94,36 +111,23 @@ header.menu{ } } position: fixed; - height: $height-large-device; + height: $height-nav-bar; width: 100vw; z-index: 125; - @media screen and (max-width: $break-extra-small) { - height: $height-small-device; - } .container{ + padding-top: 0px; + padding-bottom: 0px; height: 100%; border-bottom: 1px solid rgba(142, 144, 146, 0.3); - - width: 100%; - @media screen and (min-width: $break-small) { - width: 750px; - } - @media screen and (min-width: $break-middle) { - width: 970px; - } - @media screen and (min-width: $break-big) { - width: 1270px; - } - - padding-left: 15px; - padding-right: 15px; - margin-left: auto; - margin-right: auto; img.logo{ transition: $transition-time; - margin-top: ( $height-large-device - $image-height-big ) / 2 ; + margin-top: ( $height-nav-bar - $image-height-big ) / 2 ; height: $image-height-big; + @media screen and (max-width: $break-xs) { + height: $image-height-xsmall; + margin-top: ( $height-nav-bar - $image-height-xsmall ) / 2 ; + } } .mobileHandle.openedMobile{ &:before{ @@ -169,21 +173,21 @@ header.menu{ float: right; width: auto; clear: none; - margin-top: ( $height-large-device - $mobile-handle-height ) / 2 ; - margin-bottom: ( $height-large-device - $mobile-handle-height ) / 2 ; - margin-left: 0; + margin-top: ( $height-nav-bar - $mobile-handle-height ) / 2 ; + margin-bottom: ( $height-nav-bar - $mobile-handle-height ) / 2 ; + margin-left: 0 !important; margin-right: 20px; margin: 41px 0 42px 20px; padding: 0 18px 0 40px; position: relative; text-decoration: none; border-radius: 31px; - @media screen and (min-width: $break-big) { + @media screen and (min-width: $break-lg) { display: none; } } nav.links{ - @media screen and (max-width: $break-big - 1) { + @media screen and (max-width: $break-lg - 1) { display: none; &.openedMobile{ display: block; @@ -245,7 +249,7 @@ header.menu{ } } } - @media screen and (min-width: $break-big) { + @media screen and (min-width: $break-lg) { display: block; float: right; ul.primaryMenu{ @@ -262,10 +266,10 @@ header.menu{ display: block; float: left; position: relative; - padding-top: ( $height-large-device - $text-height ) / 2; - padding-bottom: ( $height-large-device - $text-height ) / 2; - padding-right: 21px; - padding-left: 21px; + padding-top: ( $height-nav-bar - $text-height ) / 2; + padding-bottom: ( $height-nav-bar - $text-height ) / 2; + padding-right: 14px; + padding-left: 14px; &.hasChildren{ &:after{ content: ''; @@ -327,6 +331,7 @@ header.menu{ .bannerTopBar{ background-position: center center; + background-size: cover; background-image: url(https://advancedalgos.net/img/photos/teams.jpg); width: 100%; height: 220px; @@ -354,14 +359,14 @@ header.menu{ font-size: 64px; line-height: 78px; font-weight: 100; - @include fluid-type($break-extra-small, $break-big, 26px, 64px); + @include fluid-type($break-xs, $break-lg, 26px, 64px); } .text{ color: white; line-height: 30px; font-weight: 600; padding: 20px 0 0.5em 0; - @include fluid-type($break-extra-small, $break-big, 18px, 20px); + @include fluid-type($break-xs, $break-lg, 18px, 20px); } } } @@ -371,10 +376,10 @@ header.menu{ padding-bottom: 70px; margin-right: auto; margin-left: auto; - @media screen and (min-width: $break-small) { + @media screen and (min-width: $break-sm) { width: 750px; } - @media screen and (min-width: $break-middle) { + @media screen and (min-width: $break-md) { width: 970px; } @media screen and (min-width: 1200px) { @@ -402,7 +407,7 @@ header.menu{ display: inline-block; width: 100%; padding: 10px; - @media screen and (min-width: $break-small) { + @media screen and (min-width: $break-sm) { width: 50%; } p{ From 530a2f002db5d1af4e6602c28b3f0f2062e0e39b Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 13 Nov 2018 02:05:02 +0100 Subject: [PATCH 04/32] Cleaning the scss a bit more (removing useless vars) --- client/src/styles/styles.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/client/src/styles/styles.scss b/client/src/styles/styles.scss index a1aee330a..c7cc9d86c 100644 --- a/client/src/styles/styles.scss +++ b/client/src/styles/styles.scss @@ -9,7 +9,6 @@ $height-not-top: 87px; $image-height-big: 75px; $image-height-small: 45px; -$image-height-xsmall: 35px; $text-height: 25px; @@ -125,8 +124,8 @@ header.menu{ margin-top: ( $height-nav-bar - $image-height-big ) / 2 ; height: $image-height-big; @media screen and (max-width: $break-xs) { - height: $image-height-xsmall; - margin-top: ( $height-nav-bar - $image-height-xsmall ) / 2 ; + height: $image-height-small; + margin-top: ( $height-nav-bar - $image-height-small ) / 2 ; } } .mobileHandle.openedMobile{ From a05f078eb674c05e5290c7c9ba9d486d2b9b647a Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 13 Nov 2018 02:11:11 +0100 Subject: [PATCH 05/32] putting homepage inside a container class --- client/src/styles/styles.scss | 19 +++---------------- client/src/views/home/index.js | 2 +- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/client/src/styles/styles.scss b/client/src/styles/styles.scss index c7cc9d86c..189d2c1a8 100644 --- a/client/src/styles/styles.scss +++ b/client/src/styles/styles.scss @@ -370,30 +370,17 @@ header.menu{ } } -.homePage{ - padding-top: 70px; - padding-bottom: 70px; - margin-right: auto; - margin-left: auto; - @media screen and (min-width: $break-sm) { - width: 750px; - } - @media screen and (min-width: $break-md) { - width: 970px; - } - @media screen and (min-width: 1200px) { - width: 1170px; - } +.homePage.container{ .title{ padding: 0 0 10px 0; - font-size: 45px; + @include fluid-type($break-xs, $break-lg, 24px, 45px); line-height: 55px; padding: 40px 0 0.5em 0; font-weight: 100; } .subtitle{ padding-bottom: 5px; - font-size: 20px; + @include fluid-type($break-xs, $break-lg, 18px, 20px); line-height: 19px; font-weight: 100; text-transform: uppercase; diff --git a/client/src/views/home/index.js b/client/src/views/home/index.js index e078c2107..25d0468d3 100644 --- a/client/src/views/home/index.js +++ b/client/src/views/home/index.js @@ -12,7 +12,7 @@ class Home extends Component { text='Enabling the evolutionary race towards the emergence of superalgos' backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg' /> -
+
Welcome to the Advanced Algos Platform! CO-CREATE >> COMPETE >> EVOLVE
From e5c3f357bd6136e655f12e3029eaf54fbc4e3359 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 13 Nov 2018 03:02:16 +0100 Subject: [PATCH 06/32] adding a "scroll to top" handle to all pages --- client/src/styles/styles.scss | 21 +++++++ client/src/views/layout/header/index.js | 74 ++++++++++++++----------- 2 files changed, 62 insertions(+), 33 deletions(-) diff --git a/client/src/styles/styles.scss b/client/src/styles/styles.scss index 189d2c1a8..847caa58e 100644 --- a/client/src/styles/styles.scss +++ b/client/src/styles/styles.scss @@ -412,5 +412,26 @@ header.menu{ } } } +} +.toTop{ + position: fixed; + height: 40px; + width: 40px; + bottom: 20px; + right: 20px; + z-index: 999; + background-color: #1a1a1a; + border-radius: 100%; + &:after{ + content: ''; + float: right; + border: solid white; + border-width: 0 3px 3px 0; + padding: 3px; + margin-top: 18px; + margin-right: 15px; + transform: rotate(-135deg); + -webkit-transform: rotate(-135deg); + } } diff --git a/client/src/views/layout/header/index.js b/client/src/views/layout/header/index.js index a812d69b8..efdde5007 100644 --- a/client/src/views/layout/header/index.js +++ b/client/src/views/layout/header/index.js @@ -29,6 +29,11 @@ class Header extends Component { } } + scrollToTop () { + document.body.scrollTop = 0 // For Safari + document.documentElement.scrollTop = 0 // For Chrome, Firefox, IE and Opera + } + toggleMobileOpen () { this.setState({ mobileOpen: !this.state.mobileOpen }) } @@ -108,41 +113,44 @@ class Header extends Component { }) return ( -
-
- Advanced Algos -
this.toggleMobileOpen()}> - Menu -
- +
+
+ {onTop ?
:
{ this.scrollToTop() }} />} + ) } } From 4d977218c0713a213894c8dd539832def731c79e Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 13 Nov 2018 03:09:22 +0100 Subject: [PATCH 07/32] correcting handle for chart page --- client/src/styles/styles.scss | 2 +- client/src/views/layout/header/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/styles/styles.scss b/client/src/styles/styles.scss index 847caa58e..24f0c3dd6 100644 --- a/client/src/styles/styles.scss +++ b/client/src/styles/styles.scss @@ -420,7 +420,7 @@ header.menu{ width: 40px; bottom: 20px; right: 20px; - z-index: 999; + z-index: 1; background-color: #1a1a1a; border-radius: 100%; &:after{ diff --git a/client/src/views/layout/header/index.js b/client/src/views/layout/header/index.js index efdde5007..f8b2746a5 100644 --- a/client/src/views/layout/header/index.js +++ b/client/src/views/layout/header/index.js @@ -149,7 +149,7 @@ class Header extends Component {
- {onTop ?
:
{ this.scrollToTop() }} />} + {onTop ? '' :
{ this.scrollToTop() }} />} ) } From f69b8752a6889947cafd9c549f259786eab70153 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 13 Nov 2018 03:32:22 +0100 Subject: [PATCH 08/32] Adding a home button for mobile menu --- client/src/styles/styles.scss | 2 +- client/src/views/layout/header/imports.js | 5 +++++ client/src/views/layout/header/index.js | 17 ++++++++++++----- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/client/src/styles/styles.scss b/client/src/styles/styles.scss index 24f0c3dd6..b09fabb19 100644 --- a/client/src/styles/styles.scss +++ b/client/src/styles/styles.scss @@ -212,7 +212,7 @@ header.menu{ border: solid white; border-width: 0 2px 2px 0; padding: 3px; - margin-top: 18px; + margin-top: -32px; margin-right: 7px; transform: rotate(45deg); -webkit-transform: rotate(45deg); diff --git a/client/src/views/layout/header/imports.js b/client/src/views/layout/header/imports.js index badac9507..cdb3a7e7e 100644 --- a/client/src/views/layout/header/imports.js +++ b/client/src/views/layout/header/imports.js @@ -9,12 +9,14 @@ import { Group, Adb, VpnKey, + Home, AddCircleOutline } from '@material-ui/icons' const usersMenus = { title: 'Users', to: '/users', + icon: Home, submenus: [ { title: 'Directory', to: '/users/browse', icon: ImportContacts }, { title: 'Search', to: '/users/search', icon: Search }, @@ -26,6 +28,7 @@ const usersMenus = { const teamsMenus = { title: 'Teams', to: '/teams', + icon: Home, submenus: [ { title: 'All teams', to: '/teams', icon: Search }, { title: 'Your teams', to: '/teams/manage-teams', icon: Group, authenticated: true }, @@ -38,6 +41,7 @@ const teamsMenus = { const eventsMenus = { title: 'Events', to: '/events', + icon: Home, submenus: [ { title: 'All events', to: '/events', icon: Search }, { title: 'Your events', to: '/events/my', icon: GamepadRounded, authenticated: true }, @@ -50,6 +54,7 @@ const eventsMenus = { const keyvaultMenus = { title: 'Key Vault', to: '/key-vault', + icon: Home, authenticated: true, submenus: [ { title: 'Manage keys', to: '/key-vault/browse', icon: VpnKey }, diff --git a/client/src/views/layout/header/index.js b/client/src/views/layout/header/index.js index f8b2746a5..007533c07 100644 --- a/client/src/views/layout/header/index.js +++ b/client/src/views/layout/header/index.js @@ -80,7 +80,7 @@ class Header extends Component { } let user = JSON.parse(this.state.user) - const menus = allMenus.map(({ to, title, submenus, authenticated }, index) => { + const menus = allMenus.map(({ icon: Icon, to, title, submenus, authenticated }, index) => { if (authenticated && !(this.state.user !== undefined && this.state.user !== null)) { return } @@ -91,20 +91,27 @@ class Header extends Component { key={index} className={openedMenu === index ? 'primaryLink hasChildren selected' : 'primaryLink hasChildren'} > - this.toggleMenuOpen(index, true)}> {title} + { bigScreen + ? this.toggleMenuOpen(index, true)}> {title} + : this.toggleMenuOpen(index, true)}> {title} + }
    + { bigScreen + ? '' + :
  • Homepage
  • + } { - submenus.map(({ icon: Icon, to: subTo, title: subTitle, externalLink, authenticated: subAuthenticated }, subindex) => { + submenus.map(({ icon: SubIcon, to: subTo, title: subTitle, externalLink, authenticated: subAuthenticated }, subindex) => { if (subAuthenticated && !(this.state.user !== undefined && this.state.user !== null)) { return } if (externalLink) { return ( -
  • {subTitle}
  • +
  • {subTitle}
  • ) } return ( -
  • this.closeAll(index)}> {subTitle}
  • +
  • this.closeAll(index)}> {subTitle}
  • ) })}
From 47a169f91b4dc60cc64ae67623ad549959380841 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 13 Nov 2018 04:00:06 +0100 Subject: [PATCH 09/32] setting smaller padding top and bottom for containers --- client/src/styles/styles.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/src/styles/styles.scss b/client/src/styles/styles.scss index b09fabb19..4c2f4037e 100644 --- a/client/src/styles/styles.scss +++ b/client/src/styles/styles.scss @@ -65,7 +65,7 @@ body{ } .container{ - padding: 70px 15px 70px 15px; + padding: 15px 15px 15px 15px; margin-left: auto; margin-right: auto; @@ -371,6 +371,8 @@ header.menu{ } .homePage.container{ + padding-top: 70px; + padding-bottom: 70px; .title{ padding: 0 0 10px 0; @include fluid-type($break-xs, $break-lg, 24px, 45px); From d323fdbee36c81a7a68dfe1d90afa4660d3f63db Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 13 Nov 2018 14:37:23 +0100 Subject: [PATCH 10/32] Order on Users Submenu Changed --- client/src/views/layout/header/imports.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/views/layout/header/imports.js b/client/src/views/layout/header/imports.js index f5fbf801a..340d8e6d3 100644 --- a/client/src/views/layout/header/imports.js +++ b/client/src/views/layout/header/imports.js @@ -18,10 +18,10 @@ const usersMenus = { to: '/users', icon: Home, submenus: [ + { title: 'Your Profile', to: '/users/user', icon: People, authenticated: true }, { 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, authenticated: true } + { title: 'Report', to: 'https://github.com/AdvancedAlgos/UsersModule/issues/new', icon: BugReport, externalLink: true } ] } From 5bfdd4389d2fc0b54cc544c5e8af24ac51e03b52 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 13 Nov 2018 15:07:01 +0100 Subject: [PATCH 11/32] Users Module Version .22 --- client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/package.json b/client/package.json index 8ac2a391c..78d525816 100644 --- a/client/package.json +++ b/client/package.json @@ -24,7 +24,7 @@ "@advancedalgos/events-client": "^0.0.4", "@advancedalgos/key-vault-client": "^0.0.21", "@advancedalgos/teams-client": "^0.0.27", - "@advancedalgos/users-client": "^0.0.21", + "@advancedalgos/users-client": "^0.0.22", "@advancedalgos/web-components": "0.0.13", "@babel/core": "^7.1.2", "@babel/plugin-proposal-class-properties": "^7.1.0", From 76c2eb44e30ec61a31e82692aa2c8cb7abaadde6 Mon Sep 17 00:00:00 2001 From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com> Date: Tue, 13 Nov 2018 15:43:50 -0300 Subject: [PATCH 12/32] Changing to new server --- client/html/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/html/index.html b/client/html/index.html index e116555d8..0cfbbba3e 100644 --- a/client/html/index.html +++ b/client/html/index.html @@ -25,7 +25,7 @@ executingAt: 'Master App', visible: false, topMargin: 130, - urlPrefix: 'https://develop.advancedalgos.net/' , /* 'http://localhost:1337/' */ /* 'https://develop.advancedalgos.net/' */ + urlPrefix: 'https://charts-dev.advancedalgos.net/' , /* 'http://localhost:1337/' */ /* 'https://charts-dev.advancedalgos.net/' */ graphQL: { masterAppApiUrl: 'https://app-api.advancedalgos.net/graphql' }, From 0e26110413cde0b8385ce5e0ab3e087f71290d4c Mon Sep 17 00:00:00 2001 From: Barry Low Date: Tue, 13 Nov 2018 22:39:59 -0800 Subject: [PATCH 13/32] tweak Footer styles --- client/package-lock.json | 48 +++++++------------ .../components/SignupForm.js | 5 +- .../email-verification/components/styles.js | 11 ++++- client/src/views/layout/footer/index.js | 10 ++-- client/src/views/layout/footer/styles.js | 18 +++---- 5 files changed, 44 insertions(+), 48 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index a0f22a767..a053396e6 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -46,9 +46,9 @@ } }, "@advancedalgos/teams-client": { - "version": "0.0.26", - "resolved": "https://registry.npmjs.org/@advancedalgos/teams-client/-/teams-client-0.0.26.tgz", - "integrity": "sha512-7WgJ3OFDZql2h7A1AlAGq7PevfhNs9KL2hnd1oBNyjKSezsJ4j6JUIQt/GTl+0W19S22EHUjUhUVpnnCi8g0mg==", + "version": "0.0.27", + "resolved": "https://registry.npmjs.org/@advancedalgos/teams-client/-/teams-client-0.0.27.tgz", + "integrity": "sha512-TBawzPu+zn/VSf3CGG+5zh1KPwxfetKIwKaXZsU/kgmLllArXDUXEdVbznD6oYlkOUp0naenxA/SLu+XuuaGeg==", "dev": true, "requires": { "@advancedalgos/web-components": "0.0.13", @@ -81,9 +81,9 @@ } }, "@advancedalgos/users-client": { - "version": "0.0.21", - "resolved": "https://registry.npmjs.org/@advancedalgos/users-client/-/users-client-0.0.21.tgz", - "integrity": "sha512-u51GZOIVLtE6asigUx+2fOEtEgmikWS5wDUENyd4jyXMGsn5JgFWpD+psonSbWFgFL8FdiKmMrKwpqHyvHVFWQ==", + "version": "0.0.22", + "resolved": "https://registry.npmjs.org/@advancedalgos/users-client/-/users-client-0.0.22.tgz", + "integrity": "sha512-kjLBUdpnh9jYwesfsOBwAe5jPydKF0pt1ts9QBk3KKjcv4FATnCQ8uHsWtltg1gSAE781ozJaUSB0jjNrYVICg==", "dev": true, "requires": { "@material-ui/core": "^3.2.0", @@ -1736,9 +1736,9 @@ "dev": true }, "acorn-walk": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.0.tgz", - "integrity": "sha512-ugTb7Lq7u4GfWSqqpwE0bGyoBZNMTok/zDBXxfEG0QM50jNlGhIWjRC1pPN7bvV1anhF+bs+/gNcRw+o55Evbg==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz", + "integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==", "dev": true }, "address": { @@ -7135,14 +7135,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7157,20 +7155,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -7287,8 +7282,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -7300,7 +7294,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7315,7 +7308,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7323,14 +7315,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -7349,7 +7339,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -7430,8 +7419,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -7443,7 +7431,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -7565,7 +7552,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -9786,7 +9772,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 }, diff --git a/client/src/views/email-verification/components/SignupForm.js b/client/src/views/email-verification/components/SignupForm.js index 408fd5c3a..d8db5a03a 100644 --- a/client/src/views/email-verification/components/SignupForm.js +++ b/client/src/views/email-verification/components/SignupForm.js @@ -1,5 +1,6 @@ import React, { Component } from 'react' import PropTypes from 'prop-types' +import classNames from 'classnames' import { withStyles } from '@material-ui/core/styles' import withWidth from '@material-ui/core/withWidth' import { Mutation } from 'react-apollo' @@ -45,8 +46,8 @@ export class SignupForm extends Component { {(NewsletterSignup, { loading, error, data }) => { return ( - {displayTitle && Stay in touch!} - {displayIntro && Opt-in our mailing list to stay up to date with the Advanced Algos Project.} + {displayTitle && Stay in touch!} + {displayIntro && Opt-in our mailing list to stay up to date with the Advanced Algos Project.}
({ textAlign: 'center' } }, + signupTitle: { + fontSize: '25px', + marginBottom: theme.spacing.unit * 5 + }, + signupText: { + fontSize: '16px' + }, signupInput: { borderRadius: 4, backgroundColor: theme.palette.common.white, border: '1px solid #ced4da', - fontSize: 16, + fontSize: 20, padding: '10px 12px', transition: theme.transitions.create(['border-color', 'box-shadow']), marginRight: theme.spacing.unit * 1 @@ -41,7 +48,7 @@ const styles = theme => ({ signupInputSubmit: { boxShadow: 'none', textTransform: 'none', - fontSize: 16, + fontSize: 20, lineHeight: '1.1875em', color: theme.palette.common.white, padding: '10px 12px', diff --git a/client/src/views/layout/footer/index.js b/client/src/views/layout/footer/index.js index 1989fcde2..199f4920c 100644 --- a/client/src/views/layout/footer/index.js +++ b/client/src/views/layout/footer/index.js @@ -35,13 +35,13 @@ class Footer extends Component { > - + - Advanced Algos Ltd. - Ground Floor, Palace Court, Church Street,
St. Julians STJ3049, Malta
- - Privacy Statement | Terms of Service + Advanced Algos Ltd. + Ground Floor, Palace Court, Church Street,
St. Julians STJ3049, Malta
+ + 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 4eac95289..4bc6469fa 100644 --- a/client/src/views/layout/footer/styles.js +++ b/client/src/views/layout/footer/styles.js @@ -11,21 +11,22 @@ const styles = theme => ({ color: lightGreen[400] }, copyright: { - paddingTop: theme.spacing.unit * 3 + paddingTop: theme.spacing.unit * 9, + fontSize: '16px' }, linkLight: { color: theme.palette.secondary.main, textDecoration: 'none' }, descriptionLeft: { - marginLeft: theme.spacing.unit * 8, - [theme.breakpoints.down('sm')]: { - marginLeft: 0 - }, + marginLeft: 0, [theme.breakpoints.down('xs')]: { textAlign: 'center' } }, + descriptionText: { + fontSize: '16px' + }, signupRight: { marginTop: theme.spacing.unit * 2, [theme.breakpoints.down('xs')]: { @@ -46,14 +47,15 @@ const styles = theme => ({ }, footerContainer: { width: 'auto', - marginLeft: theme.spacing.unit * 3, - marginRight: theme.spacing.unit * 3, [theme.breakpoints.up(1200 + theme.spacing.unit * 3 * 2)]: { width: 1200, marginLeft: 'auto', marginRight: 'auto' } }, + footerLogo: { + marginBottom: theme.spacing.unit * 2 + }, footerLink: { textDecoration: 'none', '&:hover': { @@ -101,7 +103,7 @@ const styles = theme => ({ }, icon: { margin: theme.spacing.unit * 1, - fontSize: 24 + fontSize: 30 }, iconHover: { margin: theme.spacing.unit * 1, From b7ea984aeb14e98f1a037425f2a80d072c7e8857 Mon Sep 17 00:00:00 2001 From: Barry Low Date: Tue, 13 Nov 2018 22:41:02 -0800 Subject: [PATCH 14/32] Change signup form loading text --- .../email-verification/components/SignupVerifyResponse.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/views/email-verification/components/SignupVerifyResponse.js b/client/src/views/email-verification/components/SignupVerifyResponse.js index a31cbe11b..94c573c90 100644 --- a/client/src/views/email-verification/components/SignupVerifyResponse.js +++ b/client/src/views/email-verification/components/SignupVerifyResponse.js @@ -63,8 +63,8 @@ export class SignupVerifyResponse extends React.Component { return ( ) From 1c7c250248520377a5146019f301faac11f92b98 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 14 Nov 2018 12:07:10 +0100 Subject: [PATCH 15/32] Making homepage use Link instead of a, and ext. links open in new tabs --- client/src/views/layout/header/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/views/layout/header/index.js b/client/src/views/layout/header/index.js index 007533c07..cb4c821a4 100644 --- a/client/src/views/layout/header/index.js +++ b/client/src/views/layout/header/index.js @@ -98,7 +98,7 @@ class Header extends Component {
    { bigScreen ? '' - :
  • Homepage
  • + :
  • Homepage
  • } { submenus.map(({ icon: SubIcon, to: subTo, title: subTitle, externalLink, authenticated: subAuthenticated }, subindex) => { @@ -107,7 +107,7 @@ class Header extends Component { } if (externalLink) { return ( -
  • {subTitle}
  • +
  • {subTitle}
  • ) } return ( From ace0e468b5a2f56f5079b5fc3e26a3797ef1efc6 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 14 Nov 2018 16:06:17 +0100 Subject: [PATCH 16/32] Editing icon size --- client/src/styles/styles.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/client/src/styles/styles.scss b/client/src/styles/styles.scss index 4c2f4037e..1d1baef21 100644 --- a/client/src/styles/styles.scss +++ b/client/src/styles/styles.scss @@ -235,6 +235,9 @@ header.menu{ &:hover{ color: $advanced-algos-red; } + svg{ + padding-top: 10px; + } } ul.subMenu{ display: none; @@ -293,6 +296,9 @@ header.menu{ &.selected{ color: $advanced-algos-red; } + svg{ + padding-top: 10px; + } } ul.subMenu{ display: none; From f175ec7ab1e58e7835f1ff64f7b7ad9a023b144d Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 15 Nov 2018 11:54:58 +0100 Subject: [PATCH 17/32] New Version of Users Module --- client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/package.json b/client/package.json index 8ac2a391c..94802c701 100644 --- a/client/package.json +++ b/client/package.json @@ -24,7 +24,7 @@ "@advancedalgos/events-client": "^0.0.4", "@advancedalgos/key-vault-client": "^0.0.21", "@advancedalgos/teams-client": "^0.0.27", - "@advancedalgos/users-client": "^0.0.21", + "@advancedalgos/users-client": "^0.0.24", "@advancedalgos/web-components": "0.0.13", "@babel/core": "^7.1.2", "@babel/plugin-proposal-class-properties": "^7.1.0", From dee7891c988a16689a3f92591ec70553215559c0 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 15 Nov 2018 13:28:18 +0100 Subject: [PATCH 18/32] Quick fix so opening a select menu doesn't leave a dirty white line waiting for a real fix from the MUI team --- client/src/styles/styles.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/styles/styles.scss b/client/src/styles/styles.scss index 1d1baef21..66586875e 100644 --- a/client/src/styles/styles.scss +++ b/client/src/styles/styles.scss @@ -44,7 +44,8 @@ $advanced-algos-red: rgb(245,88,88); } body{ - overflow-y:scroll; + padding-right: 0 !important; + overflow-y: scroll; &::-webkit-scrollbar-track { border: 1px solid #000; From 9a355388386653c55a965e364e2245445efcdc88 Mon Sep 17 00:00:00 2001 From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com> Date: Thu, 15 Nov 2018 11:27:20 -0300 Subject: [PATCH 19/32] Adding key vault version 22 --- client/package.json | 8 ++++---- client/src/views/layout/header/imports.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package.json b/client/package.json index 94802c701..0ac104ba5 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.4", - "@advancedalgos/key-vault-client": "^0.0.21", - "@advancedalgos/teams-client": "^0.0.27", - "@advancedalgos/users-client": "^0.0.24", + "@advancedalgos/events-client": "0.0.4", + "@advancedalgos/key-vault-client": "0.0.22", + "@advancedalgos/teams-client": "0.0.27", + "@advancedalgos/users-client": "0.0.24", "@advancedalgos/web-components": "0.0.13", "@babel/core": "^7.1.2", "@babel/plugin-proposal-class-properties": "^7.1.0", diff --git a/client/src/views/layout/header/imports.js b/client/src/views/layout/header/imports.js index 340d8e6d3..68e1bae82 100644 --- a/client/src/views/layout/header/imports.js +++ b/client/src/views/layout/header/imports.js @@ -57,7 +57,7 @@ const keyvaultMenus = { icon: Home, authenticated: true, submenus: [ - { title: 'Manage keys', to: '/key-vault/browse', icon: VpnKey }, + { title: 'Your keys', to: '/key-vault/browse', icon: VpnKey }, { title: 'Add key', to: '/key-vault/addKey', icon: AddCircleOutline }, { title: 'Report', to: 'https://github.com/AdvancedAlgos/KeyVaultModule/issues/new', icon: BugReport, externalLink: true } ] From 678ef6b5140115c764402d8faacf47c0537ecd36 Mon Sep 17 00:00:00 2001 From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com> Date: Thu, 15 Nov 2018 11:42:35 -0300 Subject: [PATCH 20/32] new keyvault client version --- client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/package.json b/client/package.json index 0ac104ba5..cdfd0677a 100644 --- a/client/package.json +++ b/client/package.json @@ -22,7 +22,7 @@ "homepage": "https://github.com/Algoteers/MasterApp#readme", "devDependencies": { "@advancedalgos/events-client": "0.0.4", - "@advancedalgos/key-vault-client": "0.0.22", + "@advancedalgos/key-vault-client": "0.0.23", "@advancedalgos/teams-client": "0.0.27", "@advancedalgos/users-client": "0.0.24", "@advancedalgos/web-components": "0.0.13", From da345457928838c61dec3b74f77f9892c29d1e25 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 15 Nov 2018 16:23:41 +0100 Subject: [PATCH 21/32] Exit Platform Link --- client/src/views/layout/header/LoggedIn.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/views/layout/header/LoggedIn.js b/client/src/views/layout/header/LoggedIn.js index 496cb39a4..1476e6969 100644 --- a/client/src/views/layout/header/LoggedIn.js +++ b/client/src/views/layout/header/LoggedIn.js @@ -32,8 +32,9 @@ export const LoggedIn = props => { > toggleMenuOpen(42, true)}> {displayName} ) From af9efbcc40a74f475ec7f698cdd1e0ea90a22fcc Mon Sep 17 00:00:00 2001 From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com> Date: Thu, 15 Nov 2018 13:09:51 -0300 Subject: [PATCH 22/32] New keyvault version --- client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/package.json b/client/package.json index cdfd0677a..c3bc6b09c 100644 --- a/client/package.json +++ b/client/package.json @@ -22,7 +22,7 @@ "homepage": "https://github.com/Algoteers/MasterApp#readme", "devDependencies": { "@advancedalgos/events-client": "0.0.4", - "@advancedalgos/key-vault-client": "0.0.23", + "@advancedalgos/key-vault-client": "0.0.24", "@advancedalgos/teams-client": "0.0.27", "@advancedalgos/users-client": "0.0.24", "@advancedalgos/web-components": "0.0.13", From d71a182fc4a7379a8dbfcd016e14fa2f0c4da5bd Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 15 Nov 2018 18:07:02 +0100 Subject: [PATCH 23/32] Consistency in texts --- client/src/views/home/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/views/home/index.js b/client/src/views/home/index.js index 1600ff648..db0c3856e 100644 --- a/client/src/views/home/index.js +++ b/client/src/views/home/index.js @@ -9,12 +9,12 @@ class Home extends Component {
    Welcome to the Advanced Algos Platform! - CO-CREATE >> COMPETE >> EVOLVE + Enabling the evolutionary race towards the emergence of superalgos
    Before you begin, please be aware this is a development environment in pre-alpha stage. From 85d5553b8aa193ef87ae996949758bfe54ef167c Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 15 Nov 2018 18:15:34 +0100 Subject: [PATCH 24/32] Text Polishing --- client/src/views/layout/header/imports.js | 8 ++++---- client/src/views/layout/header/index.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/src/views/layout/header/imports.js b/client/src/views/layout/header/imports.js index 68e1bae82..e32cd1fb8 100644 --- a/client/src/views/layout/header/imports.js +++ b/client/src/views/layout/header/imports.js @@ -21,7 +21,7 @@ const usersMenus = { { title: 'Your Profile', to: '/users/user', icon: People, authenticated: true }, { 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: 'Report a Bug', to: 'https://github.com/AdvancedAlgos/UsersModule/issues/new', icon: BugReport, externalLink: true } ] } @@ -34,7 +34,7 @@ const teamsMenus = { { title: 'Your teams', to: '/teams/manage-teams', icon: Group, authenticated: true }, { title: 'Team members', to: '/teams/team-members', icon: People, authenticated: true }, { title: 'Financial beings', to: '/teams/financial-beings', icon: Adb, authenticated: true }, - { title: 'Report', to: 'https://github.com/AdvancedAlgos/TeamsModule/issues/new', icon: BugReport, externalLink: true } + { title: 'Report a Bug', to: 'https://github.com/AdvancedAlgos/TeamsModule/issues/new', icon: BugReport, externalLink: true } ] } @@ -47,7 +47,7 @@ const eventsMenus = { { 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: BugReport, externalLink: true } + { title: 'Report a Bug', to: 'https://github.com/AdvancedAlgos/UsersModule/issues/new', icon: BugReport, externalLink: true } ] } @@ -59,7 +59,7 @@ const keyvaultMenus = { submenus: [ { title: 'Your keys', to: '/key-vault/browse', icon: VpnKey }, { title: 'Add key', to: '/key-vault/addKey', icon: AddCircleOutline }, - { title: 'Report', to: 'https://github.com/AdvancedAlgos/KeyVaultModule/issues/new', icon: BugReport, externalLink: true } + { title: 'Report a Bug', to: 'https://github.com/AdvancedAlgos/KeyVaultModule/issues/new', icon: BugReport, externalLink: true } ] } diff --git a/client/src/views/layout/header/index.js b/client/src/views/layout/header/index.js index cb4c821a4..560b27b47 100644 --- a/client/src/views/layout/header/index.js +++ b/client/src/views/layout/header/index.js @@ -98,7 +98,7 @@ class Header extends Component {
      { bigScreen ? '' - :
    • Homepage
    • + :
    • Module Home Page
    • } { submenus.map(({ icon: SubIcon, to: subTo, title: subTitle, externalLink, authenticated: subAuthenticated }, subindex) => { From d7f382adfb18047c5055be542646518937e84c75 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 15 Nov 2018 23:37:48 +0100 Subject: [PATCH 25/32] Only first name displayed in Logged in to save space --- client/src/views/layout/header/LoggedIn.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/client/src/views/layout/header/LoggedIn.js b/client/src/views/layout/header/LoggedIn.js index 1476e6969..0758db99a 100644 --- a/client/src/views/layout/header/LoggedIn.js +++ b/client/src/views/layout/header/LoggedIn.js @@ -19,9 +19,10 @@ export const LoggedIn = props => { displayName = user.firstName } - if (isDefined(user.firstName) && isDefined(user.lastName)) { - displayName = user.firstName + ' ' + user.lastName - } + displayName = displayName.split('-')[0] + displayName = displayName.split('.')[0] + displayName = displayName.split('_')[0] + displayName = displayName.split(' ')[0] return ( From 08c22cafe1b5b285bc3f0c24c311157759023e9a Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 15 Nov 2018 23:45:26 +0100 Subject: [PATCH 26/32] Correcting the URL for images from test site to public web site --- client/src/views/callback/index.js | 2 +- client/src/views/charts/index.js | 2 +- .../email-verification/components/SignupVerifyResponse.js | 6 +++--- client/src/views/email-verification/index.js | 2 +- client/src/views/home/index.js | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/src/views/callback/index.js b/client/src/views/callback/index.js index 01ae059fa..9f052889f 100644 --- a/client/src/views/callback/index.js +++ b/client/src/views/callback/index.js @@ -6,7 +6,7 @@ const Callback = () => export default Callback diff --git a/client/src/views/charts/index.js b/client/src/views/charts/index.js index 29589ff2a..38eec4e9e 100644 --- a/client/src/views/charts/index.js +++ b/client/src/views/charts/index.js @@ -44,7 +44,7 @@ class Charts extends Component { size='medium' title='' text='Charts loading...' - backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg' + backgroundUrl='https://advancedalgos.net/img/photos/superalgos-platform.jpg' /> ) } diff --git a/client/src/views/email-verification/components/SignupVerifyResponse.js b/client/src/views/email-verification/components/SignupVerifyResponse.js index 94c573c90..fca6419d6 100644 --- a/client/src/views/email-verification/components/SignupVerifyResponse.js +++ b/client/src/views/email-verification/components/SignupVerifyResponse.js @@ -36,7 +36,7 @@ export class SignupVerifyResponse extends React.Component { size='big' title={BannerTitle} text={BannerText} - backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg' + backgroundUrl='https://advancedalgos.net/img/photos/superalgos-platform.jpg' /> ) } @@ -52,7 +52,7 @@ export class SignupVerifyResponse extends React.Component { size='big' title='Mailing Sign-Up Complete!' text='We look forward to keeping you up-to-date on the Advanced Algos project.' - backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg' + backgroundUrl='https://advancedalgos.net/img/photos/superalgos-platform.jpg' > {displayForm && } @@ -65,7 +65,7 @@ export class SignupVerifyResponse extends React.Component { size='big' title='Processing...' text='' - backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg' + backgroundUrl='https://advancedalgos.net/img/photos/superalgos-platform.jpg' /> ) } diff --git a/client/src/views/email-verification/index.js b/client/src/views/email-verification/index.js index 8e38064c6..dd71bc7ae 100644 --- a/client/src/views/email-verification/index.js +++ b/client/src/views/email-verification/index.js @@ -27,7 +27,7 @@ export const EmailSignupConfirm = ({ tokenParam }) => { size='big' title='' text={BannerText} - backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg' + backgroundUrl='https://advancedalgos.net/img/photos/superalgos-platform.jpg' /> ) } diff --git a/client/src/views/home/index.js b/client/src/views/home/index.js index db0c3856e..b1820b600 100644 --- a/client/src/views/home/index.js +++ b/client/src/views/home/index.js @@ -10,7 +10,7 @@ class Home extends Component { size='big' title='Advanced Algos Platform' text='People and machines working together to create Superalgos' - backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg' + backgroundUrl='https://advancedalgos.net/img/photos/superalgos-platform.jpg' />
      Welcome to the Advanced Algos Platform! From db14909ee3f6e7c793f6e3dd0ab5ae3409732dd6 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 15 Nov 2018 23:52:43 +0100 Subject: [PATCH 27/32] Scripts being read from deprecated dns --- client/html/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/html/index.html b/client/html/index.html index 0cfbbba3e..b81b86c87 100644 --- a/client/html/index.html +++ b/client/html/index.html @@ -13,8 +13,8 @@ - - + + - +