diff --git a/Week2-TodoAppWithReact/todo-app-react/public/index.html b/Week2-TodoAppWithReact/todo-app-react/public/index.html
index aa069f2..a23fa2d 100644
--- a/Week2-TodoAppWithReact/todo-app-react/public/index.html
+++ b/Week2-TodoAppWithReact/todo-app-react/public/index.html
@@ -9,6 +9,16 @@
       name="description"
       content="Web site created using create-react-app"
     />
+    <link
+      href="https://fonts.googleapis.com/css?family=Poppins&display=swap"
+      rel="stylesheet"
+    />
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/all.min.css"
+      integrity="sha256-mmgLkCYLUQbXn0B1SRqzHar6dCnv9oZFPEC1g1cwlkk="
+      crossorigin="anonymous"
+    />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
diff --git a/Week2-TodoAppWithReact/todo-app-react/src/App.css b/Week2-TodoAppWithReact/todo-app-react/src/App.css
index 74b5e05..768d548 100644
--- a/Week2-TodoAppWithReact/todo-app-react/src/App.css
+++ b/Week2-TodoAppWithReact/todo-app-react/src/App.css
@@ -1,38 +1,139 @@
-.App {
-  text-align: center;
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}
+body {
+  background-image: linear-gradient(120deg, #f6d365 0%, #fda085 100%);
+  color: white;
+  font-family: "Poppins", sans-serif;
+  min-height: 100vh;
+}
+header {
+  font-size: 2rem;
 }
 
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
+header,
+form {
+  min-height: 20vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+form input,
+form button {
+  padding: 0.5rem;
+  font-size: 2rem;
+  border: none;
+  background: white;
+}
+form button {
+  color: #ff6f47;
+  background: #f7fffe;
+  cursor: pointer;
+  transition: all 0.3s ease;
+}
+form button:hover {
+  background: #ff6f47;
+  color: white;
+}
+.todo-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
+.todo-list {
+  min-width: 30%;
+  list-style: none;
 }
 
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
+.todo {
+  margin: 0.5rem;
+  background: white;
+  font-size: 1.5rem;
+  color: black;
   display: flex;
-  flex-direction: column;
+  justify-content: space-between;
   align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
+  transition: all 1s ease;
+}
+.filter-todo {
+  padding: 1rem;
+}
+.todo li {
+  flex: 1;
+}
+
+.trash-btn,
+.complete-btn {
+  background: #ff6f47;
   color: white;
+  border: none;
+  padding: 1rem;
+  cursor: pointer;
+  font-size: 1rem;
+}
+.complete-btn {
+  background: rgb(11, 212, 162);
+}
+.todo-item {
+  padding: 0rem 0.5rem;
+}
+
+.fa-trash,
+.fa-check {
+  pointer-events: none;
 }
 
-.App-link {
-  color: #61dafb;
+.fall {
+  transform: translateY(10rem) rotateZ(20deg);
+  opacity: 0;
 }
 
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
+.completed {
+  text-decoration: line-through;
+  opacity: 0.5;
+}
+
+/*CUSTOM SELECTOR */
+select {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  -ms-appearance: none;
+  appearance: none;
+  outline: 0;
+  box-shadow: none;
+  border: 0 !important;
+  background-image: none;
+}
+
+/* Custom Select */
+.select {
+  margin: 1rem;
+  position: relative;
+  overflow: hidden;
+}
+select {
+  color: #ff6f47;
+  font-family: "Poppins", sans-serif;
+  cursor: pointer;
+  width: 12rem;
+}
+/* Arrow */
+.select::after {
+  content: "\25BC";
+  position: absolute;
+  top: 0;
+  right: 0;
+  padding: 1rem;
+  background: #ff6f47;
+  cursor: pointer;
+  pointer-events: none;
+}
+/* Transition */
+/*
+.select:hover::after {
+  transform: scale(1.5);
 }
+*/
\ No newline at end of file
diff --git a/Week2-TodoAppWithReact/todo-app-react/src/App.js b/Week2-TodoAppWithReact/todo-app-react/src/App.js
index 3784575..112ce4f 100644
--- a/Week2-TodoAppWithReact/todo-app-react/src/App.js
+++ b/Week2-TodoAppWithReact/todo-app-react/src/App.js
@@ -1,25 +1,93 @@
-import logo from './logo.svg';
 import './App.css';
+import Form from './components/Form/form';
+import Todolist from './components/Todolist/todolist';
+
+import {useState,useEffect} from 'react';
+const STORAGEKEYOFTODOS = "myTodos";
 
 function App() {
+
+  const [inputText,setInputText] = useState("");
+  const [todos,setTodos] = useState([]);
+  const [status,setStatus] = useState("all");
+  const [filteredTodos,setFilteredTodos] = useState([]);
+
+
+  useEffect(() => {
+    console.log("storage effect")
+    getTodosFromLocalStorage();
+  }, [])
+
+  useEffect(() => {
+    console.log("effect1")
+      if(status === "completed"){
+        console.log("status completed")
+        setFilteredTodos(todos.filter((todo) => todo.isCompleted === true))
+      }
+      else if(status === "uncompleted"){
+        console.log("status UNNcompleted")
+        setFilteredTodos(todos.filter((todo) => todo.isCompleted === false))
+      }
+      else{
+        setFilteredTodos(todos);
+      }
+    saveTodosToLocalStorage();
+  },[todos])
+
+  useEffect(() => {
+    console.log("effect2")
+    switch (status) {
+        case "completed":
+          console.log("status completed")
+          setFilteredTodos(todos.filter((todo) => todo.isCompleted === true))
+          break;
+        case "uncompleted":
+          console.log("status UNNcompleted")
+          //console.log(todos.filter((todo) => todo.isCompleted === false))
+          setFilteredTodos(todos.filter((todo) => todo.isCompleted === false))
+          break;
+        default:
+          setFilteredTodos(todos);
+          break;
+      }
+  },[status])
+
+ 
+
+
+  const saveTodosToLocalStorage = () => {
+    localStorage.setItem(STORAGEKEYOFTODOS,JSON.stringify(todos))
+  }
+
+  const getTodosFromLocalStorage = () => {
+    if(localStorage.getItem(STORAGEKEYOFTODOS) === null){
+      localStorage.setItem(STORAGEKEYOFTODOS,JSON.stringify([]))
+    }else{
+      let todosfromlocal = JSON.parse(localStorage.getItem(STORAGEKEYOFTODOS));
+      setTodos(todosfromlocal);
+    }
+  }
+
   return (
     <div className="App">
-      <header className="App-header">
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>
-          Edit <code>src/App.js</code> and save to reload.
-        </p>
-        <a
-          className="App-link"
-          href="https://reactjs.org"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Learn React
-        </a>
-      </header>
+      
+      <header >
+        <h1>Emre KURTAR's todo list</h1>
+        </header>
+        <Form
+          inputText = {inputText}
+          todos = {todos}
+          setTodos = {setTodos}
+          setInputText ={setInputText} 
+          setStatus = {setStatus}
+          />
+          <Todolist todos = {todos} 
+            setTodos = {setTodos}
+            filteredTodos = {filteredTodos}
+          />
+
     </div>
   );
 }
 
-export default App;
+export default App;
\ No newline at end of file
diff --git a/Week2-TodoAppWithReact/todo-app-react/src/App.test.js b/Week2-TodoAppWithReact/todo-app-react/src/App.test.js
deleted file mode 100644
index 1f03afe..0000000
--- a/Week2-TodoAppWithReact/todo-app-react/src/App.test.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import App from './App';
-
-test('renders learn react link', () => {
-  render(<App />);
-  const linkElement = screen.getByText(/learn react/i);
-  expect(linkElement).toBeInTheDocument();
-});
diff --git a/Week2-TodoAppWithReact/todo-app-react/src/components/Form/form.js b/Week2-TodoAppWithReact/todo-app-react/src/components/Form/form.js
new file mode 100644
index 0000000..d727496
--- /dev/null
+++ b/Week2-TodoAppWithReact/todo-app-react/src/components/Form/form.js
@@ -0,0 +1,38 @@
+import React from "react";
+
+function Form({setStatus, inputText, todos, setTodos, setInputText}) {
+
+
+    //Events
+    
+    const inputTextHandler = (e) => {
+        setInputText(e.target.value)
+    }
+    const onSubmitHandler = (e) => {
+        e.preventDefault();
+        setTodos([...todos, {text:inputText, isCompleted : false,}])
+
+        setInputText("");
+    }
+    const statusHandler = (e) => {
+        setStatus(e.target.value)
+    }
+
+  return (
+    <form>
+      <input value= {inputText} onChange = {inputTextHandler} type="text" className="todo-input" />
+      <button onClick = {onSubmitHandler} className="todo-button" type="submit">
+        <i className="fas fa-plus-square"></i>
+      </button>
+      <div className="select">
+        <select onChange={statusHandler} name="todos" className="filter-todo">
+          <option value="all">All</option>
+          <option value="completed">Completed</option>
+          <option value="uncompleted">Uncompleted</option>
+        </select>
+      </div>
+    </form>
+  );
+}
+
+export default Form;
\ No newline at end of file
diff --git a/Week2-TodoAppWithReact/todo-app-react/src/components/Todo/todo.js b/Week2-TodoAppWithReact/todo-app-react/src/components/Todo/todo.js
new file mode 100644
index 0000000..986a192
--- /dev/null
+++ b/Week2-TodoAppWithReact/todo-app-react/src/components/Todo/todo.js
@@ -0,0 +1,37 @@
+import React from 'react'
+
+function Todo({text, todo, todos, setTodos}) {
+
+    // Events
+
+    const deleteHandler = () => {
+        setTodos(todos.filter((item)=>(
+            item.text.trim().toLowerCase() !== todo.text.trim().toLowerCase()
+        )))
+    }
+
+    const completeHandler = () => {
+        setTodos(todos.map((item) => {
+            if(item.text.trim().toLowerCase() === todo.text.trim().toLowerCase()){
+                console.log("item completed")
+                return {...item, isCompleted :!todo.isCompleted}
+            }
+            return item;
+        }
+        ))
+    }
+
+    return (
+        <div className="todo">
+            <li className={`todo-item ${todo.isCompleted ? `completed` : ``}`}>{text}</li>
+            <button onClick = {completeHandler} className="complete-btn">
+                <i className="fas fa-check"></i>
+            </button>
+            <button onClick = {deleteHandler} className="trash-btn">
+                <i className="fas fa-trash"></i>
+            </button>
+        </div>
+    )
+}
+
+export default Todo
\ No newline at end of file
diff --git a/Week2-TodoAppWithReact/todo-app-react/src/components/Todolist/todolist.js b/Week2-TodoAppWithReact/todo-app-react/src/components/Todolist/todolist.js
new file mode 100644
index 0000000..05d9627
--- /dev/null
+++ b/Week2-TodoAppWithReact/todo-app-react/src/components/Todolist/todolist.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import Todo from '../Todo/todo';
+
+function Todolist({filteredTodos, todos,setTodos}) {
+  return (
+    <div className="todo-container">
+      <ul className="todo-list">
+          
+          {filteredTodos.map((todo,index) => (
+              <Todo todo ={todo} todos={todos} setTodos = {setTodos} key={index} text={todo.text} />
+          ))}
+      </ul>
+    </div>
+  );
+}
+
+export default Todolist;
\ No newline at end of file
diff --git a/Week2-TodoAppWithReact/todo-app-react/src/logo.svg b/Week2-TodoAppWithReact/todo-app-react/src/logo.svg
deleted file mode 100644
index 9dfc1c0..0000000
--- a/Week2-TodoAppWithReact/todo-app-react/src/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>
\ No newline at end of file
diff --git a/Week2-TodoAppWithReact/todo-app-react/src/setupTests.js b/Week2-TodoAppWithReact/todo-app-react/src/setupTests.js
deleted file mode 100644
index 8f2609b..0000000
--- a/Week2-TodoAppWithReact/todo-app-react/src/setupTests.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom';