Skip to content

Clean code #146

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.

Sign up for GitHub

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 4 commits into
base: main
Choose a base branch
from
Open

Clean code #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19f9888
fix: rename attributes across HTML, CSS, and JS according to rule X.X…
SatiYeghoyan Feb 9, 2025
f042295
refactor: clean code
SatiYeghoyan Feb 16, 2025
21984d1
fix: Marking as completed (toggleComplete),
SatiYeghoyan Feb 19, 2025
c2caf48
fix: use two spaces for indentation according to rule 1.1 in beginner…
SatiYeghoyan Feb 19, 2025
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
245 changes: 74 additions & 171 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,195 +1,98 @@
//Document is the DOM can be accessed in the console with document.window.
// Tree is from the top, html, body, p etc.
// Refactored JavaScript for Todo App

//Problem: User interaction does not provide the correct results.
//Solution: Add interactivity so the user can manage daily tasks.
//Break things down into smaller steps and take each step at a time.
const taskInput = document.getElementById("new-task");
const addButton = document.querySelector("button");
const incompleteTaskHolder = document.getElementById("incomplete-tasks");
const completedTasksHolder = document.getElementById("completed-tasks");

// Create a new task list item
const createNewTaskElement = (taskString) => {
const listItem = document.createElement("li");

// Event handling, user interaction is what starts the code execution.
const checkBox = document.createElement("input");
const label = document.createElement("label");
const editInput = document.createElement("input");
const editButton = document.createElement("button");
const deleteButton = document.createElement("button");
const deleteButtonImg = document.createElement("img");

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
label.innerText = taskString;
label.className = "task";

checkBox.type = "checkbox";
editInput.type = "text";
editInput.className = "task";

//New task list item
var createNewTaskElement=function(taskString){
editButton.innerText = "Edit";
editButton.className = "edit";

var listItem=document.createElement("li");

//input (checkbox)
var checkBox=document.createElement("input");//checkbx
//label
var label=document.createElement("label");//label
//input (text)
var editInput=document.createElement("input");//text
//button.edit
var editButton=document.createElement("button");//edit button

//button.delete
var deleteButton=document.createElement("button");//delete button
var deleteButtonImg=document.createElement("img");//delete button image

label.innerText=taskString;
label.className='task';

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

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

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


//and appending.
listItem.appendChild(checkBox);
listItem.appendChild(label);
listItem.appendChild(editInput);
listItem.appendChild(editButton);
listItem.appendChild(deleteButton);
listItem.append(checkBox, label, editInput, editButton, deleteButton);
return listItem;
}



var addTask=function(){
console.log("Add Task...");
//Create a new list item with the text from the #new-task:
if (!taskInput.value) return;
var listItem=createNewTaskElement(taskInput.value);
};

//Append listItem to incompleteTaskHolder
const addTask = () => {
if (!taskInput.value.trim()) return;
const listItem = createNewTaskElement(taskInput.value);
incompleteTaskHolder.appendChild(listItem);
bindTaskEvents(listItem, taskCompleted);
taskInput.value = "";
};

taskInput.value="";

}

//Edit an existing task.

