Skip to content

Clean code s1e1 #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
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
14 changes: 1 addition & 13 deletions ReadMe.md
Original file line number Diff line number Diff line change
@@ -1,13 +1 @@
<img width="1199" alt="code-quality-task-screenshot" src="https://user-images.githubusercontent.com/8201843/113413843-4080fb80-93c4-11eb-9f20-15e4b4c1e430.png">

# Функционал приложения :

- Добавление нового элемента в список задач "TODO"
- Редактирование элемента в списке задач "TODO"
- Удаление элемента из списка задач "TODO"
- Установка элемента в статус завершенного и перенос в список "COMPLETED" через checkbox

- Удаление элемента из списка "COMPLETED"
- Редактирование элемента из списка "COMPLETED"
- Установка элемента в статус незавершенного и перенос в список "TODO" через checkbox
- Анимация на кнопке удаления
<img width="1199" alt="code-quality-task-screenshot" src="https://user-images.githubusercontent.com/8201843/113413843-4080fb80-93c4-11eb-9f20-15e4b4c1e430.png">
38 changes: 20 additions & 18 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
// Event handling, user interaction is what starts the code execution.

var taskInput=document.getElementById("new-task");//Add a new task.
var addButton=document.getElementsByTagName("button")[0];//first button
var incompleteTaskHolder=document.getElementById("incompleteTasks");//ul of #incompleteTasks
var completedTasksHolder=document.getElementById("completed-tasks");//completed-tasks
var addButton=document.querySelectorAll(".task__btn")[0];//first button
var incompleteTaskHolder=document.querySelector(".task__list_incomplete");//ul of #incomplete tasks
var completedTasksHolder=document.querySelector(".task__list_complete");//completed-tasks


