Merge pull request #5 from jspaine/reactify/mod_packing

packing list and volunteer components

app/controllers/packing.server.controller.js

@@ -8,13 +8,14 @@ const beginWeek = moment.utc().startOf('isoWeek');
 
 export default {
   pack: async function(req, res, next) {
-    const {customerIds, items} = req.body;
-
+    const {customers, items} = req.body;
     try {
       const updatedCustomers = await Promise.all(
-        customerIds.map(async id =>
-          Customer.findByIdAndUpdate(id,
-            {lastPacked: beginWeek}, {new: true})
+        customers.map(async customer =>
+          Customer.findByIdAndUpdate(Number(customer.id), {
+            lastPacked: beginWeek,
+            packingList: customer.packingList.map(item => item._id)
+          }, {new: true})
         )
       );
 

public/modules/common/components/ClientStatusLabel.js

@@ -0,0 +1,18 @@
+import React from 'react'
+
+const labelMap = {
+  'Accepted': 'success',
+  'Active': 'success',
+  'Rejected': 'danger',
+  'Pending': 'info',
+  'Inactive': 'warning'
+}
+
+const ClientStatusLabel = ({client}) =>
+  <span
+    className={`label label-${client.driver ? 'info' : labelMap[client.status]}`}
+  >
+    {client.driver ? 'Driver' : client.status}
+  </span>
+
+export default ClientStatusLabel

public/modules/common/components/FoodbankLogo.js

@@ -0,0 +1,15 @@
+import React from 'react'
+import {connect} from 'react-redux'
+
+const mapStateToProps = state => ({
+  settings: state.settings.data,
+  media: state.media.data
+})
+
+const FoodbankLogo = ({settings, media}) =>
+  <img
+    alt={settings && settings.organization}
+    src={media && media.logoPath + media.logoFile}
+  />
+
+export default connect(mapStateToProps)(FoodbankLogo)

public/modules/core/components/home.js

@@ -4,7 +4,7 @@ import {Provider} from 'react-redux'
 import {AppContainer} from 'react-hot-loader'
 import angular from 'angular';
 
-import FoodbankLogo from '../../media/components/foodbank-logo'
+import FoodbankLogo from '../../common/components/FoodbankLogo'
 
 const Home = () =>
   <section className="content-header">

public/modules/customer/components/CustomerCreate.js

@@ -1,7 +1,7 @@
 import React, {Component} from 'react'
 import {connect} from 'react-redux'
 import {stateGo} from 'redux-ui-router'
-import {fill, get, set, take} from 'lodash'
+import set from 'lodash/set'
 import {utc} from 'moment'
 
 import {Form} from '../../common/services/form'
@@ -14,7 +14,7 @@ import {loadSections} from '../../../store/section';
 import Page from '../../common/components/Page'
 import DynamicForm from '../../common/components/DynamicForm'
 import Household from './Household'
-import FoodbankLogo from '../../media/components/foodbank-logo'
+import FoodbankLogo from '../../common/components/FoodbankLogo'
 
 const mapStateToProps = state => ({
   user: state.auth.user,
@@ -55,15 +55,15 @@ class CustomerCreate extends Component {
   componentWillReceiveProps(nextProps) {
     const {
       savingCustomers,
-      savingCustomerError,
+      saveCustomersError,
       loadingFormData,
       loadFormDataError,
       getCustomer
     } = nextProps
 
     // Tried to save customer
     if (this.props.savingCustomers && !savingCustomers) {
-      this.setState({error: savingCustomerError})
+      this.setState({error: saveCustomersError})
     }
 
     // Tried to load form data

public/modules/customer/components/CustomerCreateSuccess.js

@@ -1,17 +1,17 @@
 import React from 'react'
 import {connect} from 'react-redux'
 
-import FoodbankLogo from '../../media/components/foodbank-logo'
+import FoodbankLogo from '../../common/components/FoodbankLogo'
 
 const mapStateToProps = state => ({
   settings: state.settings.data
 });
 
 const CustomerCreateSuccess = ({settings}) =>
-  <section class="row text-center">
+  <section className="row text-center">
     <FoodbankLogo />
-    <h3 class="col-md-12">Successfully submited. Thank you!</h3>
-    <a href="/#!/" class="col-md-12">Go to {settings.organization}'s Homepage</a>
+    <h3 className="col-md-12">Successfully submited. Thank you!</h3>
+    <a href="/#!/" className="col-md-12">Go to {settings && settings.organization}'s Homepage</a>
   </section>
 
 export default connect(mapStateToProps)(CustomerCreateSuccess)

public/modules/customer/components/CustomerEdit.js

@@ -1,7 +1,7 @@
 import React, {Component} from 'react'
 import {connect} from 'react-redux'
 import {stateGo} from 'redux-ui-router'
-import {get, set} from 'lodash'
+import set from 'lodash/set'
 import {utc} from 'moment'
 
 import {Form} from '../../common/services/form'
@@ -59,7 +59,7 @@ class CustomerEdit extends Component {
   componentWillReceiveProps(nextProps) {
     const {
       savingCustomers,
-      savingCustomerError,
+      saveCustomersError,
       loadingCustomers,
       loadCustomersError,
       loadingFormData,
@@ -69,7 +69,7 @@ class CustomerEdit extends Component {
 
     // Tried to save customer
     if (this.props.savingCustomers && !savingCustomers) {
-      this.setState({error: savingCustomerError})
+      this.setState({error: saveCustomersError})
     }
 
     // Tried to load customer

public/modules/customer/components/CustomerList.js

@@ -5,7 +5,7 @@ import {Table} from 'react-bootstrap'
 import {selectors} from '../../../store';
 import {loadCustomers} from '../../../store/customer';
 
-import CustomerStatusLabel from './CustomerStatusLabel'
+import ClientStatusLabel from '../../common/components/ClientStatusLabel'
 import Page from '../../common/components/Page'
 
 const mapStateToProps = state => ({
@@ -59,7 +59,7 @@ class CustomerList extends Component {
                       <td><span>{customer.deliveryInstructions}</span></td>
                       <td><span>{customer.householdSummary}</span></td>
                       <td><span>{customer.assignedTo && customer.assignedTo.fullName}</span></td>
-                      <td><CustomerStatusLabel customer={customer} /></td>
+                      <td><ClientStatusLabel client={customer} /></td>
                       <td>
                         <a
                           href={`/#!/admin/customers/${customer.id}`}

public/modules/customer/components/CustomerView.js

@@ -17,8 +17,8 @@ import Page from '../../common/components/Page'
 
 const mapStateToProps = state => ({
   user: state.auth.user,
-  savingCustomer: state.customer.saving,
-  savingCustomerError: state.customer.saveError,
+  savingCustomers: selectors.savingCustomers(state),
+  saveCustomersError: selectors.saveCustomersError(state),
   loadingCustomers: selectors.loadingCustomers(state),
   loadCustomersError: selectors.loadCustomersError(state),
   getCustomer: selectors.getOneCustomer(state),
@@ -59,18 +59,17 @@ class CustomerView extends Component {
   componentWillReceiveProps(nextProps) {
     const {
       savingCustomers,
-      savingCustomerError,
+      saveCustomersError,
       loadingCustomers,
       loadCustomersError,
       loadingFormData,
       loadFormDataError,
       getCustomer
     } = nextProps
 
-    // try setstate((prevState, prevProps) => ...)
     // Tried to save customer
     if (this.props.savingCustomers && !savingCustomers) {
-      this.setState({error: savingCustomerError})
+      this.setState({error: saveCustomersError})
     }
 
     // Tried to load customer
@@ -91,7 +90,6 @@ class CustomerView extends Component {
         ...customer,
         foodPreferences: this.getFoodPreferences(customer)
       }
-      // console.log('customerView', View.methods.generate(customerModel, this.formData, 'qClients'))
 
       this.setState({
         customerModel,