diff --git a/README.md b/README.md
index dbb87e138..8c49628b1 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # React ToDo App
-- Replace `<your_account>` with your Github username in the [DEMO LINK](https://<your_account>.github.io/react_todo-app/)
+- Replace `<your_account>` with your Github username in the [DEMO LINK](https://alenaloik.github.io/react_todo-app/)
 - Follow the [React task guideline](https://github.com/mate-academy/react_task-guideline#react-tasks-guideline)
 
 ## Description
diff --git a/src/App.js b/src/App.js
index 13ea9e061..aa472ca50 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,85 +1,164 @@
-import React from 'react';
-
-function App() {
-  return (
-    <section className="todoapp">
-      <header className="header">
-        <h1>todos</h1>
-
-        <input
-          className="new-todo"
-          placeholder="What needs to be done?"
-        />
-      </header>
-
-      <section className="main">
-        <input type="checkbox" id="toggle-all" className="toggle-all" />
-        <label htmlFor="toggle-all">Mark all as complete</label>
-
-        <ul className="todo-list">
-          <li>
-            <div className="view">
-              <input type="checkbox" className="toggle" id="todo-1" />
-              <label htmlFor="todo-1">asdfghj</label>
-              <button type="button" className="destroy" />
-            </div>
-            <input type="text" className="edit" />
-          </li>
-
-          <li className="completed">
-            <div className="view">
-              <input type="checkbox" className="toggle" id="todo-2" />
-              <label htmlFor="todo-2">qwertyuio</label>
-              <button type="button" className="destroy" />
-            </div>
-            <input type="text" className="edit" />
-          </li>
-
-          <li className="editing">
-            <div className="view">
-              <input type="checkbox" className="toggle" id="todo-3" />
-              <label htmlFor="todo-3">zxcvbnm</label>
-              <button type="button" className="destroy" />
-            </div>
-            <input type="text" className="edit" />
-          </li>
-
-          <li>
-            <div className="view">
-              <input type="checkbox" className="toggle" id="todo-4" />
-              <label htmlFor="todo-4">1234567890</label>
-              <button type="button" className="destroy" />
-            </div>
-            <input type="text" className="edit" />
-          </li>
-        </ul>
-      </section>
+import React, { Component } from 'react';
+import TodoList from './components/TodoList/TodoList';
+import { Footer } from './components/Footer/Footer';
+import { Header } from './components/Header/Header';
+
+class App extends Component {
+  state = {
+    todos: [],
+    showParam: 'all',
+  };
+
+  addTodo = (todo) => {
+    this.setState(prevState => ({
+      todos: [...prevState.todos, todo],
+    }));
+  }
+
+  updateTodosToShow = (todoToShow) => {
+    this.setState({ showParam: todoToShow });
+  }
+
+  handleRemove = (id) => {
+    this.setState(prevState => ({
+      todos: prevState.todos.filter(todo => (
+        todo.id !== id
+      )),
+    }));
+  }
+
+  handleDobleClick = ({ id }) => {
+    this.setState(prevState => ({
+      todos: prevState.todos.map(todo => (
+        (todo.id !== id) ? ({
+          ...todo, editing: false,
+        }) : ({
+          ...todo, editing: true,
+        })
+      )),
+    }));
+  }
+
+  editTodo = (content) => {
+    if (content) {
+      this.setState(prevState => ({
+        todos: prevState.todos.map(todo => (
+          (todo.editing) ? ({
+            ...todo, content,
+          }) : todo)),
+      }));
+    } else {
+      this.setState(prevState => ({
+        todos: prevState.todos.filter(todo => (
+          !todo.editing
+        )),
+      }));
+    }
+  }
+
+  handleRemoveCompleted = () => {
+    this.setState(prevState => ({
+      todos: prevState.todos.filter(todo => (
+        !todo.completed
+      )),
+    }));
+  }
 
-      <footer className="footer">
-        <span className="todo-count">
-          3 items left
-        </span>
-
-        <ul className="filters">
-          <li>
-            <a href="#/" className="selected">All</a>
-          </li>
-
-          <li>
-            <a href="#/active">Active</a>
-          </li>
-
-          <li>
-            <a href="#/completed">Completed</a>
-          </li>
-        </ul>
-
-        <button type="button" className="clear-completed">
-          Clear completed
-        </button>
-      </footer>
-    </section>
-  );
+  toggleComplete = (id) => {
+    this.setState(prevState => ({
+      todos: prevState.todos.map((todo) => {
+        if (todo.id === id) {
+          return {
+            ...todo,
+            completed: !todo.completed,
+          };
+        }
+
+        return todo;
+      }),
+    }));
+  }
+
+  toggleCompleteAll = () => {
+    if (this.state.todos.every(todo => (todo.completed))) {
+      this.setState(prevState => ({
+        todos: prevState.todos.map(todo => ({
+          ...todo,
+          completed: false,
+        })),
+      }));
+    } else {
+      this.setState(prevState => ({
+        todos: prevState.todos.map(todo => ({
+          ...todo,
+          completed: true,
+        })),
+      }));
+    }
+  }
+
+  getTodos = (status) => {
+    let todoView = [];
+    const { todos } = this.state;
+
+    switch (status) {
+      case 'active':
+        todoView = todos.filter(todo => (
+          !todo.completed
+        ));
+        break;
+      case 'completed':
+        todoView = todos.filter(todo => (
+          todo.completed
+        ));
+        break;
+      default:
+        todoView = todos;
+    }
+
+    return todoView;
+  }
+
+  render() {
+    const { todos, showParam } = this.state;
+    const todoView = this.getTodos(showParam);
+    const itemLeft = todos.filter(todo => (
+      !todo.completed)).length;
+
+    return (
+      <section className="todoapp">
+        <Header addTodo={this.addTodo} />
+        {(todos.length)
+          ? (
+            <>
+              <section className="main">
+                <input
+                  onClick={this.toggleCompleteAll}
+                  checked={!itemLeft}
+                  type="checkbox"
+                  id="toggle-all"
+                  className="toggle-all"
+                />
+                <label htmlFor="toggle-all">Mark all as complete</label>
+                <TodoList
+                  todos={todoView}
+                  remove={this.handleRemove}
+                  toggleComplete={this.toggleComplete}
+                  handleDobleClick={this.handleDobleClick}
+                  editTodo={this.editTodo}
+                />
+              </section>
+              <Footer
+                itemLeft={itemLeft}
+                todos={todos}
+                updateTodosToShow={this.updateTodosToShow}
+                handleRemoveCompleted={this.handleRemoveCompleted}
+              />
+            </>
+          ) : ''}
+      </section>
+    );
+  }
 }
 
 export default App;
diff --git a/src/components/Footer/Footer.css b/src/components/Footer/Footer.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/components/Footer/Footer.js b/src/components/Footer/Footer.js
new file mode 100644
index 000000000..fba79705b
--- /dev/null
+++ b/src/components/Footer/Footer.js
@@ -0,0 +1,46 @@
+import React from 'react';
+import './Footer.css';
+import PropTypes from 'prop-types';
+import { TodosFilter } from '../TodosFilter/TodosFilter';
+
+export const Footer = ({
+  todos,
+  updateTodosToShow,
+  handleRemoveCompleted,
+  itemLeft,
+}) => (
+  <footer className="footer">
+    <span className="todo-count">
+      {itemLeft}
+      {' '}
+      item left
+    </span>
+    <TodosFilter updateTodosToShow={updateTodosToShow} />
+    {
+      (todos.filter(todo => (todo.completed)).length)
+        ? (
+          <button
+            onClick={handleRemoveCompleted}
+            type="button"
+            className="clear-completed"
+          >
+            Clear completed
+          </button>
+        )
+        : ('')
+    }
+  </footer>
+);
+
+Footer.propTypes = {
+  todos: PropTypes.arrayOf(
+    PropTypes.shape({
+      content: PropTypes.string.isRequired,
+      id: PropTypes.number.isRequired,
+      completed: PropTypes.bool.isRequired,
+    }),
+  ).isRequired,
+  updateTodosToShow: PropTypes.func.isRequired,
+  handleRemoveCompleted: PropTypes.func.isRequired,
+  itemLeft: PropTypes.number.isRequired,
+};
diff --git a/src/components/Header/Header.css b/src/components/Header/Header.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js
new file mode 100644
index 000000000..1a79fa25a
--- /dev/null
+++ b/src/components/Header/Header.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import './Header.css';
+import PropTypes from 'prop-types';
+import NewTodo from '../NewTodo/NewTodo';
+
+export const Header = ({ addTodo }) => (
+  <header className="header">
+    <h1>todos</h1>
+    <NewTodo addTodo={addTodo} />
+  </header>
+);
+
+Header.propTypes = {
+  addTodo: PropTypes.func.isRequired,
+};
diff --git a/src/components/NewTodo/NewTodo.css b/src/components/NewTodo/NewTodo.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/components/NewTodo/NewTodo.js b/src/components/NewTodo/NewTodo.js
new file mode 100644
index 000000000..4cc7dd0ba
--- /dev/null
+++ b/src/components/NewTodo/NewTodo.js
@@ -0,0 +1,52 @@
+import React, { Component } from 'react';
+import './NewTodo.css';
+import PropTypes from 'prop-types';
+
+class NewTodo extends Component {
+  state = {
+    content: '',
+  }
+
+  handleChange = (event) => {
+    this.setState({
+      content: event.target.value.trim(),
+    });
+  }
+
+  handleSubmit = (e) => {
+    e.preventDefault();
+    const { content } = this.state;
+    const id = +Date.now();
+    const completed = false;
+    const todo = {
+      content, id, completed,
+    };
+
+    if (content) {
+      this.props.addTodo(todo);
+
+      this.setState(prevState => ({
+        content: '',
+      }));
+    }
+  }
+
+  render() {
+    return (
+      <form onSubmit={this.handleSubmit}>
+        <input
+          onChange={this.handleChange}
+          value={this.state.content}
+          className="new-todo"
+          placeholder="What needs to be done?"
+        />
+      </form>
+    );
+  }
+}
+
+export default NewTodo;
+
+NewTodo.propTypes = {
+  addTodo: PropTypes.func.isRequired,
+};
diff --git a/src/components/TodoList/TodoList.css b/src/components/TodoList/TodoList.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/components/TodoList/TodoList.js b/src/components/TodoList/TodoList.js
new file mode 100644
index 000000000..2f00ac632
--- /dev/null
+++ b/src/components/TodoList/TodoList.js
@@ -0,0 +1,104 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+
+class TodoList extends Component {
+  state = {
+    content: '',
+    submitEditing: true,
+  }
+
+  handleChange = (event) => {
+    this.setState({
+      content: event.target.value.trim(),
+    });
+  }
+
+  handleSubmit = (e) => {
+    e.preventDefault();
+    this.props.editTodo(this.state.content);
+    this.setState({
+      submitEditing: false,
+    });
+  }
+
+  handleEdit = (todo) => {
+    this.props.handleDobleClick(todo);
+    this.setState(() => ({
+      content: todo.content,
+      submitEditing: true,
+    }));
+  }
+
+  render() {
+    return (
+      <ul className="todo-list">
+        {this.props.todos.map(todo => (
+          <li
+            key={todo.id}
+            className={(todo.editing && this.state.submitEditing)
+              ? 'editing' : ''}
+          >
+            <form onSubmit={this.handleSubmit}>
+              <div className={todo.completed ? 'completed' : 'view'}>
+                <input
+                  onClick={() => {
+                    this.props.toggleComplete(todo.id);
+                  }}
+                  checked={todo.completed}
+                  type="checkbox"
+                  className="toggle"
+                  id={`todo-${todo.id}`}
+                />
+                <label
+                  htmlFor={`edit-${todo.id}`}
+                  onDoubleClick={() => {
+                    this.handleEdit(todo);
+                  }}
+                >
+                  {todo.content}
+                </label>
+                <button
+                  onClick={() => {
+                    this.props.remove(todo.id);
+                  }}
+                  type="button"
+                  className="destroy"
+                />
+              </div>
+              <input
+                type="text"
+                className="edit"
+                id={`edit-${todo.id}`}
+                value={this.state.content}
+                onChange={this.handleChange}
+                onKeyUp={(e) => {
+                  if (e.key === 'Escape') {
+                    this.setState({ submitEditing: false });
+                  }
+                }
+                }
+              />
+            </form>
+          </li>
+        ))
+        }
+      </ul>
+    );
+  }
+}
+
+export default TodoList;
+
+TodoList.propTypes = {
+  todos: PropTypes.arrayOf(
+    PropTypes.shape({
+      content: PropTypes.string.isRequired,
+      id: PropTypes.number.isRequired,
+      completed: PropTypes.bool.isRequired,
+    }),
+  ).isRequired,
+  remove: PropTypes.func.isRequired,
+  toggleComplete: PropTypes.func.isRequired,
+  handleDobleClick: PropTypes.func.isRequired,
+  editTodo: PropTypes.func.isRequired,
+};
diff --git a/src/components/TodosFilter/TodosFilter.css b/src/components/TodosFilter/TodosFilter.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/components/TodosFilter/TodosFilter.js b/src/components/TodosFilter/TodosFilter.js
new file mode 100644
index 000000000..d6038f946
--- /dev/null
+++ b/src/components/TodosFilter/TodosFilter.js
@@ -0,0 +1,26 @@
+import React from 'react';
+import './TodosFilter.css';
+import PropTypes from 'prop-types';
+
+export const TodosFilter = ({ updateTodosToShow }) => {
+  const statuses = ['all', 'active', 'completed'];
+
+  return (
+    <ul className="filters">
+      {statuses.map(status => (
+        <li>
+          <a
+            href={`#/${status}`}
+            onClick={() => (updateTodosToShow(status))}
+          >
+            {status}
+          </a>
+        </li>
+      ))}
+    </ul>
+  );
+};
+
+TodosFilter.propTypes = {
+  updateTodosToShow: PropTypes.func.isRequired,
+};
diff --git a/src/index.css b/src/index.css
index 5e01b4b2e..282a067eb 100644
--- a/src/index.css
+++ b/src/index.css
@@ -217,7 +217,7 @@ body {
   transition: color 0.4s;
 }
 
-.todo-list li.completed label {
+.todo-list li .completed label {
   color: #d9d9d9;
   text-decoration: line-through;
 }
diff --git a/src/index.js b/src/index.js
index ebde5cecc..a7c2f1e16 100644
--- a/src/index.js
+++ b/src/index.js
@@ -6,5 +6,5 @@ import App from './App';
 
 ReactDOM.render(
   <App />,
-  document.getElementById('root')
+  document.getElementById('root'),
 );