get todos from api

mosufy · Oct 27, 2016 · b839878 · b839878
1 parent 05e75ff
commit b839878
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 20 deletions.
diff --git a/public/js/bundle.js b/public/js/bundle.js
@@ -32325,11 +32325,6 @@
 	    value: function componentWillMount() {
 	      this.props.getTodos(this.props.auth.accessToken);
 	    }
-	  }, {
-	    key: 'componentDidMount',
-	    value: function componentDidMount() {
-	      console.log('ToDo list updated');
-	    }
 	  }, {
 	    key: 'render',
 	    value: function render() {
@@ -32557,8 +32552,6 @@
 	    value: function render() {
 	      var _this2 = this;
 
-	      var toggleCompleted = this.props.toggleCompleted;
-
 	      if (this.props.items.length == 0) {
 	        return _react2.default.createElement(
 	          'div',
@@ -32582,13 +32575,15 @@
 	          }
 
 	          var itemText = item.text;
+	          var defaultChecked;
 
 	          if (item.completed) {
 	            itemText = _react2.default.createElement(
 	              'del',
 	              null,
 	              item.text
 	            );
+	            defaultChecked = 'defaultChecked';
 	          }
 
 	          return _react2.default.createElement(
@@ -32597,7 +32592,7 @@
 	            _react2.default.createElement(
 	              'label',
 	              null,
-	              _react2.default.createElement('input', { id: item.id, type: 'checkbox', value: item.id, onClick: toggleCompleted, defaultChecked: item.completed ? 'defaultChecked' : '' }),
+	              _react2.default.createElement('input', { id: item.id, type: 'checkbox', value: item.id, onClick: _this2.props.toggleCompleted, defaultChecked: defaultChecked }),
 	              itemText
 	            )
 	          );
@@ -32963,9 +32958,9 @@
 	      var items = [];
 	      for (var i = 0; i < todos.length; i++) {
 	        items.push({
-	          id: todos[i].attributes.id,
+	          id: todos[i].attributes.uid,
 	          text: todos[i].attributes.title,
-	          completed: todos[i].attributes.isCompleted
+	          completed: todos[i].attributes.is_completed
 	        });
 	      }
 	      return items;

diff --git a/public/js/bundle.js.map b/public/js/bundle.js.map
diff --git a/resources/app/components/MyTodoItems.js b/resources/app/components/MyTodoItems.js
@@ -10,8 +10,6 @@ import React from 'react';
 
 export default class MyTodoItems extends React.Component {
   render() {
-    var toggleCompleted = this.props.toggleCompleted;
-
     if (this.props.items.length == 0) {
       return (
         <div>
@@ -33,17 +31,19 @@ export default class MyTodoItems extends React.Component {
           }
 
           var itemText = item.text;
+          var defaultChecked;
 
           if (item.completed) {
             itemText = (
               <del>{item.text}</del>
             );
+            defaultChecked = 'defaultChecked';
           }
 
           return (
             <div className="checkbox" key={item.id}>
               <label>
-                <input id={item.id} type="checkbox" value={item.id} onClick={toggleCompleted} defaultChecked={item.completed ? 'defaultChecked' : ''}/>{itemText}
+                <input id={item.id} type="checkbox" value={item.id} onClick={this.props.toggleCompleted} defaultChecked={defaultChecked}/>{itemText}
               </label>
             </div>
           );

diff --git a/resources/app/containers/DashboardContainer.js b/resources/app/containers/DashboardContainer.js
@@ -17,10 +17,6 @@ class DashboardContainer extends React.Component {
     this.props.getTodos(this.props.auth.accessToken);
   }
 
-  componentDidMount() {
-    console.log('ToDo list updated');
-  }
-
   render() {
     return (
       <MyTodo items={this.props.todos}

diff --git a/resources/app/reducers/todos.js b/resources/app/reducers/todos.js
@@ -41,9 +41,9 @@ const todos = (state = [], action) => {
       var items = [];
       for (var i = 0; i < todos.length; i++) {
         items.push({
-          id: todos[i].attributes.id,
+          id: todos[i].attributes.uid,
           text: todos[i].attributes.title,
-          completed: todos[i].attributes.isCompleted
+          completed: todos[i].attributes.is_completed
         });
       }
       return items;