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

client/src/App.js

@@ -16,11 +16,13 @@ import { Layout, Home, Charts, Callback, EmailSignupConfirm } from './views'
 
 import Users from '@superalgos/users-client'
 import Teams from '@superalgos/teams-client'
-import Events from '@advancedalgos/events-client'
+import Events from '@superalgos/events-client'
 import KeyVault from '@superalgos/key-vault-client'
 import FinancialBeings from '@advancedalgos/financial-beings-client'
 import Operations from '@superalgos/operations-client'
 import Strategizer from '@superalgos/strategizer-client'
+import Logs from '@superalgos/logs-client'
+// import Miners from '@superalgos/miners-client'
 
 export const auth = new Auth(
   result => console.log('Authentication successful.'),
@@ -75,17 +77,22 @@ export const MasterApp = props => (
               render={props => <FinancialBeings {...props} auth={auth}/>}
             />
             <Route
-              path='/key-vault'
+              path='/keys'
               render={props => <KeyVault {...props} auth={auth} />}
             />
             <Route
-              path='/operations'
+              path='/clones'
               render={props => <Operations {...props} auth={auth} />}
             />
             <Route
               path='/strategizer'
               render={props => <Strategizer {...props} auth={auth} />}
             />
+            <Route
+              path='/logs'
+              render={props => <Logs {...props} auth={auth} />}
+            />
+
           </Switch>
         </Layout>
       </MuiThemeProvider>

client/src/graphql/apollo.js

@@ -66,7 +66,7 @@ const authLink = setContext((_, { headers }) => {
   }
 })
 
-const cache = new InMemoryCache().restore(window.__APOLLO_STATE__)
+const cache = new InMemoryCache({ addTypename: false }).restore(window.__APOLLO_STATE__)
 
 const defaultOptions = {
   watchQuery: {

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

@@ -7,7 +7,6 @@ import {
   BugReport,
   People,
   Group,
-  // Adb,
   VpnKey,
   Home,
   AddCircleOutline,
@@ -44,48 +43,57 @@ const eventsMenus = {
   icon: Home,
   submenus: [
     { title: 'Directory', to: '/events', icon: ImportContacts },
-    { 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 a Bug', to: 'https://github.com/Superalgos/UsersModule/issues/new', icon: BugReport, externalLink: true }
+    { title: 'Report a Bug', to: 'https://github.com/Superalgos/EventsClientModule/issues/new', icon: BugReport, externalLink: true }
   ]
 }
 
 const keyvaultMenus = {
-  title: 'Key Vault',
-  to: '/key-vault',
+  title: 'Keys',
+  to: '/keys',
   icon: Home,
   authenticated: true,
   submenus: [
-    { title: 'Your keys', to: '/key-vault/browse', icon: VpnKey },
-    { title: 'Add key', to: '/key-vault/addKey', icon: AddCircleOutline },
+    { title: 'Your keys', to: '/keys/browse', icon: VpnKey },
+    { title: 'Add key', to: '/keys/addKey', icon: AddCircleOutline },
     { title: 'Report a Bug', to: 'https://github.com/Superalgos/KeyVaultModule/issues/new', icon: BugReport, externalLink: true }
   ]
 }
 
 const operationsMenus = {
-  title: 'Operations',
-  to: '/operations',
+  title: 'Clones',
+  to: '/clones',
   icon: Home,
   authenticated: true,
   submenus: [
-    { 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: 'Active Clones', to: '/clones/browse', icon: ImportContacts },
+    { title: 'History Clones', to: '/clones/history', icon: LibraryAdd },
+    { title: 'Create Clone', to: '/clones/add', icon: AddCircleOutline },
     { title: 'Report a Bug', to: 'https://github.com/Superalgos/OperationsModule/issues/new', icon: BugReport, externalLink: true }
   ]
 }
 
-const financialBeingsMenus = {
-  title: 'FBs',
-  to: '/financial-beings',
+const minersMenus = {
+  title: 'Miners',
+  to: '/miners',
   icon: Home,
   authenticated: false,
   submenus: [
-    { title: 'Directory', to: '/financial-beings', icon: ImportContacts }
+    { title: 'Report a Bug', to: 'https://github.com/Superalgos/minersClient/issues/new', icon: BugReport, externalLink: true }
   ]
 }
 
+// const financialBeingsMenus = {
+//   title: 'FBs',
+//   to: '/financial-beings',
+//   icon: Home,
+//   authenticated: false,
+//   submenus: [
+//     { title: 'Directory', to: '/financial-beings', icon: ImportContacts }
+//   ]
+// }
+
 const strategizerMenus = {
   title: 'Strategizer',
   to: '/strategizer',
@@ -100,10 +108,11 @@ const strategizerMenus = {
 const allMenus = [
   usersMenus,
   teamsMenus,
-  // eventsMenus,
+  eventsMenus,
   // financialBeingsMenus,
   keyvaultMenus,
   operationsMenus,
+  minersMenus,
   strategizerMenus
 ]