From 0f96a94b909b3d727c464fc045a90b8f0077c5c5 Mon Sep 17 00:00:00 2001 From: pashaBy94 Date: Mon, 16 Dec 2024 17:05:27 +0300 Subject: [PATCH 1/8] refactor: update CSS js html according to rule 1.1 in html-and-css.md --- app.js | 280 ++++++++++++++++++++++++----------------------------- index.html | 68 ++++++++++--- style.css | 149 ++++++++++++++-------------- 3 files changed, 256 insertions(+), 241 deletions(-) diff --git a/app.js b/app.js index ab737a6002..096006f5e4 100644 --- a/app.js +++ b/app.js @@ -5,191 +5,165 @@ //Solution: Add interactivity so the user can manage daily tasks. //Break things down into smaller steps and take each step at a time. - // 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 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 //New task list item -var createNewTaskElement=function(taskString){ - - 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.appendChild(deleteButtonImg); - - - //and appending. - listItem.appendChild(checkBox); - listItem.appendChild(label); - listItem.appendChild(editInput); - listItem.appendChild(editButton); - listItem.appendChild(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); +var createNewTaskElement = function (taskString) { + 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.appendChild(deleteButtonImg); + + //and appending. + listItem.appendChild(checkBox); + listItem.appendChild(label); + listItem.appendChild(editInput); + listItem.appendChild(editButton); + listItem.appendChild(deleteButton); + return listItem; +}; - //Append listItem to incompleteTaskHolder - incompleteTaskHolder.appendChild(listItem); - bindTaskEvents(listItem, taskCompleted); +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); - taskInput.value=""; + //Append listItem to incompleteTaskHolder + incompleteTaskHolder.appendChild(listItem); + bindTaskEvents(listItem, taskCompleted); -} + 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"; - } - - //toggle .editmode on the parent. - listItem.classList.toggle("editMode"); +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"; + } + + //toggle .editmode on the parent. + listItem.classList.toggle("editMode"); }; - //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); - -} +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 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"); -} +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; -} +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 -Todo App - - + + + Todo App + + + - -

-

Todo

-
    -
  • -
  • -

Completed

  • -
  • -
-
- + +
+

+ +

+
+ + +
+

Todo

+
    +
  • + + + + + +
  • +
  • + + + + + +
  • +
+

Completed

+
    +
  • + + + + + +
  • +
