Merge remote-tracking branch 'upstream/develop' into develop

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.24",
+    "@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",

client/src/views/home/index.js

@@ -9,12 +9,12 @@ class Home extends Component {
         <BannerTopBar
           size='big'
           title='Advanced Algos Platform'
-          text='Enabling the evolutionary race towards the emergence of superalgos'
+          text='People and machines working together to create Superalgos'
           backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg'
         />
         <div className='homePage container'>
           <Typography variant='h1' align='center' className='title'>Welcome to the Advanced Algos Platform!</Typography>
-          <Typography variant='h2' align='center' className='subtitle'>CO-CREATE >> COMPETE >> EVOLVE</Typography>
+          <Typography variant='h2' align='center' className='subtitle'>Enabling the evolutionary race towards the emergence of superalgos</Typography>
           <div className='column'>
             <Typography align='justify'>
               Before you begin, please be aware <strong>this is a development environment in pre-alpha stage</strong>.

client/src/views/layout/header/LoggedIn.js

@@ -32,8 +32,9 @@ export const LoggedIn = props => {
     >
       <Link to='/users/user' onClick={() => toggleMenuOpen(42, true)}> {displayName} </Link>
       <ul className='subMenu'>
-        <li><Link to='/users/user' onClick={() => closeAll()}> Profile </Link></li>
+        <li><Link to='/users/user' onClick={() => closeAll()}> Your Profile </Link></li>
         <li><a href='#' onClick={() => auth.logout()}> Logout </a></li>
+        <li><a href='https://www.advancedalgos.net'> Exit Platform </a></li>
       </ul>
     </li>
   )

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 }
   ]
 }
 
@@ -57,9 +57,9 @@ 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 }
+    { title: 'Report a Bug', to: 'https://github.com/AdvancedAlgos/KeyVaultModule/issues/new', icon: BugReport, externalLink: true }
   ]
 }
 

client/src/views/layout/header/index.js

@@ -98,7 +98,7 @@ class Header extends Component {
           <ul className='subMenu'>
             { bigScreen
               ? ''
-              : <li key={index + 'home'}><Link to={to}> <Icon /> Homepage </Link></li>
+              : <li key={index + 'home'}><Link to={to}> <Icon /> Module Home Page </Link></li>
             }
             {
               submenus.map(({ icon: SubIcon, to: subTo, title: subTitle, externalLink, authenticated: subAuthenticated }, subindex) => {