Compare commits

13 changed files with 105 additions and 151 deletions

No files matched your search

@@ -61,7 +61,7 @@ public class ShoppingListController {
public ResponseEntity<Void> editList(@PathVariable UUID listID,@Valid @RequestBody ShoppingListPatchDTO toChange){
ShoppingList list = shoppingListRepository.findById(listID).orElseThrow(() -> new ResourceNotFoundException("listID", listID));
if(toChange.newListName() != null) list.setListName(toChange.newListName());
if(toChange.listName() != null) list.setListName(toChange.listName());
shoppingListRepository.save(list);
@@ -2,5 +2,5 @@ package de.timaldinger.einkaufsliste.Dto.Patch;
import jakarta.validation.constraints.NotBlank;
public record ShoppingListPatchDTO(@NotBlank(message = "listName must not be blank!") String newListName) {
public record ShoppingListPatchDTO(@NotBlank(message = "listName must not be blank!") String listName) {
}
@@ -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);
@@ -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;
@@ -1,31 +1,24 @@
export class ShoppingList extends HTMLElement {
static get observedAttributes() { return ["list-name"] }
export class ShoppingList {
constructor(name) {
this.listName = name;
this.lastModified = "";
this.created = "";
this.listID = 0;
constructor() {
super();
this._rendered = false
}
static fromJSON(listAsJSON) {
const list = new ShoppingList(listAsJSON.listName);
list.listID = listAsJSON.listID;
return list;
}
connectedCallback() {
if (this._rendered) return;
render() {
const li = document.createElement("li");
const a = document.createElement("a");
const editButton = document.createElement("button");
const deleteButton = document.createElement("button");
li.classList.add("list");
li.dataset.id = this.listID;
const listID = this.closest("li").dataset.id;
a.setAttribute("href", `/list/${this.listID}`);
a.setAttribute("href", `/list/${listID}`);
a.classList.add("list__name");
a.textContent = this.listName;
a.textContent = this.getAttribute("list-name");
editButton.classList.add("list__editButton");
editButton.textContent = "Liste bearbeiten";
@@ -33,23 +26,24 @@ export class ShoppingList {
deleteButton.classList.add("list__deleteButton");
deleteButton.textContent = "Liste löschen";
li.append(a, editButton, deleteButton);
return li;
this.append(a, editButton, deleteButton);
this._rendered = true;
}
renderNavElement() {
const li = document.createElement("li");
const a = document.createElement("a");
attributeChangedCallback(name, oldVal, newVal) {
if (!this._rendered) return;
if (oldVal == newVal) return;
li.classList.add("navbar__list");
li.dataset.id = this.listID;
const listLi = this.closest("li");
a.setAttribute("href", `/list/${this.listID}`);
a.textContent = this.listName;
li.append(a);
return li;
switch (name) {
case "list-name":
this.querySelector(".list__name").textContent = newVal;
document.querySelector(`.nav__list[data-id='${listLi.dataset.id}'] > a`).textContent = newVal;
break;
default:
break;
}
}
}
@@ -1,23 +1,16 @@
export function addList(listName) {
return fetch(`/api/lists`,
{
method: "POST",
body: JSON.stringify({ listName: listName }),
headers: { "Content-Type": "application/json" }
}
);
});
}
export function deleteList(id) {
return fetch(`/api/lists/${id}`, { method: "DELETE" });
}
export function editList(listID, toChange) {
return fetch(`/api/lists/${listID}`,
{
@@ -1,52 +1,32 @@
import { ShoppingList } from "../../../models/ShoppingList.js";
export function addList(listAsJSON) {
const list = document.querySelector(".displayedList");
const li = document.createElement("li");
const navList = document.querySelector(".nav__dropdownMenu");
const listElement = ShoppingList.fromJSON(listAsJSON);
const listElement = document.createElement("shopping-list");
list.append(listElement.render());
navList.append(listElement.renderNavElement());
const navLi = document.createElement("li");
const a = document.createElement("a");
li.dataset.id = listAsJSON.listID;
li.classList.add("list");
listElement.setAttribute("list-name", listAsJSON.listName);
li.append(listElement);
list.append(li);
navLi.dataset.id = listAsJSON.listID;
navLi.classList.add("nav__list")
a.setAttribute("href", `/list/${listAsJSON.listID}`);
a.textContent = listAsJSON.listName;
navLi.append(a);
navList.append(navLi);
}
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();
}
export function createEditListForm(textElement) {
const editForm = document.createElement("form");
const inputName = document.createElement("input");
const abortButton = document.createElement("button");
const saveButton = document.createElement("button");
inputName.setAttribute("name", "newListName");
inputName.setAttribute("value", textElement.querySelector(".list__name").textContent);
inputName.classList.add("editForm__name");
abortButton.textContent = "Abbrechen";
saveButton.textContent = "Speichern";
saveButton.classList.add("editForm__saveButton");
abortButton.classList.add("editForm__abortButton");
editForm.append(inputName, saveButton, abortButton);
return editForm;
}
export function editList(id, formElement, formData, listLi) {
let newName = formData.newListName;
document.querySelector(`.navbar__list[data-id='${listLi.dataset.id}'] > a`).textContent = newName;
listLi.querySelector(".list__name").textContent = newName;
listLi.setAttribute("href", `/list/${id}`);
formElement.replaceWith(listLi);
}
@@ -1,6 +1,8 @@
import { ShoppingList } from "../../models/ShoppingList.js";
import { editElement } from "../../shared/editing.js";
import { initErrors } from "../../shared/error.js";
import { handleResponse } from "../../shared/helper.js";
import { abortEditing } from "../../shared/sharedUI.js";
import { setElementAttributes } from "../../shared/sharedUI.js";
import * as api from "./api/indexAPI.js";
import * as ui from "./frontend/indexUI.js"
@@ -11,42 +13,16 @@ async function addList(listName) {
if (json) ui.addList(json);
}
function editList(listLi) {
//erstellen das Forms
const formElement = ui.createEditListForm(listLi);
let id = listLi.dataset.id;
listLi.replaceWith(formElement);
formElement.querySelector(".editForm__name").focus();
formElement.addEventListener("submit", async (event) => {
event.preventDefault();
let formData = Object.fromEntries(new FormData(formElement));
const result = await handleResponse(api.editList(id, { newListName: formData.newListName }), `error editing list`);
if (result) ui.editList(id, formElement, formData, listLi);
});
formElement.querySelector(".editForm__abortButton").addEventListener("click", () => {
abortEditing(formElement, listLi);
})
formElement.addEventListener("keydown", (e) => {
if (e.key == "Escape") abortEditing(formElement, listLi);
})
}
async function deleteList(listElement) {
const json = await handleResponse(api.deleteList(listElement.dataset.id), `error deleting list`);
if (json) ui.deleteList(listElement);
}
function init() {
initErrors(document.querySelector(".nav"));
customElements.define("shopping-list", ShoppingList);
addListForm.addEventListener("submit", (e) => {
e.preventDefault();
const formData = Object.fromEntries(new FormData(addListForm));
@@ -55,14 +31,27 @@ function init() {
document.querySelector(".index").addEventListener("click", (event) => {
if (event.target.matches(".list__editButton")) {
editList(event.target.closest("li"));
const id = event.target.closest("li").dataset.id;
const shoppingListElement = event.target.closest("shopping-list");
const listName = shoppingListElement.querySelector(".list__name").textContent;
editElement({
element: shoppingListElement, apiCall: api.editList, id: id,
fields: [
{ name: "listName", value: listName, class: "editForm__name", attr: "list-name" }
]
, onSuccess: (f) => {
setElementAttributes(shoppingListElement, { "list-name": f.listName });
//nav wird hier ^ aktualisiert
}
, errmsg: `liste konnte nicht aktualsiiert werden`
})
} else if (event.target.matches(".list__deleteButton")) {
deleteList(event.target.closest("li"));
}
});
}
document.addEventListener('DOMContentLoaded', init);
@@ -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 });
@@ -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) => {
@@ -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");
+2 -4
View File
@@ -17,7 +17,7 @@ xmlns:th="http://www.thymeleaf.org">
<li class="nav__link"><a href="/">Alle Einkaufslisten</a></li>
<li class="nav__dropdown">Listen &gt;
<ul class="nav__dropdownMenu">
<li th:each="list : ${lists}" th:data-id="${list.id}" class="navbar__list">
<li th:each="list : ${lists}" th:data-id="${list.id}" class="nav__list">
<a th:text="${list.listName}" th:href="@{/list/{id}(id=${list.id})}"></a>
</li>
</ul>
@@ -33,9 +33,7 @@ xmlns:th="http://www.thymeleaf.org">
<ul class="displayedList">
<li th:each="list : ${lists}" class="list" th:data-id="${list.id}">
<a class="list__name" th:text="${list.listName}" th:href="@{/list/{id}(id=${list.id})}"></a>
<button type="button" class="list__editButton">Liste bearbeiten</button>
<button type="button" class="list__deleteButton">Liste löschen</button>
<shopping-list th:attr="list-name=${list.listName}"></shopping-list>
</li>
</ul>
</div>
+1 -1
View File
@@ -15,7 +15,7 @@
<li class="nav__link"><a href="/">Alle Einkaufslisten</a></li>
<li class="nav__dropdown">Listen &gt;
<ul class="nav__dropdownMenu">
<li th:each="list : ${lists}" th:data-id="${list.id}" class="navbar__list">
<li th:each="list : ${lists}" th:data-id="${list.id}" class="nav__list">
<a th:text="${list.listName}" th:href="@{/list/{id}(id=${list.id})}"></a>
</li>
</ul>