+
+ + \ No newline at end of file diff --git a/style.css b/style.css index ab36227705..8c6458328f 100644 --- a/style.css +++ b/style.css @@ -1,148 +1,149 @@ /* Basic Style */ body { - background-color: #f8f8f8; - color: #333; - font-family: Lato, sans-serif; + background-color: #f8f8f8; + color: #333; + font-family: Lato, sans-serif; } .aaa { - width: 500px; - margin: 0 auto; - display: block; - text-align: right; + width: 500px; + margin: 0 auto; + display: block; + text-align: right; } .aaa img { - width: 100%; + width: 100%; } .aaa .more_inf { - font-family: fantasy, cursive; + font-family: fantasy, cursive; } @media (max-width:768px) { -.aaa { text-align: center; -} + .aaa { + text-align: center; + } } .centered-main-page-element { - display: block; - width: 500px; - margin: 0 auto 0; + display: block; + width: 500px; + margin: 0 auto 0; } .task { - width: 56%; - display: inline-block; - flex-grow: 1 + width: 56%; + display: inline-block; + flex-grow: 1 } .task-row-wrapper { - display: flex; + display: flex; } ul { - margin:0; - padding: 0px; + margin:0; + padding: 0px; } li, h3 { - list-style:none; + list-style:none; } input,button{ - outline:none; + outline:none; } button { - background: none; - border: 0px; - color: #888; - font-size: 15px; - width: 60px; - font-family: Lato, sans-serif; - cursor: pointer; + background: none; + border: 0px; + color: #888; + font-size: 15px; + width: 60px; + font-family: Lato, sans-serif; + cursor: pointer; } button:hover { - color: #3a3A3a; + color: #3a3A3a; } /* Heading */ h3, label[for='new-task'] { - color: #333; - font-weight: 700; - font-size: 15px; - border-bottom: 2px solid #333; - padding: 30px 0 10px; - margin: 0; - text-transform: uppercase; + color: #333; + font-weight: 700; + font-size: 15px; + border-bottom: 2px solid #333; + padding: 30px 0 10px; + margin: 0; + text-transform: uppercase; } input[type="text"] { - margin: 0; - font-size: 18px; - line-height: 18px; - height: 21px; - padding: 0 9px; - border: 1px solid #dDd; - background: #FFF; - border-radius: 6px; - font-family: Lato, sans-serif; - color: #888; + margin: 0; + font-size: 18px; + line-height: 18px; + height: 21px; + padding: 0 9px; + border: 1px solid #dDd; + background: #FFF; + border-radius: 6px; + font-family: Lato, sans-serif; + color: #888; } input[type="text"]:focus { - color: #333; + color: #333; } /* New Task */ label[for='new-task'] { - display: block; - margin: 0 0 20px; + display: block; + margin: 0 0 20px; } input#new-task { - width: 318px; + width: 318px; } /* Task list */ li { - overflow: hidden; - padding: 20px 0; - border-bottom: 1px solid #eee; + overflow: hidden; + padding: 20px 0; + border-bottom: 1px solid #eee; - display: flex; - justify-content: space-between; - align-items: center; + display: flex; + justify-content: space-between; + align-items: center; } li > * { - vertical-align: middle; + vertical-align: middle; } li > input[type="checkbox"] { - margin: 0 10px; + margin: 0 10px; } li > label { - padding-left: 10px; - box-sizing: border-box; - font-size: 18px; - width: 226px; + padding-left: 10px; + box-sizing: border-box; + font-size: 18px; + width: 226px; } li > input[type="text"] { - width: 226px + width: 226px } button.delete img { - height: 2em; - transform: rotateZ(45deg); - transition: transform 200ms ease-in; + height: 2em; + transform: rotateZ(45deg); + transition: transform 200ms ease-in; } button.delete img:hover { - transform: rotateZ(0); + transform: rotateZ(0); } /* Completed */ ul#completed-tasks label { - text-decoration: line-through - color: #888; + text-decoration: line-through + color: #888; } /* Edit Task */ ul li input[type=text] { - display:none + display:none } ul li.editMode input[type=text] { - display:inline-block; - width:224px + display:inline-block; + width:224px } ul li.editMode label { - display:none; + display:none; } \ No newline at end of file From 7503bdd4f8097f50496cc11ee29a4186e68dfc9d Mon Sep 17 00:00:00 2001 From: pashaBy94 Date: Mon, 16 Dec 2024 17:14:50 +0300 Subject: [PATCH 2/8] refactor: update CSS html according to rule 1.2 in html-and-css.md --- index.html | 4 ++-- style.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index bffb3108fd..d221d10407 100644 --- a/index.html +++ b/index.html @@ -1,10 +1,10 @@ - + Todo App - +
diff --git a/style.css b/style.css index 8c6458328f..470c488e81 100644 --- a/style.css +++ b/style.css @@ -74,8 +74,8 @@ input[type="text"] { line-height: 18px; height: 21px; padding: 0 9px; - border: 1px solid #dDd; - background: #FFF; + border: 1px solid #ddd; + background: #fff; border-radius: 6px; font-family: Lato, sans-serif; color: #888; From 6ee0905533e2953d8b5cadb22c29ed7543fbfc24 Mon Sep 17 00:00:00 2001 From: pashaBy94 Date: Mon, 16 Dec 2024 17:24:51 +0300 Subject: [PATCH 3/8] refactor: update CSS html according to rule 1.3 in html-and-css.md --- index.html | 6 +++--- style.css | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index d221d10407..05114868f7 100644 --- a/index.html +++ b/index.html @@ -2,8 +2,8 @@ Todo App - - + + @@ -41,7 +41,7 @@

Todo

Completed

-
    +
    • diff --git a/style.css b/style.css index 470c488e81..c494b6719d 100644 --- a/style.css +++ b/style.css @@ -59,7 +59,7 @@ button:hover { } /* Heading */ h3, -label[for='new-task'] { +label[for="new-task"] { color: #333; font-weight: 700; font-size: 15px; @@ -85,7 +85,7 @@ input[type="text"]:focus { } /* New Task */ -label[for='new-task'] { +label[for="new-task"] { display: block; margin: 0 0 20px; } @@ -135,11 +135,11 @@ ul#completed-tasks label { } /* Edit Task */ -ul li input[type=text] { +ul li input[type="text"] { display:none } -ul li.editMode input[type=text] { +ul li.editMode input[type="text"] { display:inline-block; width:224px } From ea861ec819e83dd802369d927189a254095cfefa Mon Sep 17 00:00:00 2001 From: pashaBy94 Date: Mon, 16 Dec 2024 17:29:09 +0300 Subject: [PATCH 4/8] fix: add Html5 DOCTYPE tag according to rule 2.2 in html-and-css.md --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 05114868f7..ef897e0ce7 100644 --- a/index.html +++ b/index.html @@ -1,3 +1,4 @@ + From 091bdd9580aabbdecb4c97a28a9bf044fb39e260 Mon Sep 17 00:00:00 2001 From: pashaBy94 Date: Mon, 16 Dec 2024 17:35:49 +0300 Subject: [PATCH 5/8] fix: delete type attribute according to rule 2.4 in html-and-css.md --- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index ef897e0ce7..885ea89493 100644 --- a/index.html +++ b/index.html @@ -3,8 +3,8 @@ Todo App - - + + @@ -54,7 +54,7 @@

      Completed

- + \ No newline at end of file From e660106a2607bcef414c4afe7b9a7e2c0a2bf8b6 Mon Sep 17 00:00:00 2001 From: pashaBy94 Date: Mon, 16 Dec 2024 17:40:46 +0300 Subject: [PATCH 6/8] refactor: update html according to rule 2.5 in html-and-css.md --- index.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 885ea89493..dede70a001 100644 --- a/index.html +++ b/index.html @@ -3,14 +3,19 @@ Todo App - +

From d1d1f368245d3fd8eb1ab43ce4a2e3b8ae421f94 Mon Sep 17 00:00:00 2001 From: pashaBy94 Date: Mon, 16 Dec 2024 18:59:06 +0300 Subject: [PATCH 7/8] refactor: update semantic and BEM according to rules in html-and-css.md --- app.js | 10 ++--- index.html | 105 ++++++++++++++++++++++++++++++----------------------- style.css | 20 +++++----- 3 files changed, 75 insertions(+), 60 deletions(-) diff --git a/app.js b/app.js index 096006f5e4..2fef96a89a 100644 --- a/app.js +++ b/app.js @@ -38,9 +38,9 @@ var createNewTaskElement = function (taskString) { editInput.className = "task"; editButton.innerText = "Edit"; //innerText encodes special characters, HTML does not. - editButton.className = "edit"; + editButton.className = "todo__button--edit"; - deleteButton.className = "delete"; + deleteButton.className = "todo__button--delete"; deleteButtonImg.src = "./remove.svg"; deleteButton.appendChild(deleteButtonImg); @@ -76,7 +76,7 @@ var editTask = function () { var editInput = listItem.querySelector("input[type=text]"); var label = listItem.querySelector("label"); - var editBtn = listItem.querySelector(".edit"); + var editBtn = listItem.querySelector(".todo__button--edit"); var containsClass = listItem.classList.contains("editMode"); //If class of the parent is .editmode if (containsClass) { @@ -138,8 +138,8 @@ 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 editButton = taskListItem.querySelector("button.todo__button--edit"); + var deleteButton = taskListItem.querySelector("button.todo__button--delete"); //Bind editTask to edit button. editButton.onclick = editTask; diff --git a/index.html b/index.html index dede70a001..ce59f7c786 100644 --- a/index.html +++ b/index.html @@ -7,58 +7,73 @@ href ="https://fonts.googleapis.com/css?family=Lato:300,400,700" rel="stylesheet" > - + -

-
-

- -

-
- - + +
+
+
+

+ +

+
+ + +
+
+
+

Todo

+
    +
  • + + + + + +
  • +
  • + + + + + +
  • +
+
+
+

Completed

+
    +
  • + + + + + +
  • +
+
-

Todo

-
    -
  • - - - - - -
  • -
  • - - - - - -
  • -
-

Completed

-
    -
  • - - - - - -
  • -
-
+ diff --git a/style.css b/style.css index c494b6719d..b342a5e4ea 100644 --- a/style.css +++ b/style.css @@ -4,25 +4,25 @@ body { color: #333; font-family: Lato, sans-serif; } -.aaa { +.header { width: 500px; margin: 0 auto; display: block; text-align: right; } -.aaa img { +.header img { width: 100%; } -.aaa .more_inf { +.header .header__link { font-family: fantasy, cursive; } @media (max-width:768px) { - .aaa { + .header { text-align: center; } } -.centered-main-page-element { +.content { display: block; width: 500px; margin: 0 auto 0; @@ -32,7 +32,7 @@ body { display: inline-block; flex-grow: 1 } -.task-row-wrapper { +.creater__body { display: flex; } ul { @@ -116,21 +116,21 @@ li > label { font-size: 18px; width: 226px; } -li > input[type="text"] { +li > input[type="text"] { width: 226px } -button.delete img { +button.todo__button--delete img { height: 2em; transform: rotateZ(45deg); transition: transform 200ms ease-in; } -button.delete img:hover { +button.todo__button--delete img:hover { transform: rotateZ(0); } /* Completed */ ul#completed-tasks label { - text-decoration: line-through + text-decoration: line-through; color: #888; } From 4c4baf737165acb99f43489210a7ee0d9a9b0645 Mon Sep 17 00:00:00 2001 From: pashaBy94 Date: Mon, 16 Dec 2024 19:57:36 +0300 Subject: [PATCH 8/8] refactor: update css according to rules in html-and-css.md --- style.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/style.css b/style.css index b342a5e4ea..f0a85805c7 100644 --- a/style.css +++ b/style.css @@ -136,14 +136,14 @@ ul#completed-tasks label { /* Edit Task */ ul li input[type="text"] { - display:none + display: none } ul li.editMode input[type="text"] { - display:inline-block; - width:224px + display: inline-block; + width: 224px } ul li.editMode label { - display:none; + display: none; } \ No newline at end of file