Merge conflict fix

.gitignore

@@ -18,3 +18,4 @@ server/package-lock.json
 server/package-lock.json
 client/package-lock.json
 server/package-lock.json
+client/package-lock.json

client/html/index.html

@@ -32,7 +32,7 @@
   </script>
 </head>
 
-<body id="body" onload="loadCanvas()">
+<body id="body" onload="loadCanvas()" onresize="window.canvasApp.eventHandler.raiseEvent('Browser Resized')">
     <div id="masterApp"></div>
     <div id="canvasApp"></div>
 </body>

client/package.json

@@ -21,10 +21,10 @@
   },
   "homepage": "https://github.com/Algoteers/MasterApp#readme",
   "devDependencies": {
-    "@advancedalgos/key-vault-client": "^0.0.14",
+    "@advancedalgos/key-vault-client": "^0.0.16",
     "@advancedalgos/teams-client": "0.0.23",
     "@advancedalgos/users-client": "^0.0.14",
-    "@advancedalgos/hosts-client": "^0.0.1",
+    "@advancedalgos/events-client": "^0.0.1",
     "@advancedalgos/web-components": "0.0.13",
     "@babel/core": "^7.1.2",
     "autoprefixer": "^9.2.0",

client/src/App.js

@@ -15,7 +15,7 @@ import { Header, Footer, Home, Charts, Callback } from './views'
 
 import Users from '@advancedalgos/users-client'
 import Teams from '@advancedalgos/teams-client'
-import Hosts from '@advancedalgos/hosts-client'
+import Events from '@advancedalgos/events-client'
 import KeyVault from '@advancedalgos/key-vault-client'
 
 export const auth = new Auth(
@@ -51,8 +51,8 @@ export const MasterApp = () => (
             render={props => <Teams {...props} auth={auth} />}
             />
           <Route
-            path='/hosts'
-            render={props => <Hosts {...props} auth={auth} />}
+            path='/events'
+            render={props => <Events {...props} auth={auth} />}
             />
           <Route
             path='/key-vault'

client/src/views/header/LoggedInMenu.js

@@ -8,7 +8,7 @@ import { Link } from 'react-router-dom'
 import ProfileIcon from '@material-ui/icons/Person'
 import LogoutIcon from '@material-ui/icons/DirectionsWalk'
 
-const UserLink = props => <Link to='/users' {...props} />
+const UserLink = props => <Link to='/users/user' {...props} />
 const LogoutLink = props => <Link to='/' {...props} />
 
 class LoggedInUserMenu extends Component {

client/src/views/header/index.js

@@ -26,7 +26,7 @@ import AALogo from '../../assets/advanced-algos/aa-logo-dark.svg'
 const ChartsLink = props => <Link to='/charts' {...props} />
 const UsersLink = props => <Link to='/users' {...props} />
 const TeamsLink = props => <Link to='/teams' {...props} />
-const HostsLink = props => <Link to='/hosts' {...props} />
+const EventsLink = props => <Link to='/events' {...props} />
 const KeyVaultLink = props => <Link to='/key-vault' {...props} />
 const HomeLink = props => <Link to='/' {...props} />
 
@@ -117,8 +117,8 @@ class Header extends Component {
             <Button component={TeamsLink} color='inherit'>
               Teams
             </Button>
-            <Button component={HostsLink} color='inherit'>
-              Hosts
+            <Button component={EventsLink} color='inherit'>
+              Events
             </Button>
             <Button component={KeyVaultLink} color='inherit'>
               Key Vault
@@ -129,7 +129,7 @@ class Header extends Component {
               color='inherit'
               target='_blank'
             >
-            Documentation
+            Docs
             </Button>
 
             {this.state.user !== undefined && this.state.user !== null ? (

server/.env.example

@@ -1,7 +1,7 @@
 GRAPHQL_API_URL=https://app-api.advancedalgos.net/graphql
 TEAMS_API_URL=https://teams-api.advancedalgos.net/graphql
 USERS_API_URL=https://users-api.advancedalgos.net/graphql
-HOSTS_API_URL=https://hosts-api.advancedalgos.net/graphql
+EVENTS_API_URL=https://events-api.advancedalgos.net/graphql
 KEYVAULT_API_URL=https://keyvault-api.advancedalgos.net/graphql
 
 AUTH0_DOMAIN=auth0-domain

server/src/index.js

@@ -8,7 +8,7 @@ import jwksRsa from 'jwks-rsa'
 import axios from 'axios'
 
 import { createTransformedRemoteSchema } from './createRemoteSchema'
-import { teams, hosts } from './links'
+import { teams, events } from './links'
 import logger from './logger'
 
 async function getUserId (authId) {
@@ -36,7 +36,7 @@ async function getUserId (authId) {
 async function run () {
   const transformedTeamsSchema = await createTransformedRemoteSchema('teams_', process.env.TEAMS_API_URL)
   const transformedUsersSchema = await createTransformedRemoteSchema('users_', process.env.USERS_API_URL)
-  const transformedHostsSchema = await createTransformedRemoteSchema('hosts_', process.env.HOSTS_API_URL)
+  const transformedEventsSchema = await createTransformedRemoteSchema('events_', process.env.EVENTS_API_URL)
   const transformedKeyVaultSchema = await createTransformedRemoteSchema('keyVault_', process.env.KEYVAULT_API_URL)
 
   var schemas = []
@@ -52,11 +52,11 @@ async function run () {
   if (transformedUsersSchema) {
     schemas.push(transformedUsersSchema)
   }
-  if (transformedHostsSchema) {
-    schemas.push(transformedHostsSchema)
+  if (transformedEventsSchema) {
+    schemas.push(transformedEventsSchema)
     if (transformedUsersSchema && transformedTeamsSchema) {
-      schemas.push(hosts.linkSchemaDefs)
-      resolvers = Object.assign(resolvers, hosts.resolver(transformedUsersSchema, transformedTeamsSchema))
+      schemas.push(events.linkSchemaDefs)
+      resolvers = Object.assign(resolvers, events.resolver(transformedUsersSchema, transformedTeamsSchema))
     }
   }
   if (transformedKeyVaultSchema) {
@@ -139,7 +139,7 @@ async function run () {
       return error
     },
     formatResponse: response => {
-      logger.info('Response from Apolo Server: ', response)
+      logger.debug('Response from Apolo Server: ', response)
       return response
     },
     playground: {

server/src/links/events.js

@@ -1,17 +1,17 @@
 export const linkSchemaDefs =
   `
-    extend type hosts_Event {
+    extend type events_Event {
       host: users_User
     }
-    extend type hosts_Participant {
+    extend type events_Participant {
       team: teams_Team
     }
   `
 
 export const resolver = (usersSchema, teamsSchema) => ({
-  hosts_Event: {
+  events_Event: {
     host: {
-      fragment: `fragment UserFragment on hosts_Event{hostId}`,
+      fragment: `fragment UserFragment on events_Event{hostId}`,
       resolve (parent, args, context, info) {
         return info.mergeInfo.delegateToSchema({
           schema: usersSchema,
@@ -24,9 +24,9 @@ export const resolver = (usersSchema, teamsSchema) => ({
       }
     }
   },
-  hosts_Participant: {
+  events_Participant: {
     team: {
-      fragment: `fragment TeamFragment on hosts_Participant{teamId}`,
+      fragment: `fragment TeamFragment on events_Participant{teamId}`,
       resolve (parent, args, context, info) {
         return info.mergeInfo.delegateToSchema({
           schema: teamsSchema,

server/src/links/index.js

@@ -1,4 +1,4 @@
 import teams from './teams'
-import hosts from './hosts'
+import events from './events'
 
-export { teams, hosts }
+export { teams, events }

server/src/logger/index.js

@@ -15,7 +15,7 @@ const options = {
     timestamp: true
   },
   console: {
-    level: 'debug',
+    level: 'info',
     handleExceptions: true,
     json: false,
     colorize: true,