Merge pull request #14 from AAVikings/master

Reducing top menu size and adding favico

client/.env.example

@@ -1,15 +1,21 @@
+#General configuration
 PORT=3100
 NODE_ENV=development
 
+#Graphql API
 DEV_GRAPHQL=http://localhost:4100/graphql
 PROD_GRAPHQL=https://app.advancedalgos.net/graphql
 
+#Auth0 Server
 AUTH0_DOMAIN=advancedalgos.eu.auth0.com
 AUTH0_AUDIENCE=https://auth-dev.advancedalgos.net
 AUTH0_ISSUER=https://advancedalgos.eu.auth0.com/
 AUTH0_CLIENTID=<auth0-client-id>
 
+#Auth0 Client
 AUTH0_CALLBACK_URL=http://localhost:3100/callback
 AUTH0_LOGOUT_URL=http://localhost:3100
-AUTH0_PROD_CALLBACK_URL=https://app.advancedalgos.net/callback
-AUTH0_PROD_LOGOUT_URL=https://app.advancedalgos.net
+
+#Storage account
+AZURE_STORAGE_URL_TEAMS=<azure-storage-url>
+AZURE_STORAGE_SAS_TEAMS=<azure-storage-sas>

client/html/index.html

@@ -10,26 +10,25 @@
   <meta name="apple-mobile-web-app-capable" content="yes">
   <link href="https://fonts.googleapis.com/css?family=Saira+Condensed:300,600|Saira:300,600&amp;subset=latin-ext,vietnamese" rel="stylesheet">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-
+  <link rel="shortcut icon" type="image/png/ico" href="/favicon.ico" />
   <script src="https://unpkg.com/apollo-client-browser@1.7.0"></script>
+
   <script type="text/javascript" src="https://develop.advancedalgos.net/Scripts/Require.js"></script>
   <script type="text/javascript" src="https://develop.advancedalgos.net/Scripts/AppPreLoader.js"></script>
+
+  <script type="text/javascript">
+    function loadCanvas(){
+      window.SESSION_TOKEN = ''
+      window.EXECUTING_AT = 'Master App'
+      window.TOP_MARGIN = 25
+      window.URL_PREFIX = 'https://develop.advancedalgos.net/'
+      window.CANVAS_VISIBLE = true
+      loadAdvancedAlgosPlatform();
+    }
+  </script>
 </head>
-<body id="body" onload="
-
-
-window.SESSION_TOKEN = '';
-window.EXECUTING_AT = 'Master App';
-window.TOP_MARGIN = 85;
-window.URL_PREFIX = 'http://localhost:1337/';
-window.URL_PREFIX = 'https://develop.advancedalgos.net/'
-window.CANVAS_VISIBLE = true;
-loadAdvancedAlgosPlatform();
-
-    ">
-
+<body id="body" onload="loadCanvas()">
     <div id="root"></div>
     <div id="canvasDiv"></div>
-
 </body>
 </html>

client/src/App.js

@@ -18,7 +18,7 @@ import KeyVault from '@advancedalgos/key-vault-client'
 import Users from '@advancedalgos/users-client'
 
 export const auth = new Auth(
-  result => console.log('auth result', result),
+  result => console.log('Authentication successful.'),
   client
 )
 

client/src/views/header/LoggedIn.js

@@ -28,9 +28,7 @@ export const LoggedIn = props => {
 
   return (
     <div>
-      <p>
         <LoggedInMenu menuLabel={displayName} auth={auth} />
-      </p>
     </div>
   )
 }

client/src/views/header/index.js

@@ -53,7 +53,6 @@ const styles = theme => ({
     position: 'relative'
   },
   img: {
-    margin: 20,
     display: 'block',
     maxWidth: 240,
     maxHeight: 48

server/.env.example

@@ -1,4 +1,4 @@
-GRAPHQL_API_URL='https://dev-app.advancedalgos.net/graphql'
-TEAMS_API_URL='https://teams-api.advancedalgos.net/graphql'
-USERS_API_URL='https://users-api.advancedalgos.net/graphql'
-KEYVAULT_API_URL='https://keyvault-api.advancedalgos.net/graphql'
+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
+KEYVAULT_API_URL=https://keyvault-api.advancedalgos.net/graphql

server/src/createRemoteSchema.js

@@ -43,7 +43,7 @@ export const createTransformedRemoteSchema = async (prefix, uri) => {
   try {
     schema = await createRemoteSchema(uri)
   } catch (error) {
-    logger.error(`An error occured while fetching ${prefix} schema. Details: `, error)
+    logger.error(`An error occured while fetching ${prefix}, ${uri} schema. Details: ${error}`)
     return false
   }
   const transformedSchema = transformSchema(schema, [

server/src/index.js

@@ -78,5 +78,5 @@ async function run () {
 try {
   run()
 } catch (e) {
-  logger.error(e, e.message, e.stack)
+  logger.error(`An general error occured while running the app: ${e}, details: ${e.message}, stack: ${e.stack}`)
 }