diff --git a/src/main/resources/static/js/models/ShoppingCategory.js b/src/main/resources/static/js/models/ShoppingCategory.js index dae39d5..57a3439 100644 --- a/src/main/resources/static/js/models/ShoppingCategory.js +++ b/src/main/resources/static/js/models/ShoppingCategory.js @@ -12,7 +12,7 @@ export class ShoppingCategory extends HTMLElement { const categoryHeaderDiv = document.createElement("div"); const span = document.createElement("span"); const deleteCategoryButton = document.createElement("button"); - const labelDeleteAllItems = document.createElement("label"); + const deleteAllItemsLabel = document.createElement("label"); const deleteAllItemsCheckbox = document.createElement("input"); const ul = document.createElement("ul"); @@ -23,17 +23,17 @@ export class ShoppingCategory extends HTMLElement { span.textContent = this.getAttribute("category-name"); span.classList.add("category__name", "category__name--bold", "category__name--big"); - labelDeleteAllItems.classList.add("category__labelDeleteAll"); - labelDeleteAllItems.textContent = "Gegenstände mit Kategorie löschen?"; + deleteAllItemsLabel.classList.add("category__deleteAllLabel"); + deleteAllItemsLabel.textContent = "Gegenstände mit Kategorie löschen?"; deleteCategoryButton.classList.add("category__deleteButton"); deleteCategoryButton.textContent = "Kategorie löschen"; deleteAllItemsCheckbox.setAttribute("type", "checkbox"); - labelDeleteAllItems.append(deleteAllItemsCheckbox); + deleteAllItemsLabel.append(deleteAllItemsCheckbox); - categoryHeaderDiv.append(span, deleteCategoryButton, labelDeleteAllItems); + categoryHeaderDiv.append(span, deleteCategoryButton, deleteAllItemsLabel); this.prepend(categoryHeaderDiv); diff --git a/src/main/resources/static/js/models/ShoppingItem.js b/src/main/resources/static/js/models/ShoppingItem.js index f88aa1a..83e7189 100644 --- a/src/main/resources/static/js/models/ShoppingItem.js +++ b/src/main/resources/static/js/models/ShoppingItem.js @@ -10,33 +10,33 @@ export class ShoppingItem extends HTMLElement { if (this._rendered) return; console.log(`rendering element shopping-item`); - const checkboxDone = document.createElement("input"); - const spanText = document.createElement("span"); - const spanName = document.createElement("span"); - const spanAmount = document.createElement("span"); - const buttonDelete = document.createElement("button"); + const doneCheckbox = document.createElement("input"); + const textSpan = document.createElement("span"); + const nameSpan = document.createElement("span"); + const amountSpan = document.createElement("span"); + const deleteButton = document.createElement("button"); - checkboxDone.classList.add("item__checkboxDone"); - checkboxDone.setAttribute("type", "checkbox"); - checkboxDone.setAttribute("autocomplete", "off"); - checkboxDone.checked = this.getAttribute("is-checked") === "true"; + doneCheckbox.classList.add("item__doneCheckbox"); + doneCheckbox.setAttribute("type", "checkbox"); + doneCheckbox.setAttribute("autocomplete", "off"); + doneCheckbox.checked = this.getAttribute("is-checked") === "true"; - spanText.classList.add("item__text"); + textSpan.classList.add("item__text"); - spanName.classList.add("item__itemName"); - spanAmount.classList.add("item__itemAmount"); + nameSpan.classList.add("item__name"); + amountSpan.classList.add("item__amount"); - spanName.textContent = this.getAttribute("item-name"); - spanAmount.textContent = this.getAttribute("item-amount"); + nameSpan.textContent = this.getAttribute("item-name"); + amountSpan.textContent = this.getAttribute("item-amount"); - buttonDelete.classList.add("item__buttonDeleteItem"); - buttonDelete.setAttribute("type", "button "); - buttonDelete.textContent = "Löschen"; + deleteButton.classList.add("item__deleteButton"); + deleteButton.setAttribute("type", "button "); + deleteButton.textContent = "Löschen"; - spanText.append(spanName, spanAmount); + textSpan.append(nameSpan, amountSpan); - this.append(checkboxDone, spanText, buttonDelete); + this.append(doneCheckbox, textSpan, deleteButton); this._rendered = true; } @@ -46,10 +46,10 @@ export class ShoppingItem extends HTMLElement { if (newVal == oldVal) return; switch (name) { case "item-name": - this.querySelector(".item__itemName").textContent = newVal; + this.querySelector(".item__name").textContent = newVal; break; case "item-amount": - this.querySelector(".item__itemAmount").textContent = newVal; + this.querySelector(".item__amount").textContent = newVal; break; default: break; diff --git a/src/main/resources/static/js/models/ShoppingList.js b/src/main/resources/static/js/models/ShoppingList.js index 882bd70..5972f01 100644 --- a/src/main/resources/static/js/models/ShoppingList.js +++ b/src/main/resources/static/js/models/ShoppingList.js @@ -39,7 +39,7 @@ export class ShoppingList extends HTMLElement { switch (name) { case "list-name": this.querySelector(".list__name").textContent = newVal; - document.querySelector(`.navbar__list[data-id='${listLi.dataset.id}'] > a`).textContent = newVal; + document.querySelector(`.nav__list[data-id='${listLi.dataset.id}'] > a`).textContent = newVal; break; default: break; diff --git a/src/main/resources/static/js/pages/index/frontend/indexUI.js b/src/main/resources/static/js/pages/index/frontend/indexUI.js index 27a0a6c..696b44b 100644 --- a/src/main/resources/static/js/pages/index/frontend/indexUI.js +++ b/src/main/resources/static/js/pages/index/frontend/indexUI.js @@ -18,7 +18,7 @@ export function addList(listAsJSON) { navLi.dataset.id = listAsJSON.listID; - navLi.classList.add("navbar__list") + navLi.classList.add("nav__list") a.setAttribute("href", `/list/${listAsJSON.listID}`); a.textContent = listAsJSON.listName; navLi.append(a); @@ -27,6 +27,6 @@ export function addList(listAsJSON) { export function deleteList(listElement) { - document.querySelector(`li.navbar__list[data-id='${listElement.dataset.id}']`).remove(); + document.querySelector(`li.nav__list[data-id='${listElement.dataset.id}']`).remove(); listElement.remove(); } diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index cca0bf6..8c677f8 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -72,7 +72,7 @@ function init() { //event delegation ist schon geil document.querySelector(".displayedList").addEventListener("click", (event) => { - if (event.target.matches(".item__buttonDeleteItem")) { + if (event.target.matches(".item__deleteButton")) { deleteItem(event.target.closest("li")); } else if (event.target.matches(".category__deleteButton")) { @@ -86,8 +86,8 @@ function init() { const shoppingItemElement = event.target.closest("shopping-item"); const id = event.target.closest("li").dataset.id; - let itemName = shoppingItemElement.querySelector(".item__itemName").textContent; - let itemAmount = shoppingItemElement.querySelector(".item__itemAmount").textContent; + let itemName = shoppingItemElement.querySelector(".item__name").textContent; + let itemAmount = shoppingItemElement.querySelector(".item__amount").textContent; /* * { name: "", value: "", class: "", attr: ""} */ @@ -126,7 +126,7 @@ function init() { }); document.querySelector(".displayedList").addEventListener("change", (e) => { - if (e.target.matches(".item__checkboxDone")) { + if (e.target.matches(".item__doneCheckbox")) { const item = e.target.closest("li"); e.target.closest("shopping-item").setAttribute("is-checked", e.target.checked); api.editItem(item.dataset.id, { isDone: e.target.checked }); diff --git a/src/main/resources/static/js/shared/editing.js b/src/main/resources/static/js/shared/editing.js index f3762a6..2174204 100644 --- a/src/main/resources/static/js/shared/editing.js +++ b/src/main/resources/static/js/shared/editing.js @@ -20,7 +20,7 @@ export async function editElement({ element, fields, apiCall, id, onSuccess, err }); formElement.addEventListener("click", (e) => { - if (e.target.matches(".editForm__buttonAbort")) abortEditing(formElement, element); + if (e.target.matches(".editForm__abortButton")) abortEditing(formElement, element); }) formElement.addEventListener("keydown", (e) => { diff --git a/src/main/resources/static/js/shared/sharedUI.js b/src/main/resources/static/js/shared/sharedUI.js index 71e5437..a4f7bde 100644 --- a/src/main/resources/static/js/shared/sharedUI.js +++ b/src/main/resources/static/js/shared/sharedUI.js @@ -16,11 +16,11 @@ export function createEditForm(fields) { }); abortButton.setAttribute("type", "button"); - abortButton.classList.add("editForm__buttonAbort"); + abortButton.classList.add("editForm__abortButton"); abortButton.textContent = "Abbrechen"; saveButton.textContent = "Speichern"; - saveButton.classList.add("editForm__buttonSave"); + saveButton.classList.add("editForm__saveButton"); saveButton.setAttribute("type", "submit"); diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 8ecf198..0cb76a5 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -17,7 +17,7 @@ xmlns:th="http://www.thymeleaf.org">