Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 43 additions & 1 deletion frontend/components/App.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,52 @@
import React from 'react'
import Form from './Form'
import TodoList from './TodoList';

export default class App extends React.Component {
constructor() {
super();
this.state = {
data: [{
name: "Obtain Cat",
id: Date.now(),
completed: false
}],
}
}

handleSubmit = (e,item) => {
e.preventDefault();
if(item){
const newItem = {
name: item,
id: Date.now(),
completed: false
}
this.setState({data: [...this.state.data, newItem]})
}
}

toggleCompleted = itemId => {
this.setState({...this.state, data: this.state.data.map(task => {
if(task.id === itemId) {
return {...task,completed: !task.completed}
}
return task
})})
}

clearCompleted = () => {
this.setState({data: this.state.data.filter(task => {
if(!task.completed) return task;
})})
}


render() {
return (
<div>
Todo App
<TodoList toggleCompleted={this.toggleCompleted} data={this.state.data}/>
<Form clear={this.clearCompleted} submit={this.handleSubmit} test={this.state.test}/>
</div>
)
}
Expand Down
21 changes: 20 additions & 1 deletion frontend/components/Form.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,29 @@
import React from 'react'


export default class Form extends React.Component {
constructor () {
super();
this.state = {
form: ''
}
}
submit = (e,item) => {
this.props.submit(e,this.state.form)
this.setState({form: ''})
}

change = (e) => {
e.preventDefault()
this.setState({...this.state.form, form: e.target.value})
}
render() {
return (
<div>
Form
<form onSubmit={this.submit}>
<input type="text" name='form' onChange={this.change} value={this.state.form}/><button>Submit</button>
</form>
<button onClick={this.props.clear}>Clear Completed</button>
</div>
)
}
Expand Down
7 changes: 5 additions & 2 deletions frontend/components/Todo.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import React from 'react'

export default class Todo extends React.Component {

render() {
return (
<div>
Todo
<div className={`item${this.props.task.completed ? 'completed' : ''}`}
onClick={() => this.props.toggleCompleted(this.props.task.id)}>
<h2>{this.props.task.name}</h2>

</div>
)
}
Expand Down
12 changes: 10 additions & 2 deletions frontend/components/TodoList.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
import React from 'react'
import Todo from './Todo'

export default class TodoList extends React.Component {




render() {
return (
<div>
TodoList
<div className='Todo-list'>
{this.props.data.map(task => (
<Todo toggleCompleted={this.props.toggleCompleted} key={task.id} task={task}/>
))}

</div>
)
}
Expand Down
4 changes: 4 additions & 0 deletions frontend/styles/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,7 @@ ul, form {
.todo:hover {
cursor: pointer;
}

.itemcompleted {
text-decoration: line-through;
}