var editTask=function(){
console.log("Edit Task...");
console.log("Change 'edit' to 'save'");


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");
//If class of the parent is .editmode
if(containsClass){

//switch to .editmode
//label becomes the inputs value.
label.innerText=editInput.value;
editBtn.innerText="Edit";
}else{
editInput.value=label.innerText;
editBtn.innerText="Save";
const editTask = function () {
const listItem = this.parentNode;
const editInput = listItem.querySelector("input[type=text]");
const label = listItem.querySelector("label");
const editBtn = listItem.querySelector(".edit");
const isEditMode = listItem.classList.toggle("edit-mode");

if (isEditMode) {
// Switch to edit mode
editInput.value = label.innerText;
editBtn.innerText = "Save";
editInput.style.display = "inline-block";
label.style.display = "none";
} else {
// Switch to view mode
label.innerText = editInput.value;
editBtn.innerText = "Edit";
editInput.style.display = "none";
label.style.display = "inline-block";
}

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

const deleteTask = function () {
this.parentNode.remove();
};

//Delete task.
var deleteTask=function(){
console.log("Delete Task...");

var listItem=this.parentNode;
var ul=listItem.parentNode;
//Remove the parent list item from the ul.
ul.removeChild(listItem);

}


//Mark task completed
var taskCompleted=function(){
console.log("Complete Task...");

//Append the task list item to the #completed-tasks
var listItem=this.parentNode;
completedTasksHolder.appendChild(listItem);
bindTaskEvents(listItem, taskIncomplete);

}


var taskIncomplete=function(){
console.log("Incomplete Task...");
//Mark task as incomplete.
//When the checkbox is unchecked
//Append the task list item to the #incompleteTasks.
var listItem=this.parentNode;
incompleteTaskHolder.appendChild(listItem);
bindTaskEvents(listItem,taskCompleted);
}



var ajaxRequest=function(){
console.log("AJAX Request");
}

//The glue to hold it all together.


//Set the click handler to the addTask function.
addButton.onclick=addTask;
addButton.addEventListener("click",addTask);
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");


//Bind editTask to edit button.
editButton.onclick=editTask;
//Bind deleteTask to delete button.
deleteButton.onclick=deleteTask;
//Bind taskCompleted to checkBoxEventHandler.
checkBox.onchange=checkBoxEventHandler;
}

//cycle over incompleteTaskHolder ul list items
//for each list item
for (var i=0; i<incompleteTaskHolder.children.length;i++){

//bind events to list items chldren(tasksCompleted)
bindTaskEvents(incompleteTaskHolder.children[i],taskCompleted);
}




//cycle over completedTasksHolder ul list items
for (var i=0; i<completedTasksHolder.children.length;i++){
//bind events to list items chldren(tasksIncompleted)
bindTaskEvents(completedTasksHolder.children[i],taskIncomplete);
}
const taskCompleted = function () {
completedTasksHolder.appendChild(this.parentNode);
bindTaskEvents(this.parentNode, taskIncomplete);
};

const taskIncomplete = function () {
incompleteTaskHolder.appendChild(this.parentNode);
bindTaskEvents(this.parentNode, taskCompleted);
};

const bindTaskEvents = (taskListItem, checkBoxEventHandler) => {
const checkBox = taskListItem.querySelector("input[type=checkbox]");
const editButton = taskListItem.querySelector("button.edit");
const deleteButton = taskListItem.querySelector("button.delete");

editButton.addEventListener("click", editTask);
deleteButton.addEventListener("click", deleteTask);
checkBox.addEventListener("change", checkBoxEventHandler);
};

// Issues with usability don't get seen until they are in front of a human tester.
addButton.addEventListener("click", addTask);

//prevent creation of empty tasks.
taskInput.addEventListener("keypress", (e) => {
if (e.key === "Enter") addTask();
});

//Change edit to save when you are in edit mode.
Array.from(incompleteTaskHolder.children).forEach(item => bindTaskEvents(item, taskCompleted));
Array.from(completedTasksHolder.children).forEach(item => bindTaskEvents(item, taskIncomplete));
83 changes: 67 additions & 16 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,70 @@
<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>
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Todo App</title>
<link href="https://fonts.googleapis.com/css?family=Lato:300,400,700" rel="stylesheet">
<link rel="stylesheet" href="style.css">
</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>
<div class="matrix-container">
<img src="./eisenhower-matrix.jpg" alt="Eisenhower Matrix">
<a class="more-info" href="https://goal-life.com/page/method/matrix-eisenhower">Want more details?</a>
</div>

<div class="main-content">
<section id="task-section">
<label for="new-task">Add Item</label>
<div class="task-input-wrapper">
<input id="new-task" class="task" type="text" placeholder="Enter a new task">
<button id="add-task-btn">Add</button>
</div>
</section>

<section class="task-list"></section>
<h3>Todo</h3>
<ul id="incomplete-tasks">
<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" alt="Delete">
</button>
</li>
<li class="edit-mode">
<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" alt="Delete">
</button>
</li>
</ul>
</section>

<section class="task-list">
<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" alt="Delete">
</button>
</li>
</ul>
</section>
</div>

<script src="app.js"></script>
</body>

</html>
Loading