Feature/initial task flow

agents/components/LogOut.js

@@ -7,18 +7,23 @@ import { FormattedMessage } from '../../lib/Intl'
 import styles from '../styles/LogOut'
 
 function LogOut (props) {
-  const { styles, actions } = props
+  const {
+    styles,
+    actions,
+    as: Component = FlatButton,
+    ...moreProps
+  } = props
   return (
-    <FlatButton
+    <Component
       className={styles.container}
-      backgroundColor='#ddd'
       onClick={actions.authentication.logOut}
+      {...moreProps}
     >
       <FormattedMessage
-        id='agents.logout'
+        id='agents.logOut'
         className={styles.buttonText}
       />
-    </FlatButton>
+    </Component>
   )
 }
 

agents/containers/LogOut.js

@@ -10,7 +10,7 @@ import LogOut from '../components/LogOut'
 
 export default flow(
   connectFeathers({
-    selector: (state) => ({}),
+    selector: (state, ownProps) => ownProps,
     actions: { authentication: { logOut } },
     query: []
   })

app/components/Dashboard.js

@@ -7,7 +7,7 @@ import styles from '../styles/Dashboard'
 import { FormattedMessage } from '../../lib/Intl'
 
 function Dashboard (props) {
-  const { styles, startOrder } = props
+  const { styles, actions } = props
 
   return (
     <div className={styles.container}>
@@ -18,7 +18,11 @@ function Dashboard (props) {
         />
       </p>
       <div className={styles.buttonContainer}>
-        <RaisedButton className={styles.button} type='button' onClick={startOrder}>
+        <RaisedButton
+          className={styles.button}
+          type='button'
+          onClick={actions.ordering.startOrder}
+        >
           <FormattedMessage
             id='app.startOrder'
             className={styles.labelText}

app/components/layout.js → app/components/Layout.js

@@ -3,9 +3,9 @@ import { createComponent } from '@ahdinosaur/react-fela'
 import { Route, Switch } from 'react-router-dom'
 import { pipe, map, values, isNil } from 'ramda'
 
-import styles from '../styles/layout'
+import styles from '../styles/Layout'
 
-import Nav from './nav'
+import Nav from './Navigation'
 
 const Container = createComponent(styles.container, 'div')
 

app/components/Navigation.js

@@ -1,17 +1,63 @@
 import React from 'react'
 import { connect as connectFela } from 'react-fela'
-import { not } from 'ramda'
+import { not, pipe, map, values, isNil } from 'ramda'
 import AppBar from 'material-ui/AppBar'
 import Drawer from 'material-ui/Drawer'
 import MenuItem from 'material-ui/MenuItem'
 import Divider from 'material-ui/Divider'
 import { withState, withHandlers, compose } from 'recompose'
+import { NavLink } from 'react-router-dom'
 
 import styles from '../styles/Navigation'
 import { FormattedMessage } from '../../lib/Intl'
+import LogOut from '../../agents/containers/LogOut'
 
 function Navigation (props) {
-  const { styles, isDrawerOpen, toggleDrawer } = props
+  const { styles, isDrawerOpen, toggleDrawer, navigationRoutes } = props
+
+  const mapRouteItems = pipe(
+    map(route => {
+      const {
+        path,
+        name = path,
+        navigation
+      } = route
+
+      const {
+        Component,
+        title = name,
+        icon
+      } = navigation
+
+      if (Component) {
+        return (
+          <Component
+            key={name}
+            as={MenuItem}
+            leftIcon={
+              <i className={icon} aria-hidden="true" />
+            }
+          />
+        )
+      }
+
+      return (
+        <NavLink to={path} key={name}>
+          <MenuItem
+            leftIcon={
+              <i className={icon} aria-hidden="true" />
+            }
+          >
+            <FormattedMessage
+              id={title}
+              className={styles.labelText}
+            />
+          </MenuItem>
+        </NavLink>
+      )
+    }),
+    values
+  )
 
   return (
     <div>
@@ -37,27 +83,7 @@ function Navigation (props) {
           />
         </MenuItem>
         <Divider />
-        <MenuItem
-          leftIcon={
-            <i className="fa fa-tachometer" aria-hidden="true" />
-          }
-        >
-          <FormattedMessage
-            id='app.dashboard'
-            className={styles.labelText}
-          />
-        </MenuItem>
-        <Divider />
-        <MenuItem
-          leftIcon={
-            <i className="fa fa-sign-out" aria-hidden="true" />
-          }
-        >
-          <FormattedMessage
-            id='app.logOut'
-            className={styles.labelText}
-          />
-        </MenuItem>
+        {mapRouteItems(navigationRoutes)}
         <Divider />
       </Drawer>
     </div>

app/containers/Dashboard.js

@@ -0,0 +1,26 @@
+import { connect } from 'feathers-action-react'
+
+import Dashboard from '../components/Dashboard'
+import { actions as taskPlanActions } from '../../tasks/dux/plans'
+import { actions as taskWorkActions } from '../../tasks/dux/works'
+import * as orderingActions from '../../ordering/actions'
+import { getDashboardProps } from '../getters'
+
+export default connect({
+  selector: getDashboardProps,
+  actions: {
+    taskPlans: taskPlanActions,
+    taskWorks: taskWorkActions,
+    ordering: orderingActions
+  },
+  query: [
+    {
+      service: 'taskPlans',
+      params: {}
+    },
+    {
+      service: 'taskWorks',
+      params: {}
+    }
+  ]
+})(Dashboard)

app/containers/layout.js → app/containers/Layout.js

@@ -1,9 +1,10 @@
 import { connect } from 'react-redux'
 
-import Layout from '../components/layout'
+import Layout from '../components/Layout'
 
 import { getLayoutProps } from '../getters'
 
 export default connect(
-  getLayoutProps
+  getLayoutProps,
+
 )(Layout)

app/getters.js

@@ -1,16 +1,26 @@
 import { createSelector, createStructuredSelector } from 'reselect'
 import { pipe, not, isNil, map, filter, prop, propOr, indexBy, nthArg, uncurryN } from 'ramda'
+import getCurrentAgent from 'dogstack-agents/agents/getters/getCurrentAgent'
 
 export const getState = state => state
 export const getConfig = prop('config')
 
 export const getHomeProps = (state) => ({})
 
-export const getRoutes = pipe(
+export const getAllRoutes = pipe(
   nthArg(1),
   propOr(null, 'routes')
 )
 
+export const getRoutes = createSelector(
+  getState,
+  getAllRoutes,
+  uncurryN(2, state => filter(route => {
+    const { selector } = route
+    return isNil(selector) || selector(state)
+  }))
+)
+
 const indexByName = indexBy(prop('name'))
 const filterNil = filter(pipe(isNil, not))
 export const getNavigationRoutes = createSelector(
@@ -29,6 +39,14 @@ export const getNavigationRoutes = createSelector(
 )
 
 export const getLayoutProps = createStructuredSelector({
+  currentAgent: getCurrentAgent,
   routes: getRoutes,
   navigationRoutes: getNavigationRoutes
 })
+
+// GK: just temporary so i can see that shit is flowing
+export const getTaskPlans = (state) => state.taskPlans
+
+export const getDashboardProps = createStructuredSelector({
+  taskPlans: getTaskPlans
+})

app/locales/en.json

@@ -1,12 +1,11 @@
 {
   "app.name": "Cobuy",
   "app.closeMenu": "close menu",
+  "app.home": "home",
   "app.dashboard": "dashboard",
-  "app.logOut": "log out",
   "app.startOrder": "start order",
   "agents.nameLabel": "name",
   "agents.descriptionLabel": "description",
-  "agents.logout": "log out",
   "agents.email": "email",
   "agents.role": "role",
   "agents.password": "password",
@@ -17,7 +16,9 @@
   "agents.editProfile": "edit profile",
   "agents.saveProfile": "save profile",
   "agents.createAccount": "create new account",
+  "agents.register": "register",
   "agents.signIn": "sign in",
+  "agents.logOut": "log out",
   "agents.welcome": "hey, welcome to cobuy!",
   "agents.signInWith": "sign in with...",
   "agents.saveAvatar": "save avatar",

app/stories/Dashboard.js

@@ -1,9 +1,16 @@
 import React from 'react'
 import { storiesOf } from '@storybook/react'
+import { action } from '@storybook/addon-actions'
 
 import Dashboard from '../components/Dashboard'
 
+const actions = {
+  ordering: {
+    startOrder: action('ordering.startOrder')
+  }
+}
+
 storiesOf('app.Dashboard', module)
   .add('default', () => (
-    <Dashboard startOrder={() => console.log('start the machine')} />
+    <Dashboard actions={actions} />
   ))

app/stories/Navigation.js

@@ -5,5 +5,5 @@ import Navigation from '../components/Navigation'
 
 storiesOf('app.Navigation', module)
   .add('default', () => (
-    <Navigation />
+    <Navigation navigationRoutes={[]} />
   ))

db/migrations/20170713153018_add-tasks.js

@@ -0,0 +1,21 @@
+exports.up = function (knex, Promise) {
+  return Promise.all([
+    knex.schema.createTableIfNotExists('taskPlans', function (table) {
+      table.increments('id')
+      table.string('taskRecipeId').notNullable()
+      table.string('assignee').notNullable()
+    }),
+    knex.schema.createTableIfNotExists('taskWorks', function (table) {
+      table.increments('id')
+      table.integer('taskPlanId').references('taskPlans.id').notNullable()
+      table.integer('workerAgentId').references('agents.id').notNullable()
+    })
+  ])
+}
+
+exports.down = function (knex, Promise) {
+  return Promise.all([
+    knex.schema.dropTableIfExists('taskPlans'),
+    knex.schema.dropTableIfExists('taskWorks')
+  ])
+}