diff --git a/frontend/components/App.js b/frontend/components/App.js index 815684369..326c17004 100644 --- a/frontend/components/App.js +++ b/frontend/components/App.js @@ -1,9 +1,92 @@ -import React from 'react' +import React from 'react'; +import axios from 'axios'; +import Form from './Form'; +import TodoList from './TodoList'; const URL = 'http://localhost:9000/api/todos' -export default class App extends React.Component { - render() { - return null +export default class App extends React.Component { + + state = { + todos: [], + error: '', + todoNameInput: '', + displayCompleted: true, + } + + onNameChange = evt => { + const {value} = evt.target + this.setState({...this.state, todoNameInput: value}) + } + + resetForm = () =>{ + this.setState({...this.state, todoNameInput: ''}) + } + + setAxiosResponseError = err => this.setState({...this.state, error: err.response.data.message}) + + postNewTodo = () => { + + axios.post(URL, {name: this.state.todoNameInput}) + .then(res =>{ + this.setState({...this.state, todos: this.state.todos.concat(res.data.data)}) + this.resetForm() + }) + .catch(this.setAxiosResponseError) + } + + onTodoFormSubmit = evt => { + evt.preventdefault() + this.postNewTodo() + } + + fetchAllTodos = () => { + axios.get(URL) + .then(res => { + this.setState({...this.state, todos: res.data.data}) + }) + .catch(this.setAxiosResponseError) } + + toggleCompleted = id => evt => { + axios.patch(`${URL}/${id}`) + .then(res => { + this.setState({...this.state, todos: this.state.todos.map(td => { + if (td.id !== id) return td + return res.data.data + })}) + }) + .catch(err => { + + }) + } + toggleDisplayCompleted = () => { + this.setState({...this.state, displayCompleted: this.state.displayCompleted}) + } + + componentDidMount(){ + this.fetchAllTodos() + } + + + render() { + return ( + +
+
Error: {this.state.error}
+ +
+ +
+ ) + } + } diff --git a/frontend/components/Form.js b/frontend/components/Form.js index 3932207be..a60851108 100644 --- a/frontend/components/Form.js +++ b/frontend/components/Form.js @@ -2,6 +2,21 @@ import React from 'react' export default class Form extends React.Component { render() { - return null + return ( +
+ + + + + +
+ ) } } diff --git a/frontend/components/Todo.js b/frontend/components/Todo.js index aac687f6d..2b46df564 100644 --- a/frontend/components/Todo.js +++ b/frontend/components/Todo.js @@ -2,6 +2,11 @@ import React from 'react' export default class Todo extends React.Component { render() { - return null + return ( +
+ {this.props.todo.name} + {this.props.todo.completed ? '✅': ''}
+ ) } } diff --git a/frontend/components/TodoList.js b/frontend/components/TodoList.js index ce08a27ba..1e20229f0 100644 --- a/frontend/components/TodoList.js +++ b/frontend/components/TodoList.js @@ -1,7 +1,26 @@ import React from 'react' +import Todo from './Todo' export default class TodoList extends React.Component { render() { - return null + return ( +
+

Todos:

+ { + this.props.todos.reduce((acc, td) => { + if (this.props.displayCompleted|| + !td.completed) return acc.concat + ( + + ) + return acc + }, []) + } + +
+ ) } }