sunday

backend/node-postgres-promises/index.js

@@ -8,7 +8,7 @@ router.get('/api/terrific_thrasher2', db.getAllTasks);
 // router.get('/api/terrific_thrasher2/:id', db.getSingleTask);
 router.post('/api/terrific_thrasher2', db.createTask);
 // router.put('/api/terrific_thrasher2/:id', db.updateTask);
-// router.delete('/api/terrific_thrasher2/:id', db.removeTask);
+router.delete('/api/terrific_thrasher2', db.removeTask);
 
 
 module.exports = router;

backend/node-postgres-promises/queries.js

@@ -73,7 +73,6 @@ function createTask(req, res, next) {
   db.any('insert into task_list(task, is_complete)' + ' values(${task}, ${isCompleted})',
     req.body)
     .then(function () {
-      console.log('???')
       res.status(200)
         .json({
           status: 'success',
@@ -103,20 +102,14 @@ function updateTask(req, res, next) {
 }
 
 function removeTask(req, res, next) {
-  var taskID = parseInt(req.params.id);
-  db.result('delete from task_list where id = $1', taskID)
-    .then(function (result) {
-      /* jshint ignore:start */
-      res.status(200)
-        .json({
-          status: 'success',
-          message: `Removed ${result.rowCount} task`
-        });
-      /* jshint ignore:end */
-    })
-    .catch(function (err) {
-      return next(err);
-    });
+  var id = req.params;
+  db.none( `
+        BEGIN TRANSACTION;
+        DELETE FROM task_lists WHERE id = ${id};
+        COMMIT;
+        ` )
+      .then( response.status( 200 ).json({ status: 'success', message: 'SUCCESSFULLY DELETED' }) )
+      .catch( error => next( error ))
 }
 
 module.exports = {

src/components/app.js

@@ -45,7 +45,7 @@ export default class App extends React.Component{
     todos = [...todos, currentTodo]
     // this.state.todos.push( currentTodo )
 
-    this.setState({ todos: this.state.todos })
+    this.setState({ todos: todos })
 
     var request = new Request('http://localhost:3000/api/terrific_thrasher2', {
       method: 'POST',
@@ -56,12 +56,7 @@ export default class App extends React.Component{
     // xmlhttprequest()
 
     fetch(request)
-      .then(function(res){
-        res.json()
-          .then(function(currentTodo){
-            console.log(currentTodo)
-          })
-      })
+      // .then(res => res.json())
   }
 
   saveTask(oldTask, newTask) {
@@ -70,19 +65,33 @@ export default class App extends React.Component{
     this.setState({ todos: this.state.todos })
   }
 
-  deleteTask(taskToDelete) {
+  deleteTask(id) {
+    console.log(id)
     let { todos } = this.state
-    const copy = [...todos]
-    console.log('before delete', todos.length)
-    let index = todos.indexOf(taskToDelete)
-    console.log('taskToDelete', taskToDelete)
-    if(index>-1) {
-      copy.length = copy.length - 1
+    console.log(todos)
+    var index = -1
+    while(index<todos.length) {
+      index++
+      if(todos[index].id == id) {break}
+    }
+    console.log(index,todos.length)
+    if(index<todos.length){
+      todos.splice(index,1)
+      todos = [...todos]
     }
+    console.log(todos.length)
+    this.setState({ todos: todos })
+
+    let request = new Request('http://localhost:3000/api/terrific_thrasher2', {
+      method: 'DELETE',
+      mode: 'cors',
+      headers: new Headers({'Content-Type': 'application/json'}),
+    })
 
-    todos = copy
-    console.log('indexOf', index)
-    // fetch()
+    let deleteString = 'http://localhost:3000/api/terrific_thrasher2'
+    deleteString += `/${id}`
+    console.log('prerequest')
+    fetch(deleteString, request)
   }
 
 }

src/components/create-todo.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-export default class TodosListItem extends React.Component{
+export default class CreateTodo extends React.Component{
   constructor(props) {
     super(props);
 

src/components/todos-list-item.js

@@ -43,7 +43,7 @@ export default class TodosListItem extends React.Component{
     return(
       <td>
         <button onClick={this.onEditClick.bind(this)}>Edit</button>
-        <button onClick={this.props.deleteTask.bind(this, this.props.task)}>Delete</button>
+        <button onClick={this.props.deleteTask.bind(this, this.props.id)}>Delete</button>
       </td>
     )
   }

src/components/todos-list.js

@@ -4,6 +4,9 @@ import _ from 'lodash';
 import TodosListItem from './todos-list-item';
 
 export default class TodosList extends React.Component{
+  constructor(props){
+    super(props)
+  }
   renderItems() {
     //
     // const props = _.omit(this.props, 'todos');