6 files changed, 16 insertions, 60 deletions
diff --git a/client/components/App.jsx b/client/components/App.jsx
index 1a7e854..9743a90 100644
--- a/client/components/App.jsx
+++ b/client/components/App.jsx
@@ -1,7 +1,6 @@
 import React from 'react'
 import LoggedOutView from './LoggedOutView.jsx'
 import LoggedInView from './LoggedInView.jsx'
-
 import client from '../client'
 
 export default class App extends React.Component {
diff --git a/client/components/LoggedInView.jsx b/client/components/LoggedInView.jsx
index ecf1356..c6623dd 100644
--- a/client/components/LoggedInView.jsx
+++ b/client/components/LoggedInView.jsx
@@ -3,7 +3,6 @@ import ModalDialog from './ModalDialog.jsx'
 import Menu from './Menu.jsx'
 import UserList from './UserList.jsx'
 import MealList from './MealList.jsx'
-
 import client from '../client'
 
 export default class LoggedInView extends React.Component {
diff --git a/client/components/MealFilter.jsx b/client/components/MealFilter.jsx
index c62f232..b576418 100644
--- a/client/components/MealFilter.jsx
+++ b/client/components/MealFilter.jsx
@@ -1,10 +1,7 @@
 import React from 'react'
-
-import client from '../client'
-
-import moment from 'moment'
-
 import { DateRange } from 'react-date-range';
+import moment from 'moment'
+import client from '../client'
 
 export default class MealFilter extends React.Component {
   constructor(){
@@ -123,48 +120,3 @@ export default class MealFilter extends React.Component {
     )
   }
 }
-
-
-// class MealFilter extends React.Component {
-//   constructor(props){
-//     super()
-//     this.state = {
-//       fromDate: new Date (),
-//       toDate: new Date (),
-//       fromTime: new Date (),
-//       toTime: new Date (),
-//     }
-//     this.updateState = this.updateState.bind(this)
-//   }
-//   updateState(e){
-//     const name = event.target.name
-//     let value = event.target.value
-//     if (name === 'date') {
-//       value = new Date(value + 'T' + this.state.date.split("T")[1] ).toString()
-//     } else if (name === 'time') {
-//       value = new Date(this.state.date.split("T")[0] + value).toString()
-//     }
-//     this.setState({
-//       [name]: value,
-//       error: null,
-//     })
-//   }
-//   render () {
-//     const fromDate = parseDate(this.state.fromDate)
-//     const toDate = parseDate(this.state.toDate)
-//     const fromTime = parseTime(this.state.fromTime)
-//     const toTime = parseTime(this.state.toTime)
-//     return (
-//       <div>
-//         Filter by date:
-//         <input type='date' name='fromDate' placeholder='From date' value={fromDate} required onChange={this.updateState} />
-//         to
-//         <input type='date' name='toDate' placeholder='To date' value={toDate} required onChange={this.updateState} />
-//         and from time
-//         <input type='time' name='fromTime' placeholder='From iime' value={fromTime} required onChange={this.updateState} step='3600' />
-//         to
-//         <input type='time' name='toTime' placeholder='To time' value={toTime} required onChange={this.updateState} step='3600' />
-//       </div>
-//     )
-//   }
-// }
diff --git a/client/components/MealList.jsx b/client/components/MealList.jsx
index ef13ac9..76cdd25 100644
--- a/client/components/MealList.jsx
+++ b/client/components/MealList.jsx
@@ -1,8 +1,6 @@
 import React from 'react'
-
-import client from '../client'
-
 import MealFilter from './MealFilter.jsx'
+import client from '../client'
 
 export default class MealList extends React.Component {
   constructor(props) {
diff --git a/client/components/Menu.jsx b/client/components/Menu.jsx
index 452c395..11ec938 100644
--- a/client/components/Menu.jsx
+++ b/client/components/Menu.jsx
@@ -39,9 +39,9 @@ export default class Menu extends React.Component {
     items.push( <li key='goal' onMouseDown={this.setGoal}><a href='#'>Goal</a>: {user.goal} cal</li> )
     switch (currentUser.role) {
       case 'admin':
-//         if (this.props.user.id !== this.props.currentUser.id) {
-//           items.push( <li key='resetUser'><a href='#' onClick={this.resetUser}>Stop viewing</a></li> )
-//         }
+        // if (this.props.user.id !== this.props.currentUser.id) {
+        //   items.push( <li key='resetUser'><a href='#' onClick={this.resetUser}>Stop viewing</a></li> )
+        // }
         items.push( <li key='userlist'><a href='#' onClick={this.props.toggleMode}>Users</a></li> )
         items.push( <li key='meallist'><a href='#' onClick={this.props.toggleMode}>Meals</a></li> )
         break
diff --git a/client/components/UserList.jsx b/client/components/UserList.jsx
index 3e87ec5..7430e61 100644
--- a/client/components/UserList.jsx
+++ b/client/components/UserList.jsx
@@ -20,7 +20,7 @@ export default class UserList extends React.Component {
       console.error(error)
     })
     this.pick.bind(this)
-    console.log(props)
+    this.handleDelete.bind(this)
   }
   pick(user){
     // bubble this up..
@@ -28,6 +28,14 @@ export default class UserList extends React.Component {
     console.log(this)
     this.props.updateUser(user)
   }
+  handleDelete(userid) {
+    const users = this.state.data.filter((data) => {
+      return data.id !== userid
+    })
+    this.setState({
+      data: users
+    })
+  }
   render() {
     console.log(this.state.data)
     const items = this.state.data.map((user,i) => {
@@ -36,7 +44,7 @@ export default class UserList extends React.Component {
           user={user}
           activeUser={this.props.user}
           onClick={(user) => this.pick(user)}
-          onDelete={this.handleDelete} />
+          onDelete={(userid) => this.handleDelete(userid)} />
       )
     })
     return (