Merge pull request #140 from AAVikings/develop

PR From AAVikings

client/html/index.html

@@ -10,7 +10,7 @@
   <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" />
+  <link rel="shortcut icon" type="image/png/ico" href="/html/favicon.ico" />
   <script src="https://unpkg.com/apollo-client-browser@1.7.0"></script>
 
   <script type="text/javascript" src="https://charts-dev.superalgos.org/Scripts/require.js"></script>

client/package.json

@@ -27,14 +27,14 @@
   "devDependencies": {
     "@advancedalgos/events-client": "0.0.4",
     "@advancedalgos/financial-beings-client": "0.0.5",
-    "@advancedalgos/operations-client": "0.0.1",
+    "@superalgos/operations-client": "0.0.2",
     "@babel/core": "^7.1.2",
     "@babel/plugin-proposal-class-properties": "^7.1.0",
     "@babel/plugin-syntax-dynamic-import": "^7.0.0",
     "@babel/plugin-transform-runtime": "^7.1.0",
     "@babel/preset-env": "^7.1.0",
     "@babel/preset-react": "^7.0.0",
-    "@superalgos/key-vault-client": "0.0.25",
+    "@superalgos/key-vault-client": "0.0.26",
     "@superalgos/teams-client": "0.0.32",
     "@superalgos/users-client": "0.0.25",
     "@superalgos/web-components": "0.0.18",

client/src/App.js

@@ -19,7 +19,7 @@ import Teams from '@superalgos/teams-client'
 import Events from '@advancedalgos/events-client'
 import KeyVault from '@superalgos/key-vault-client'
 import FinancialBeings from '@advancedalgos/financial-beings-client'
-import Operations from '@advancedalgos/operations-client'
+import Operations from '@superalgos/operations-client'
 
 export const auth = new Auth(
   result => console.log('Authentication successful.'),

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

@@ -68,7 +68,8 @@ const operationsMenus = {
   icon: Home,
   authenticated: true,
   submenus: [
-    { title: 'Your clones', to: '/operations/browse', icon: ImportContacts },
+    { title: 'Active clones', to: '/operations/browse', icon: ImportContacts },
+    { title: 'History', to: '/operations/history', icon: LibraryAdd },
     { title: 'Clone a bot', to: '/operations/add', icon: AddCircleOutline },
     { title: 'Report a Bug', to: 'https://github.com/Superalgos/OperationsModule/issues/new', icon: BugReport, externalLink: true }
   ]
@@ -77,6 +78,7 @@ const operationsMenus = {
 const financialBeingsMenus = {
   title: 'FBs',
   to: '/financial-beings',
+  icon: Home,
   authenticated: false,
   submenus: [
     { title: 'Directory', to: '/financial-beings', icon: ImportContacts }
@@ -87,7 +89,7 @@ const allMenus = [
   usersMenus,
   teamsMenus,
   eventsMenus,
-  financialBeingsMenus,
+  // financialBeingsMenus,
   keyvaultMenus,
   operationsMenus
 ]

server/src/createRemoteSchema.js

@@ -45,10 +45,10 @@ export const createRemoteSchema = async (uri, preshared_key) => {
 export const createTransformedRemoteSchema = async (prefix, uri, preshared_key) => {
   var schema
   try {
-    logger.info(`About to create ${prefix} schema at ${uri}`)
+    logger.info('About to create %s schema at %s.', prefix, uri)
     schema = await createRemoteSchema(uri, preshared_key)
   } catch (error) {
-    logger.error(`An error occured while fetching ${prefix}, ${uri} schema. Details: ${error}`)
+    logger.error('An error occured while fetching %s, %s schema. Details: %j', prefix, uri, error)
     return false
   }
   const transformedSchema = transformSchema(schema, [

server/src/logger/index.js

@@ -26,6 +26,7 @@ const logger = createLogger({
   level: 'info',
   format: format.combine(
           format.colorize(),
+          format.splat(),
           format.timestamp({ format: 'YY/MM/DD HH:mm' }),
           format.printf(
             info => `${info.timestamp} - ${info.level}: ${JSON.parse(JSON.stringify(inspect(info.message)))}`