//New task list item
Expand All @@ -31,19 +31,21 @@ var createNewTaskElement=function(taskString){
//button.delete
var deleteButton=document.createElement("button");//delete button
var deleteButtonImg=document.createElement("img");//delete button image

listItem.classList.add("task__item");
checkBox.classList.add("task__checkbox");
label.classList.add("task__label");
deleteButton.classList.add("task__btn");
deleteButtonImg.classList.add("task__icon")
label.innerText=taskString;
label.className='task';
label.className='task__label';

//Each elements, needs appending
checkBox.type="checkbox";
editInput.type="text";
editInput.className="task";

editInput.className="task__input";
editButton.innerText="Edit"; //innerText encodes special characters, HTML does not.
editButton.className="edit";

deleteButton.className="delete";
editButton.className="task__btn task__btn_edit";
deleteButton.className="task__btn task__btn_delete";
deleteButtonImg.src='./remove.svg';
deleteButton.appendChild(deleteButtonImg);

Expand Down Expand Up @@ -82,10 +84,10 @@ var editTask=function(){

var listItem=this.parentNode;

var editInput=listItem.querySelector('input[type=text]');
var label=listItem.querySelector("label");
var editBtn=listItem.querySelector(".edit");
var containsClass=listItem.classList.contains("editMode");
var editInput=listItem.querySelector('.task__input');
var label=listItem.querySelector(".task__label");
var editBtn=listItem.querySelector(".task__btn_edit");
var containsClass=listItem.classList.contains("task__item_edit");
//If class of the parent is .editmode
if(containsClass){

Expand All @@ -99,7 +101,7 @@ var editTask=function(){
}

//toggle .editmode on the parent.
listItem.classList.toggle("editMode");
listItem.classList.toggle("task__item_edit");
};


Expand Down Expand Up @@ -155,9 +157,9 @@ addButton.addEventListener("click",ajaxRequest);
var bindTaskEvents=function(taskListItem,checkBoxEventHandler){
console.log("bind list item events");
//select ListItems children
var checkBox=taskListItem.querySelector("input[type=checkbox]");
var editButton=taskListItem.querySelector("button.edit");
var deleteButton=taskListItem.querySelector("button.delete");
var checkBox=taskListItem.querySelector(".task__checkbox");
var editButton=taskListItem.querySelector(".task__btn_edit");
var deleteButton=taskListItem.querySelector(".task__btn_delete");


//Bind editTask to edit button.
Expand Down
78 changes: 60 additions & 18 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,61 @@
<html>
<HEAD><title>Todo App</title>
<link href='https://fonts.googleapis.com/css?family=Lato:300,400,700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="style.css" type="text/css" MEDIA="screen" charset="utf-8">
</HEAD>
<body>
<div class="aaa"><img src="./eisenhower-matrix.jpg"><a class='more_inf' href="https://goal-life.com/page/method/matrix-eisenhower">Want more details&quest;</a></div>
<div class="centered-main-page-element"><p id='topSectionForAddingElementToList'><label for="new-task">Add Item</label><div class="task-row-wrapper"><input id='new-task'class="task" type="text"><button>Add</button></div>
</p><h3>Todo</h3>
<ul id='incompleteTasks'>
<li><input type='checkbox'><label class="task">Pay Bills</label><input type="text" class="task"><button class="edit">Edit</button><button class="delete"><img src="./remove.svg"></button></li>
<li class="editMode"><input type="checkbox"><label class="task">Go Shopping</label><input type="text" value="Go Shopping" class="task"><button class='edit'>Save</button><button class="delete"><img src="./remove.svg"></button></li>
</ul><h3>Completed</h3><ul id="completed-tasks"><li><input type="checkbox" checked><label class="task">See the Doctor</label><input type="text" class="task"><button class="edit">Edit</button><button class="delete"><img src="./remove.svg"></button>
</li>
</ul>
</div>
<script type="text/javascript" SRC="app.js"></script>
</body>
<!DOCTYPE html>
<html lang="en">
<head>
<title>Todo App</title>
<link href="https://fonts.googleapis.com/css?family=Lato:300,400,700" rel="stylesheet">
<link rel="stylesheet" href="style.css" media="screen" charset="utf-8">
</head>
<body>
<header class="header">
<img class="header__img" src="./eisenhower-matrix.jpg" alt="eisenhower-matrix">
<a class="header__link" href="https://goal-life.com/page/method/matrix-eisenhower">Want more details?</a>
</header>
<main class="main">
<section class="task">
<label class="task__header" for="new-task">Add Item</label>
<div class="task__wrapper">
<input class="task__input" id="new-task" type="text">
<button class="task__btn">Add</button>
</div>
</section>
<section class="task">
<h3 class="task__header">Todo</h3>
<ul class="task__list task__list_incomplete">
<li class="task__item">
<input class="task__checkbox" type="checkbox">
<label class="task__label">Pay Bills</label>
<input type="text" class="task__input">
<button class="task__btn task__btn_edit">Edit</button>
<button class="task__btn task__btn_delete">
<img class="task__icon" src="./remove.svg" alt="remove-icon">
</button>
</li>
<li class="task__item task__item_edit">
<input class="task__checkbox" type="checkbox">
<label class="task__label">Go Shopping</label>
<input type="text" value="Go Shopping" class="task__input">
<button class="task__btn task__btn_edit">Save</button>
<button class="task__btn task__btn_delete">
<img class="task__icon" src="./remove.svg" alt="remove-icon">
</button>
</li>
</ul>
</section>
<section class="task">
<h3 class="task__header">Completed</h3>
<ul class="task__list task__list_complete">
<li class="task__item">
<input class="task__checkbox" type="checkbox" checked>
<label class="task__label">See the Doctor</label>
<input type="text" class="task__input">
<button class="task__btn task__btn_edit">Edit</button>
<button class="task__btn task__btn_delete">
<img class="task__icon" src="./remove.svg" alt="remove-icon">
</button>
</li>
</ul>
</section>
</main>
<script src="app.js"></script>
</body>
</html>
Loading