From 4622e91f264d0e610c4ad4272e9105fe6bba1b92 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 15:48:35 +0200 Subject: [PATCH 01/41] =?UTF-8?q?helper.js=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diese Datei hat eine methode handleResponse() welche die fetchanfrage übernimmt und dessen response handlet. --- src/main/resources/static/js/shared/helper.js | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/main/resources/static/js/shared/helper.js diff --git a/src/main/resources/static/js/shared/helper.js b/src/main/resources/static/js/shared/helper.js new file mode 100644 index 0000000..6164bc0 --- /dev/null +++ b/src/main/resources/static/js/shared/helper.js @@ -0,0 +1,22 @@ +import { showError } from "./error.js"; + + +export async function handleResponse(promise, errorMsg) { + const response = await promise; + + //weil 204 kein body ist un damit unparsbar, geben wir vorab true zurück + if (response.status == 204) { + return true; + } + + const json = await response.json(); + + if (!response.ok) { + showError(json.msg); + console.error(errorMsg); + return false; + } + + return json; + +} From 76a4b201b8201d099774a771defdae14ce1c9eb9 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 15:48:46 +0200 Subject: [PATCH 02/41] abort Funktion aus list.js ausgelagert --- src/main/resources/static/js/pages/list/frontend/listUI.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/resources/static/js/pages/list/frontend/listUI.js b/src/main/resources/static/js/pages/list/frontend/listUI.js index e6adab1..8da16ca 100644 --- a/src/main/resources/static/js/pages/list/frontend/listUI.js +++ b/src/main/resources/static/js/pages/list/frontend/listUI.js @@ -1,3 +1,4 @@ + export * from "./itemUI.js"; export * from "./categoryUI.js"; @@ -7,3 +8,7 @@ export function deleteAllDoneItems() { li.remove(); }) } + +export function abort(formElement, oldElement) { + formElement.replaceWith(oldElement); +} From 6233d27d7bc7c9371342b01c827e521db441a6d6 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 15:49:13 +0200 Subject: [PATCH 03/41] fehlerhandling mit handleResponse ersetzt --- .../resources/static/js/pages/list/list.js | 59 ++++--------------- 1 file changed, 10 insertions(+), 49 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index 2a9ef86..1a13757 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -13,34 +13,16 @@ const deleteAllDoneItemsButton = document.querySelector(".deleteAllDoneItemsButt async function addItem(itemName, itemAmount, categoryID) { console.log(` adding item with id:${currentList.dataset.id}, name: ${itemName}, amount: ${itemAmount}, category: ${categoryID}`) - const response = await api.addItem(currentList.dataset.id, itemName, itemAmount, categoryID); - const json = await response.json(); - - if (!response.ok) { - console.error(`Error, item couldnt be created ${json}`); - showError(json.msg); - return; - } - - console.log(`rendering frontend item: ${json}`); - ui.addItem(json); + const json = await handleResponse(api.addItem(currentList.dataset.id, itemName, itemAmount, categoryID), `item couldnt be created!`); + if (json) ui.addItem(json); } async function addCategory(categoryName) { console.log(`adding category ${categoryName}`) - const response = await api.addCategory(currentList.dataset.id, categoryName); - const json = await response.json(); + const json = await handleResponse(api.addCategory(currentList.dataset.id, categoryName), `category couldnt be added!`); + if (json) ui.addCategory(json); - if (!response.ok) { - console.error(`Error, category couldnt be created ${json}`); - showError(json.msg); - - return; - } - - ui.addCategory(json); - return 0; } //shoppingItem ist immer das li mit der id @@ -140,43 +122,22 @@ function editCategory(categoryElement, id) { } async function deleteItem(li) { - const response = await api.deleteItem(li.dataset.id); + const json = await handleResponse(api.deleteItem(li.dataset.id), `error deleting item`); - if (!response.ok) { - const json = await response.json(); - console.error(`Error deleting item ${json}`); - showError(json.msg); - return; - } - - ui.deleteItem(li); + if (json) ui.deleteItem(li); } async function deleteCategory(deleteAllItems, categoryID) { console.log(`deleting category with allItems: ${deleteAllItems} id: ${categoryID}`); - const response = await api.deleteCategory(deleteAllItems, categoryID); + const json = await handleResponse(api.deleteCategory(deleteAllItems, categoryID), `error deleting category`); - if (!response.ok) { - const json = await response.json(); - console.error(`Error deleting category ${json}`); - showError(json.msg); - return; - } - ui.deleteCategory(deleteAllItems, categoryID); + if (json) ui.deleteCategory(deleteAllItems, categoryID); } async function deleteAllDoneItems() { console.log(`deleting all done items...`) - const response = await api.deleteAllDoneItems(currentList.dataset.id); - - if (!response.ok) { - const json = await response.json(); - console.error(`Error deleting all done items ${json}`); - showError(json.msg); - - return; - } - ui.deleteAllDoneItems(); + const json = await handleResponse(api.deleteAllDoneItems(currentList.dataset.id), `error deleting all done items`); + if (json) ui.deleteAllDoneItems(); } function init() { From e715e66929067313ebe2229cbac62a63ee79dfff Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 15:49:30 +0200 Subject: [PATCH 04/41] abort mit ui.abort ersetzt --- src/main/resources/static/js/pages/list/list.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index 1a13757..799c04a 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -63,11 +63,11 @@ async function editItem(shoppingItem, id) { }); formElement.addEventListener("click", (e) => { - if (e.target.matches(".editForm__buttonAbort")) abort(); + if (e.target.matches(".editForm__buttonAbort")) ui.abort(formElement, shoppingItem); }) formElement.addEventListener("keydown", (e) => { - if (e.key == "Escape") abort(); + if (e.key == "Escape") ui.abort(formElement, shoppingItem); }); @@ -112,13 +112,13 @@ function editCategory(categoryElement, id) { }); formElement.addEventListener("click", (e) => { - if (e.target.matches(".editForm__buttonAbort")) abort(); - }) + if (e.target.matches(".editForm__buttonAbort")) ui.abort(formElement, categoryDiv); + }); formElement.addEventListener("keydown", (e) => { - if (e.key == "Escape") abort(); - }) + if (e.key == "Escape") ui.abort(formElement, categoryDiv); + }); } async function deleteItem(li) { From ed05aa3a534f92819de0300c07e5ff17a996f1bd Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 15:51:19 +0200 Subject: [PATCH 05/41] =?UTF-8?q?save=20und=20abort=20entfernt=20und=20gek?= =?UTF-8?q?=C3=BCrtzt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/static/js/pages/list/list.js | 52 +++---------------- 1 file changed, 8 insertions(+), 44 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index 799c04a..565ed04 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -36,30 +36,12 @@ async function editItem(shoppingItem, id) { formElement.querySelector(".editForm__name").focus(); - async function save() { - + formElement.addEventListener("submit", async (event) => { + event.preventDefault(); let formData = Object.fromEntries(new FormData(formElement)); console.log(`editing item ${id} with ${formData}`) - - const response = await api.editItem(id, { itemName: formData.newItemName, itemAmount: formData.newItemAmount }); - - if (!response.ok) { - const json = await response.json(); - console.error(`Error editingItem ${json}`); - showError(json.msg) - return; - } - - ui.editItem(shoppingItem, formElement, formData); - } - - function abort() { - formElement.replaceWith(shoppingItem); - } - - formElement.addEventListener("submit", (event) => { - event.preventDefault(); - save(); + let result = handleResponse(api.editItem(id, { itemName: formData.newItemName, itemAmount: formData.newItemAmount }), `kapot item`); + if (result) ui.editItem(shoppingItem, formElement, formData); }); formElement.addEventListener("click", (e) => { @@ -83,32 +65,14 @@ function editCategory(categoryElement, id) { formElement.querySelector(".editForm__name").focus(); - async function save() { - + formElement.addEventListener("submit", async (event) => { + event.preventDefault(); let formData = Object.fromEntries(new FormData(formElement)); console.log(`editing catogory ${id} with ${formData}`) + const result = await handleResponse(api.editCategory(id, { categoryName: formData.newCategoryName }), `error editing category`); + if (result) ui.editCategory(id, formElement, formData, categoryDiv); - const response = await api.editCategory(id, { categoryName: formData.newCategoryName }); - - if (!response.ok) { - const json = await response.json(); - console.error(`Error editing category ${json}`); - showError(json.msg); - return; - } - - ui.editCategory(id, formElement, formData, categoryDiv); - } - - function abort() { - formElement.replaceWith(categoryDiv); - } - - - formElement.addEventListener("submit", (event) => { - event.preventDefault(); - save(); }); formElement.addEventListener("click", (e) => { From 1290df93f62151b1146fe273c5db1e7402f01c5b Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 15:51:30 +0200 Subject: [PATCH 06/41] editCategory nimmt jtz direkt den header --- src/main/resources/static/js/pages/list/list.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index 565ed04..2d79945 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -55,10 +55,9 @@ async function editItem(shoppingItem, id) { } -function editCategory(categoryElement, id) { +function editCategory(categoryDiv, id) { //erstellen das Forms //wir nutzen für das Element nur das div, weil sonst alle items mitgelöscht werden würden - const categoryDiv = categoryElement.querySelector(".category__header"); const formElement = ui.createEditCategoryForm(categoryDiv.querySelector(".category__name").textContent); categoryDiv.replaceWith(formElement); @@ -68,7 +67,6 @@ function editCategory(categoryElement, id) { formElement.addEventListener("submit", async (event) => { event.preventDefault(); let formData = Object.fromEntries(new FormData(formElement)); - console.log(`editing catogory ${id} with ${formData}`) const result = await handleResponse(api.editCategory(id, { categoryName: formData.newCategoryName }), `error editing category`); if (result) ui.editCategory(id, formElement, formData, categoryDiv); @@ -146,7 +144,7 @@ function init() { } else if (event.target.closest(".category__name")) { const li = event.target.closest("li"); - editCategory(event.target.closest("shopping-category"), li.dataset.id); + editCategory(event.target.closest(".category__header"), li.dataset.id); } }); From e736170735087642a8978cf3efeff08e19e6aab6 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 15:51:38 +0200 Subject: [PATCH 07/41] name und amount in variable ausgelagert --- src/main/resources/static/js/pages/list/list.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index 2d79945..ced15aa 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -30,7 +30,9 @@ async function editItem(shoppingItem, id) { //erstellen das Forms - const formElement = ui.createEditItemForm(shoppingItem.querySelector(".item__itemName").textContent, shoppingItem.querySelector(".item__itemAmount").textContent); + const itemName = shoppingItem.querySelector(".item__itemName").textContent; + const itemAmount = shoppingItem.querySelector(".item__itemAmount").textContent; + const formElement = ui.createEditItemForm(itemName, itemAmount); shoppingItem.replaceWith(formElement); From 9c0d70474837ec20f732f834f80bc106f2811b44 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 15:51:40 +0200 Subject: [PATCH 08/41] import --- src/main/resources/static/js/pages/list/list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index ced15aa..9a1ce18 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -3,7 +3,7 @@ import { ShoppingItem } from "../../models/ShoppingItem.js"; import { showError, initErrors } from "../../shared/error.js"; import * as api from "./api/listAPI.js" import * as ui from "./frontend/listUI.js" - +import { handleResponse } from "../../shared/helper.js"; const addCategoryForm = document.querySelector(".addCategoryForm"); const addItemForm = document.querySelector(".addItemForm"); From 01dd5c9089c9975d6d379351bda26fd66949b80f Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 16:00:12 +0200 Subject: [PATCH 09/41] =?UTF-8?q?await=20hinzugef=C3=BCgt=20und=20showErro?= =?UTF-8?q?r=20import=20entfern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/pages/list/list.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index 9a1ce18..d95ff3c 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -1,6 +1,6 @@ import { ShoppingCategory } from "../../models/ShoppingCategory.js"; import { ShoppingItem } from "../../models/ShoppingItem.js"; -import { showError, initErrors } from "../../shared/error.js"; +import { initErrors } from "../../shared/error.js"; import * as api from "./api/listAPI.js" import * as ui from "./frontend/listUI.js" import { handleResponse } from "../../shared/helper.js"; @@ -40,9 +40,11 @@ async function editItem(shoppingItem, id) { formElement.addEventListener("submit", async (event) => { event.preventDefault(); + let formData = Object.fromEntries(new FormData(formElement)); console.log(`editing item ${id} with ${formData}`) - let result = handleResponse(api.editItem(id, { itemName: formData.newItemName, itemAmount: formData.newItemAmount }), `kapot item`); + + let result = await handleResponse(api.editItem(id, { itemName: formData.newItemName, itemAmount: formData.newItemAmount }), `kapot item`); if (result) ui.editItem(shoppingItem, formElement, formData); }); @@ -68,8 +70,10 @@ function editCategory(categoryDiv, id) { formElement.addEventListener("submit", async (event) => { event.preventDefault(); + let formData = Object.fromEntries(new FormData(formElement)); console.log(`editing catogory ${id} with ${formData}`) + const result = await handleResponse(api.editCategory(id, { categoryName: formData.newCategoryName }), `error editing category`); if (result) ui.editCategory(id, formElement, formData, categoryDiv); From 730248f3e80c1ff2927c6937e90dfb57cc987c74 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 16:07:59 +0200 Subject: [PATCH 10/41] abort nach shared ausgelagert --- src/main/resources/static/js/pages/list/frontend/listUI.js | 3 --- src/main/resources/static/js/shared/sharedUI.js | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/static/js/shared/sharedUI.js diff --git a/src/main/resources/static/js/pages/list/frontend/listUI.js b/src/main/resources/static/js/pages/list/frontend/listUI.js index 8da16ca..14a8a56 100644 --- a/src/main/resources/static/js/pages/list/frontend/listUI.js +++ b/src/main/resources/static/js/pages/list/frontend/listUI.js @@ -9,6 +9,3 @@ export function deleteAllDoneItems() { }) } -export function abort(formElement, oldElement) { - formElement.replaceWith(oldElement); -} diff --git a/src/main/resources/static/js/shared/sharedUI.js b/src/main/resources/static/js/shared/sharedUI.js new file mode 100644 index 0000000..c8c7326 --- /dev/null +++ b/src/main/resources/static/js/shared/sharedUI.js @@ -0,0 +1,4 @@ + +export function abortEditing(formElement, old) { + formElement.replaceWith(old); +} From 588677785499a594849e12fbf2560fd6e22c0dfb Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 16:08:09 +0200 Subject: [PATCH 11/41] refactor --- src/main/resources/static/js/pages/list/list.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index d95ff3c..22e14af 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -4,6 +4,7 @@ import { initErrors } from "../../shared/error.js"; import * as api from "./api/listAPI.js" import * as ui from "./frontend/listUI.js" import { handleResponse } from "../../shared/helper.js"; +import { abortEditing } from "../../shared/sharedUI.js"; const addCategoryForm = document.querySelector(".addCategoryForm"); const addItemForm = document.querySelector(".addItemForm"); @@ -49,11 +50,11 @@ async function editItem(shoppingItem, id) { }); formElement.addEventListener("click", (e) => { - if (e.target.matches(".editForm__buttonAbort")) ui.abort(formElement, shoppingItem); + if (e.target.matches(".editForm__buttonAbort")) abortEditing(formElement, shoppingItem); }) formElement.addEventListener("keydown", (e) => { - if (e.key == "Escape") ui.abort(formElement, shoppingItem); + if (e.key == "Escape") abortEditing(formElement, shoppingItem); }); @@ -80,12 +81,12 @@ function editCategory(categoryDiv, id) { }); formElement.addEventListener("click", (e) => { - if (e.target.matches(".editForm__buttonAbort")) ui.abort(formElement, categoryDiv); + if (e.target.matches(".editForm__buttonAbort")) abortEditing(formElement, categoryDiv); }); formElement.addEventListener("keydown", (e) => { - if (e.key == "Escape") ui.abort(formElement, categoryDiv); + if (e.key == "Escape") abortEditing(formElement, categoryDiv); }); } From 9b552b88f8850023de873e7f2e3d361cf5d904ed Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 16:08:14 +0200 Subject: [PATCH 12/41] import entfertn --- src/main/resources/static/js/pages/list/frontend/itemUI.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/resources/static/js/pages/list/frontend/itemUI.js b/src/main/resources/static/js/pages/list/frontend/itemUI.js index b7f2993..66cf9e4 100644 --- a/src/main/resources/static/js/pages/list/frontend/itemUI.js +++ b/src/main/resources/static/js/pages/list/frontend/itemUI.js @@ -1,5 +1,3 @@ -import { ShoppingItem } from "../../../models/ShoppingItem.js"; - export function addItem(itemAsJSON) { let list; if (!itemAsJSON.categoryID) { From c99d5f43478220390e37bfa8d72af1068f9a6d7b Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 16:08:20 +0200 Subject: [PATCH 13/41] wsp --- src/main/resources/static/js/pages/index/frontend/indexUI.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 678996c..6514097 100644 --- a/src/main/resources/static/js/pages/index/frontend/indexUI.js +++ b/src/main/resources/static/js/pages/index/frontend/indexUI.js @@ -47,5 +47,6 @@ export function editList(id, formElement, formData, listLi) { listLi.querySelector(".list__name").textContent = newName; listLi.setAttribute("href", `/list/${id}`); formElement.replaceWith(listLi); - } + + From d222604fcf23828932b5d462bd19b89ea1f3fd72 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 16:08:46 +0200 Subject: [PATCH 14/41] error handler mit handleResponse ersetzt und abort mit abortEditing --- .../resources/static/js/pages/index/index.js | 58 +++++-------------- 1 file changed, 14 insertions(+), 44 deletions(-) diff --git a/src/main/resources/static/js/pages/index/index.js b/src/main/resources/static/js/pages/index/index.js index a3e0dd9..efb6ae3 100644 --- a/src/main/resources/static/js/pages/index/index.js +++ b/src/main/resources/static/js/pages/index/index.js @@ -1,20 +1,14 @@ -import { showError, initErrors } from "../../shared/error.js"; +import { initErrors } from "../../shared/error.js"; +import { handleResponse } from "../../shared/helper.js"; +import { abortEditing } from "../../shared/sharedUI.js"; import * as api from "./api/indexAPI.js"; import * as ui from "./frontend/indexUI.js" const addListForm = document.querySelector(".addListForm"); async function addList(listName) { - const response = await api.addList(listName); - const json = await response.json(); - - if (!response.ok) { - console.error(`error creating list ${json.msg}`); - showError(json.msg); - return; - } - - ui.addList(json); + const json = await handleResponse(api.addList(listName), `error creating list`); + if (json) ui.addList(json); } function editList(listLi) { @@ -26,51 +20,27 @@ function editList(listLi) { formElement.querySelector(".editForm__name").focus(); - async function save() { - let formData = Object.fromEntries(new FormData(formElement)); - - console.log(`editing catogory ${id} with ${formData}`) - const response = await api.editList(id, { newListName: formData.newListName }); - - if (!response.ok) { - const json = await response.json(); - console.error(`error editing list ${json}`); - showError(json.msg); - - return; - } - - ui.editList(id, formElement, formData, listLi); - } - - formElement.addEventListener("submit", (event) => { + formElement.addEventListener("submit", async (event) => { event.preventDefault(); - save(); + + 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", () => { - formElement.replaceWith(listLi); + abortEditing(formElement, listLi); }) formElement.addEventListener("keydown", (e) => { - if (e.key == "Escape") formElement.replaceWith(listLi); + if (e.key == "Escape") abortEditing(formElement, listLi); }) } async function deleteList(listElement) { - - const response = await api.deleteList(listElement.dataset.id); - - if (!response.ok) { - const json = await response.json(); - console.error(`error deleting list ${json}`); - showError(json.msg); - - return; - } - - ui.deleteList(listElement); + const json = await handleResponse(api.deleteList(listElement.dataset.id), `error deleting list`); + if (json) ui.deleteList(listElement); } From b2badea8557b9396f830511befc8e57025f078d6 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 17:36:45 +0200 Subject: [PATCH 15/41] refactor --- src/main/resources/static/js/pages/list/frontend/itemUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/static/js/pages/list/frontend/itemUI.js b/src/main/resources/static/js/pages/list/frontend/itemUI.js index 66cf9e4..d85a9bd 100644 --- a/src/main/resources/static/js/pages/list/frontend/itemUI.js +++ b/src/main/resources/static/js/pages/list/frontend/itemUI.js @@ -49,8 +49,8 @@ export function createEditItemForm(currentName, currentAmount) { export function editItem(shoppingItemElement, formElement, formData) { - let newName = formData.newItemName; - let newAmount = formData.newItemAmount; + let newName = formData.itemName; + let newAmount = formData.itemAmount; shoppingItemElement.setAttribute("item-name", newName); shoppingItemElement.setAttribute("item-amount", newAmount); From 9e58b18e439711607a71d81a637a94bd119431bd Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 17:37:23 +0200 Subject: [PATCH 16/41] =?UTF-8?q?createEditForm=20erstellt=20ein=20editFor?= =?UTF-8?q?m=20unabh=C3=A4ngig=20von=20dem=20zu=20beabretieten=20Gegenstan?= =?UTF-8?q?d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/static/js/shared/sharedUI.js | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/main/resources/static/js/shared/sharedUI.js b/src/main/resources/static/js/shared/sharedUI.js index c8c7326..ac7ee45 100644 --- a/src/main/resources/static/js/shared/sharedUI.js +++ b/src/main/resources/static/js/shared/sharedUI.js @@ -2,3 +2,37 @@ export function abortEditing(formElement, old) { formElement.replaceWith(old); } + + +export function createEditForm(fields) { + const editForm = document.createElement("form"); + const abortButton = document.createElement("button"); + const saveButton = document.createElement("button"); + + const inputs = fields.map(f => { + const input = document.createElement("input"); + input.setAttribute("name", f.name); + input.setAttribute("value", f.value); + input.classList.add(f.class); + return input; + }); + + abortButton.setAttribute("type", "button"); + abortButton.classList.add("editForm__buttonAbort"); + abortButton.textContent = "Abbrechen"; + + saveButton.textContent = "Speichern"; + saveButton.classList.add("editForm__buttonSave"); + saveButton.setAttribute("type", "submit"); + + + editForm.append(...inputs, saveButton, abortButton); + + return editForm; +} + + +export function editElement() { + +} + From a89225fce666cd456884e1b098e19ab1294d8d37 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 18:31:48 +0200 Subject: [PATCH 17/41] =?UTF-8?q?javascript=20ist=20schei=C3=9Fe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/models/ShoppingCategory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/static/js/models/ShoppingCategory.js b/src/main/resources/static/js/models/ShoppingCategory.js index a8545a2..b0c5d1e 100644 --- a/src/main/resources/static/js/models/ShoppingCategory.js +++ b/src/main/resources/static/js/models/ShoppingCategory.js @@ -44,7 +44,7 @@ export class ShoppingCategory extends HTMLElement { } - attributeChangeCallback(name, oldVal, newVal) { + attributeChangedCallback(name, oldVal, newVal) { if (!this._rendered) return; if (newVal == oldVal) return; switch (name) { From f2a5419064a1acb8e2bea61b94b5d69f199e7f76 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 18:32:29 +0200 Subject: [PATCH 18/41] editElement implementiert MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit man gibt ihr das Element und eine Liste an Attribute welche geändert werden sollen. Der attributeChangedCallback des Elementes macht dann den Rest --- src/main/resources/static/js/shared/sharedUI.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/static/js/shared/sharedUI.js b/src/main/resources/static/js/shared/sharedUI.js index ac7ee45..2bc7682 100644 --- a/src/main/resources/static/js/shared/sharedUI.js +++ b/src/main/resources/static/js/shared/sharedUI.js @@ -32,7 +32,9 @@ export function createEditForm(fields) { } -export function editElement() { +export function editElement(element, attributes) { + + for (const [attr, val] of Object.entries(attributes)) element.setAttribute(attr, val); } From e008e2583e8c78c5441820da0d79d3792e8b0bc4 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 18:55:40 +0200 Subject: [PATCH 19/41] editForm wird jtz mit editForm() erstellt --- src/main/resources/static/js/pages/list/list.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index 22e14af..53bb83b 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -33,7 +33,10 @@ async function editItem(shoppingItem, id) { //erstellen das Forms const itemName = shoppingItem.querySelector(".item__itemName").textContent; const itemAmount = shoppingItem.querySelector(".item__itemAmount").textContent; - const formElement = ui.createEditItemForm(itemName, itemAmount); + const formElement = createEditForm([ + { name: "itemName", value: itemName, class: "editForm__name" }, + { name: "itemAmount", value: itemAmount, class: "editForm__amount" } + ]); shoppingItem.replaceWith(formElement); @@ -60,12 +63,15 @@ async function editItem(shoppingItem, id) { } -function editCategory(categoryDiv, id) { +function editCategory(categoryElement, id) { //erstellen das Forms //wir nutzen für das Element nur das div, weil sonst alle items mitgelöscht werden würden - const formElement = ui.createEditCategoryForm(categoryDiv.querySelector(".category__name").textContent); + let categoryName = categoryElement.querySelector(".category__name").textContent; + const formElement = createEditForm([ + { name: "categoryName", value: categoryName, class: "editForm__name" } + ]); - categoryDiv.replaceWith(formElement); + categoryElement.replaceWith(formElement); formElement.querySelector(".editForm__name").focus(); From 5f9ce7847669c6ad5130d2a39f318e32f5303653 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 18:55:51 +0200 Subject: [PATCH 20/41] element wird jtz miteditElement bearbeitet --- src/main/resources/static/js/pages/list/list.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index 53bb83b..9875037 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -48,8 +48,9 @@ async function editItem(shoppingItem, id) { let formData = Object.fromEntries(new FormData(formElement)); console.log(`editing item ${id} with ${formData}`) - let result = await handleResponse(api.editItem(id, { itemName: formData.newItemName, itemAmount: formData.newItemAmount }), `kapot item`); - if (result) ui.editItem(shoppingItem, formElement, formData); + let result = await handleResponse(api.editItem(id, { itemName: formData.itemName, itemAmount: formData.itemAmount }), `kapot item`); + if (result) editElement(shoppingItem, { "item-name": formData.itemName, "item-amount": formData.itemAmount }); + abortEditing(formElement, shoppingItem); }); formElement.addEventListener("click", (e) => { @@ -81,8 +82,12 @@ function editCategory(categoryElement, id) { let formData = Object.fromEntries(new FormData(formElement)); console.log(`editing catogory ${id} with ${formData}`) - const result = await handleResponse(api.editCategory(id, { categoryName: formData.newCategoryName }), `error editing category`); - if (result) ui.editCategory(id, formElement, formData, categoryDiv); + const result = await handleResponse(api.editCategory(id, { categoryName: formData.categoryName }), `error editing category`); + if (result) { + editElement(categoryElement, { "category-name": formData.categoryName }); + document.querySelector(`option[value='${id}']`).textContent = formData.categoryName; + abortEditing(formElement, categoryElement); + } }); From df90bf21d1b329f016f0da87656ac522f23d24b5 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 18:56:02 +0200 Subject: [PATCH 21/41] editCateogry nimmt jtz das element shopping-category --- src/main/resources/static/js/pages/list/list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index 9875037..fe037c2 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -162,7 +162,7 @@ function init() { } else if (event.target.closest(".category__name")) { const li = event.target.closest("li"); - editCategory(event.target.closest(".category__header"), li.dataset.id); + editCategory(event.target.closest("shopping-category"), li.dataset.id); } }); From 6c227dcaad7cbab3d6d491f35872898279243084 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 18:56:06 +0200 Subject: [PATCH 22/41] imports --- src/main/resources/static/js/pages/list/list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index fe037c2..665ffc2 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -4,7 +4,7 @@ import { initErrors } from "../../shared/error.js"; import * as api from "./api/listAPI.js" import * as ui from "./frontend/listUI.js" import { handleResponse } from "../../shared/helper.js"; -import { abortEditing } from "../../shared/sharedUI.js"; +import { abortEditing, createEditForm, editElement } from "../../shared/sharedUI.js"; const addCategoryForm = document.querySelector(".addCategoryForm"); const addItemForm = document.querySelector(".addItemForm"); From 97de07362160830f2c797029eaf6dff41a113f0e Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 19:53:20 +0200 Subject: [PATCH 23/41] generische editElement funktioni impleenneit --- .../resources/static/js/pages/list/list.js | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index 665ffc2..9e48c88 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -26,42 +26,38 @@ async function addCategory(categoryName) { } -//shoppingItem ist immer das li mit der id -async function editItem(shoppingItem, id) { +async function editElement(elementToEdit, fields, apiPath, errmsg) { + const formElement = sharedUI.createEditForm(fields); - //erstellen das Forms - const itemName = shoppingItem.querySelector(".item__itemName").textContent; - const itemAmount = shoppingItem.querySelector(".item__itemAmount").textContent; - const formElement = createEditForm([ - { name: "itemName", value: itemName, class: "editForm__name" }, - { name: "itemAmount", value: itemAmount, class: "editForm__amount" } - ]); + elementToEdit.replaceWith(formElement); - shoppingItem.replaceWith(formElement); - - formElement.querySelector(".editForm__name").focus(); + formElement.querySelector("input").focus(); formElement.addEventListener("submit", async (event) => { event.preventDefault(); let formData = Object.fromEntries(new FormData(formElement)); - console.log(`editing item ${id} with ${formData}`) - let result = await handleResponse(api.editItem(id, { itemName: formData.itemName, itemAmount: formData.itemAmount }), `kapot item`); - if (result) editElement(shoppingItem, { "item-name": formData.itemName, "item-amount": formData.itemAmount }); - abortEditing(formElement, shoppingItem); + + //erstellen einer Liste mit attr-name : Wert des neuen Attributes + const editedFields = Object.fromEntries( + fields.map((f) => [f.attr, formData[f.name]]) + ); + + let result = await handleResponse(sharedAPI.editElement(apiPath, formData), errmsg); + if (result) sharedUI.editElement(elementToEdit, editedFields); + sharedUI.abortEditing(formElement, elementToEdit); }); formElement.addEventListener("click", (e) => { - if (e.target.matches(".editForm__buttonAbort")) abortEditing(formElement, shoppingItem); + if (e.target.matches(".editForm__buttonAbort")) sharedUI.abortEditing(formElement, elementToEdit); }) formElement.addEventListener("keydown", (e) => { - if (e.key == "Escape") abortEditing(formElement, shoppingItem); + if (e.key == "Escape") sharedUI.abortEditing(formElement, elementToEdit); }); - } function editCategory(categoryElement, id) { From dfff051b55e189401fd022618bac9bbf6a09dcac Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 19:53:27 +0200 Subject: [PATCH 24/41] editCateogry entfern --- .../resources/static/js/pages/list/list.js | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index 9e48c88..acd5e2f 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -60,42 +60,6 @@ async function editElement(elementToEdit, fields, apiPath, errmsg) { } -function editCategory(categoryElement, id) { - //erstellen das Forms - //wir nutzen für das Element nur das div, weil sonst alle items mitgelöscht werden würden - let categoryName = categoryElement.querySelector(".category__name").textContent; - const formElement = createEditForm([ - { name: "categoryName", value: categoryName, class: "editForm__name" } - ]); - - categoryElement.replaceWith(formElement); - - formElement.querySelector(".editForm__name").focus(); - - formElement.addEventListener("submit", async (event) => { - event.preventDefault(); - - let formData = Object.fromEntries(new FormData(formElement)); - console.log(`editing catogory ${id} with ${formData}`) - - const result = await handleResponse(api.editCategory(id, { categoryName: formData.categoryName }), `error editing category`); - if (result) { - editElement(categoryElement, { "category-name": formData.categoryName }); - document.querySelector(`option[value='${id}']`).textContent = formData.categoryName; - abortEditing(formElement, categoryElement); - } - - }); - - formElement.addEventListener("click", (e) => { - if (e.target.matches(".editForm__buttonAbort")) abortEditing(formElement, categoryDiv); - }); - - - formElement.addEventListener("keydown", (e) => { - if (e.key == "Escape") abortEditing(formElement, categoryDiv); - }); -} async function deleteItem(li) { const json = await handleResponse(api.deleteItem(li.dataset.id), `error deleting item`); From 593c540d810052a7b237e0a4de726cea70ff0f1b Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 19:54:06 +0200 Subject: [PATCH 25/41] spezifische editfunktionen durch generische ersettzt --- .../resources/static/js/pages/list/list.js | 40 ++++++++++++++----- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index acd5e2f..74031f9 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -117,23 +117,41 @@ function init() { } else if (event.target.closest(".item__text")) { const shoppingItemElement = event.target.closest("shopping-item"); - editItem(shoppingItemElement, shoppingItemElement.closest("li").dataset.id); + const id = event.target.closest("li").dataset.id; + + let itemName = shoppingItemElement.querySelector(".item__itemName").textContent; + let itemAmount = shoppingItemElement.querySelector(".item__itemAmount").textContent; + /* + * { name: "", value: "", class: "", attr: ""} + */ + + editElement( + shoppingItemElement, + [ + { name: "itemName", value: itemName, class: "editForm__name", attr: "item-name" }, + { name: "itemAmount", value: itemAmount, class: "editForm__amount", attr: "item-amount" } + ] + , `/api/items/${id}` + , `konnte Item nicht bearbeiten` + ); + //editItem(shoppingItemElement, shoppingItemElement.closest("li").dataset.id); } else if (event.target.closest(".category__name")) { - const li = event.target.closest("li"); - editCategory(event.target.closest("shopping-category"), li.dataset.id); + const categoryElement = event.target.closest("shopping-category"); + const id = event.target.closest("li").dataset.id; - } - }); + let categoryName = categoryElement.querySelector(".category__name").textContent; - document.querySelector(".displayedList").addEventListener("change", (e) => { - if (e.target.matches(".item__checkboxDone")) { - 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 }); + editElement( + categoryElement, + [ + { name: "categoryName", value: categoryName, class: "editForm__name", attr: "category-name" } + ] + , `/api/categories/${id}` + , `konnte kategrie nicht beabrietn` + ); } - }); console.log("javascript initialized!"); return 0; From 69389afdb76037356c0002437e7eff3d3c678e00 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 19:54:20 +0200 Subject: [PATCH 26/41] artefakt --- src/main/resources/static/js/pages/list/list.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index 74031f9..9ee6627 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -153,9 +153,18 @@ function init() { ); } + document.querySelector(".displayedList").addEventListener("change", (e) => { + if (e.target.matches(".item__checkboxDone")) { + 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 }); + } + }); + }); console.log("javascript initialized!"); return 0; } + document.addEventListener('DOMContentLoaded', init); From f33b979bcbbdc35d62247d0274f7016352732b91 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 19:54:23 +0200 Subject: [PATCH 27/41] impots --- src/main/resources/static/js/pages/list/list.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index 9ee6627..ebdf1e4 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -4,7 +4,8 @@ import { initErrors } from "../../shared/error.js"; import * as api from "./api/listAPI.js" import * as ui from "./frontend/listUI.js" import { handleResponse } from "../../shared/helper.js"; -import { abortEditing, createEditForm, editElement } from "../../shared/sharedUI.js"; +import * as sharedUI from "../../shared/sharedUI.js"; +import * as sharedAPI from "../../shared/sharedAPI.js"; const addCategoryForm = document.querySelector(".addCategoryForm"); const addItemForm = document.querySelector(".addItemForm"); From 1dd335e166b99779b62c524af264755eeff433ec Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 19:54:35 +0200 Subject: [PATCH 28/41] generishce editElement funktion implementiert --- src/main/resources/static/js/shared/sharedAPI.js | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/main/resources/static/js/shared/sharedAPI.js diff --git a/src/main/resources/static/js/shared/sharedAPI.js b/src/main/resources/static/js/shared/sharedAPI.js new file mode 100644 index 0000000..eb5a750 --- /dev/null +++ b/src/main/resources/static/js/shared/sharedAPI.js @@ -0,0 +1,8 @@ +export async function editElement(apiPath, toChange) { + return await fetch(apiPath, + { + method: "PATCH", + body: JSON.stringify(toChange), + headers: { "Content-Type": "application/json" } + }); +} From b3ec0257d5e9dc4dcf886c5e48b4d99392f6590a Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 20:18:41 +0200 Subject: [PATCH 29/41] editElement mit einem {} objekt ersetzt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Erlaubt es uns besser und übersichtlicher zu parametisieren, da ansonsten zu übersichtlich --- .../resources/static/js/pages/list/list.js | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index ebdf1e4..c76bf1f 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -27,11 +27,10 @@ async function addCategory(categoryName) { } -async function editElement(elementToEdit, fields, apiPath, errmsg) { - +async function editElement({ element, fields, apiCall, id, onSuccess, errmsg }) { const formElement = sharedUI.createEditForm(fields); - elementToEdit.replaceWith(formElement); + element.replaceWith(formElement); formElement.querySelector("input").focus(); @@ -39,26 +38,20 @@ async function editElement(elementToEdit, fields, apiPath, errmsg) { event.preventDefault(); let formData = Object.fromEntries(new FormData(formElement)); + let result = await handleResponse(apiCall(id, formData), errmsg); + sharedUI.abortEditing(formElement, element); - //erstellen einer Liste mit attr-name : Wert des neuen Attributes - const editedFields = Object.fromEntries( - fields.map((f) => [f.attr, formData[f.name]]) - ); - - let result = await handleResponse(sharedAPI.editElement(apiPath, formData), errmsg); - if (result) sharedUI.editElement(elementToEdit, editedFields); - sharedUI.abortEditing(formElement, elementToEdit); + if (result) onSuccess(formData); }); formElement.addEventListener("click", (e) => { - if (e.target.matches(".editForm__buttonAbort")) sharedUI.abortEditing(formElement, elementToEdit); + if (e.target.matches(".editForm__buttonAbort")) sharedUI.abortEditing(formElement, element); }) formElement.addEventListener("keydown", (e) => { - if (e.key == "Escape") sharedUI.abortEditing(formElement, elementToEdit); + if (e.key == "Escape") sharedUI.abortEditing(formElement, element); }); - } From 08315359c7c55f1ae708f65547b87b4349ed2fb9 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 20:19:00 +0200 Subject: [PATCH 30/41] =?UTF-8?q?editElement=20neue=20Parameter=20eingef?= =?UTF-8?q?=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/pages/list/list.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index c76bf1f..35c94b1 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -119,15 +119,15 @@ function init() { * { name: "", value: "", class: "", attr: ""} */ - editElement( - shoppingItemElement, - [ + editElement({ + element: shoppingItemElement, apiCall: api.editItem, id: id, + fields: [ { name: "itemName", value: itemName, class: "editForm__name", attr: "item-name" }, { name: "itemAmount", value: itemAmount, class: "editForm__amount", attr: "item-amount" } ] - , `/api/items/${id}` - , `konnte Item nicht bearbeiten` - ); + , onSuccess: (f) => { sharedUI.setElementAttributes(shoppingItemElement, { "item-name": f.itemName, "item-amount": f.itemAmount }) } + , errmsg: `konnte Item nicht bearbeiten` + }); //editItem(shoppingItemElement, shoppingItemElement.closest("li").dataset.id); } else if (event.target.closest(".category__name")) { From 79443930e2841bc5a52fa7a5d33d879e1a48dacf Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 20:19:35 +0200 Subject: [PATCH 31/41] =?UTF-8?q?editElement=20neue=20Paraemter=20eingef?= =?UTF-8?q?=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit das coole an dem neuen model ist, dass wir heade rund das element auch so bearbeiten können mit einer funktion --- .../resources/static/js/pages/list/list.js | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index 35c94b1..85765b6 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -133,18 +133,24 @@ function init() { } else if (event.target.closest(".category__name")) { const categoryElement = event.target.closest("shopping-category"); + const categoryHeader = event.target.closest(".category__header"); const id = event.target.closest("li").dataset.id; let categoryName = categoryElement.querySelector(".category__name").textContent; - editElement( - categoryElement, - [ - { name: "categoryName", value: categoryName, class: "editForm__name", attr: "category-name" } + editElement({ + element: categoryHeader, apiCall: api.editCategory, id: id, + fields: [ + { name: "categoryName", value: categoryName, class: "editForm__name", attr: "category-name" }, ] - , `/api/categories/${id}` - , `konnte kategrie nicht beabrietn` - ); + , onSuccess: (f) => { + sharedUI.setElementAttributes(categoryElement, { "category-name": f.categoryName }) + document.querySelector(`option[value='${id}']`).textContent = f.categoryName; + //option name ändern + } + , errmsg: `konnte Kategorie nicht bearbeiten` + }); + } document.querySelector(".displayedList").addEventListener("change", (e) => { From b4eb339657bdf4d417886fa66e832be18b157837 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 20:19:41 +0200 Subject: [PATCH 32/41] refactor --- src/main/resources/static/js/shared/sharedUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/static/js/shared/sharedUI.js b/src/main/resources/static/js/shared/sharedUI.js index 2bc7682..c77a80f 100644 --- a/src/main/resources/static/js/shared/sharedUI.js +++ b/src/main/resources/static/js/shared/sharedUI.js @@ -32,7 +32,7 @@ export function createEditForm(fields) { } -export function editElement(element, attributes) { +export function setElementAttributes(element, attributes) { for (const [attr, val] of Object.entries(attributes)) element.setAttribute(attr, val); From 7af099f022f9245b74007a70afd05b707598c73f Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 14 Oct 2026 20:34:23 +0200 Subject: [PATCH 33/41] falsche Klammern korrigiert --- src/main/resources/static/js/pages/list/list.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index 85765b6..b6d108a 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -152,14 +152,14 @@ function init() { }); } + }); - document.querySelector(".displayedList").addEventListener("change", (e) => { - if (e.target.matches(".item__checkboxDone")) { - 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 }); - } - }); + document.querySelector(".displayedList").addEventListener("change", (e) => { + if (e.target.matches(".item__checkboxDone")) { + 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 }); + } }); console.log("javascript initialized!"); return 0; From c9c38f07ad515969b029448535254f54a78f17c9 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Thu, 15 Oct 2026 11:38:00 +0200 Subject: [PATCH 34/41] =?UTF-8?q?sharedAPI=20gel=C3=B6scht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/shared/sharedAPI.js | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 src/main/resources/static/js/shared/sharedAPI.js diff --git a/src/main/resources/static/js/shared/sharedAPI.js b/src/main/resources/static/js/shared/sharedAPI.js deleted file mode 100644 index eb5a750..0000000 --- a/src/main/resources/static/js/shared/sharedAPI.js +++ /dev/null @@ -1,8 +0,0 @@ -export async function editElement(apiPath, toChange) { - return await fetch(apiPath, - { - method: "PATCH", - body: JSON.stringify(toChange), - headers: { "Content-Type": "application/json" } - }); -} From 00ac28aebf0fd982e98987a059da52d3606382ba Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Thu, 15 Oct 2026 11:38:19 +0200 Subject: [PATCH 35/41] wsp --- src/main/resources/static/js/models/ShoppingCategory.js | 1 - src/main/resources/static/js/pages/list/api/categoryAPI.js | 1 - src/main/resources/static/js/pages/list/api/itemAPI.js | 7 ------- src/main/resources/static/js/shared/helper.js | 1 - src/main/resources/static/js/shared/sharedUI.js | 4 ---- 5 files changed, 14 deletions(-) diff --git a/src/main/resources/static/js/models/ShoppingCategory.js b/src/main/resources/static/js/models/ShoppingCategory.js index b0c5d1e..dae39d5 100644 --- a/src/main/resources/static/js/models/ShoppingCategory.js +++ b/src/main/resources/static/js/models/ShoppingCategory.js @@ -1,4 +1,3 @@ - export class ShoppingCategory extends HTMLElement { static get observedAttributes() { return ["category-name"] } diff --git a/src/main/resources/static/js/pages/list/api/categoryAPI.js b/src/main/resources/static/js/pages/list/api/categoryAPI.js index a5d7350..99d3e29 100644 --- a/src/main/resources/static/js/pages/list/api/categoryAPI.js +++ b/src/main/resources/static/js/pages/list/api/categoryAPI.js @@ -7,7 +7,6 @@ export async function addCategory(listID, categoryName) { }); } - export async function editCategory(categoryID, toChange) { return await fetch(`/api/categories/${categoryID}`, { diff --git a/src/main/resources/static/js/pages/list/api/itemAPI.js b/src/main/resources/static/js/pages/list/api/itemAPI.js index 63bcf8e..7a30373 100644 --- a/src/main/resources/static/js/pages/list/api/itemAPI.js +++ b/src/main/resources/static/js/pages/list/api/itemAPI.js @@ -1,5 +1,3 @@ - - export async function addItem(listID, itemName, itemAmount, categoryID) { return await fetch(`/api/items`, { @@ -14,7 +12,6 @@ export async function addItem(listID, itemName, itemAmount, categoryID) { }); } - export async function deleteItem(itemID) { return await fetch(`/api/items/${itemID}`, { method: "DELETE" }); @@ -32,9 +29,5 @@ export async function editItem(itemID, toChange) { } export async function deleteAllDoneItems(listID) { - return await fetch(`/api/lists/${listID}/items?done=true`, { method: "DELETE" }); - - } - diff --git a/src/main/resources/static/js/shared/helper.js b/src/main/resources/static/js/shared/helper.js index 6164bc0..26f4b29 100644 --- a/src/main/resources/static/js/shared/helper.js +++ b/src/main/resources/static/js/shared/helper.js @@ -1,6 +1,5 @@ import { showError } from "./error.js"; - export async function handleResponse(promise, errorMsg) { const response = await promise; diff --git a/src/main/resources/static/js/shared/sharedUI.js b/src/main/resources/static/js/shared/sharedUI.js index c77a80f..71e5437 100644 --- a/src/main/resources/static/js/shared/sharedUI.js +++ b/src/main/resources/static/js/shared/sharedUI.js @@ -1,9 +1,7 @@ - export function abortEditing(formElement, old) { formElement.replaceWith(old); } - export function createEditForm(fields) { const editForm = document.createElement("form"); const abortButton = document.createElement("button"); @@ -31,10 +29,8 @@ export function createEditForm(fields) { return editForm; } - export function setElementAttributes(element, attributes) { for (const [attr, val] of Object.entries(attributes)) element.setAttribute(attr, val); } - From 70338266f29c4f5ca47991d1c1c30210f12df5e4 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Thu, 15 Oct 2026 11:38:27 +0200 Subject: [PATCH 36/41] dead code entfert --- .../static/js/pages/list/frontend/itemUI.js | 41 ------------------- 1 file changed, 41 deletions(-) diff --git a/src/main/resources/static/js/pages/list/frontend/itemUI.js b/src/main/resources/static/js/pages/list/frontend/itemUI.js index d85a9bd..36c2d98 100644 --- a/src/main/resources/static/js/pages/list/frontend/itemUI.js +++ b/src/main/resources/static/js/pages/list/frontend/itemUI.js @@ -18,47 +18,6 @@ export function addItem(itemAsJSON) { list.append(li); } -export function createEditItemForm(currentName, currentAmount) { - const editForm = document.createElement("form"); - const inputName = document.createElement("input"); - const inputAmount = document.createElement("input"); - const abortButton = document.createElement("button"); - const saveButton = document.createElement("button"); - - inputName.setAttribute("name", "newItemName"); - inputName.setAttribute("value", currentName); - inputName.classList.add("editForm__name"); - - inputAmount.setAttribute("name", "newItemAmount"); - inputAmount.setAttribute("value", currentAmount); - inputAmount.classList.add("editForm__amount"); - - - abortButton.setAttribute("type", "button"); - abortButton.classList.add("editForm__buttonAbort"); - abortButton.textContent = "Abbrechen"; - - saveButton.textContent = "Speichern"; - saveButton.setAttribute("type", "submit"); - - - editForm.append(inputName, inputAmount, saveButton, abortButton); - - return editForm; -} - -export function editItem(shoppingItemElement, formElement, formData) { - - let newName = formData.itemName; - let newAmount = formData.itemAmount; - shoppingItemElement.setAttribute("item-name", newName); - shoppingItemElement.setAttribute("item-amount", newAmount); - - - formElement.replaceWith(shoppingItemElement); - -} - export function deleteItem(li) { li.remove(); } From 2d19d9a06f20abd7f3249eade093111756801bf0 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Thu, 15 Oct 2026 11:38:46 +0200 Subject: [PATCH 37/41] editElement nach shared/editing.js ausgelagert --- .../resources/static/js/pages/list/list.js | 32 +------------------ .../resources/static/js/shared/editing.js | 26 +++++++++++++++ 2 files changed, 27 insertions(+), 31 deletions(-) create mode 100644 src/main/resources/static/js/shared/editing.js diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index b6d108a..37b24ae 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -4,8 +4,8 @@ import { initErrors } from "../../shared/error.js"; import * as api from "./api/listAPI.js" import * as ui from "./frontend/listUI.js" import { handleResponse } from "../../shared/helper.js"; +import { editElement } from "../../shared/editing.js"; import * as sharedUI from "../../shared/sharedUI.js"; -import * as sharedAPI from "../../shared/sharedAPI.js"; const addCategoryForm = document.querySelector(".addCategoryForm"); const addItemForm = document.querySelector(".addItemForm"); @@ -27,34 +27,6 @@ async function addCategory(categoryName) { } -async function editElement({ element, fields, apiCall, id, onSuccess, errmsg }) { - const formElement = sharedUI.createEditForm(fields); - - element.replaceWith(formElement); - - formElement.querySelector("input").focus(); - - formElement.addEventListener("submit", async (event) => { - event.preventDefault(); - - let formData = Object.fromEntries(new FormData(formElement)); - let result = await handleResponse(apiCall(id, formData), errmsg); - - sharedUI.abortEditing(formElement, element); - - if (result) onSuccess(formData); - }); - - formElement.addEventListener("click", (e) => { - if (e.target.matches(".editForm__buttonAbort")) sharedUI.abortEditing(formElement, element); - }) - - formElement.addEventListener("keydown", (e) => { - if (e.key == "Escape") sharedUI.abortEditing(formElement, element); - }); -} - - async function deleteItem(li) { const json = await handleResponse(api.deleteItem(li.dataset.id), `error deleting item`); @@ -128,7 +100,6 @@ function init() { , onSuccess: (f) => { sharedUI.setElementAttributes(shoppingItemElement, { "item-name": f.itemName, "item-amount": f.itemAmount }) } , errmsg: `konnte Item nicht bearbeiten` }); - //editItem(shoppingItemElement, shoppingItemElement.closest("li").dataset.id); } else if (event.target.closest(".category__name")) { @@ -146,7 +117,6 @@ function init() { , onSuccess: (f) => { sharedUI.setElementAttributes(categoryElement, { "category-name": f.categoryName }) document.querySelector(`option[value='${id}']`).textContent = f.categoryName; - //option name ändern } , errmsg: `konnte Kategorie nicht bearbeiten` }); diff --git a/src/main/resources/static/js/shared/editing.js b/src/main/resources/static/js/shared/editing.js new file mode 100644 index 0000000..ea40a01 --- /dev/null +++ b/src/main/resources/static/js/shared/editing.js @@ -0,0 +1,26 @@ +export async function editElement({ element, fields, apiCall, id, onSuccess, errmsg }) { + const formElement = sharedUI.createEditForm(fields); + + element.replaceWith(formElement); + + formElement.querySelector("input").focus(); + + formElement.addEventListener("submit", async (event) => { + event.preventDefault(); + + let formData = Object.fromEntries(new FormData(formElement)); + let result = await handleResponse(apiCall(id, formData), errmsg); + + sharedUI.abortEditing(formElement, element); + + if (result) onSuccess(formData); + }); + + formElement.addEventListener("click", (e) => { + if (e.target.matches(".editForm__buttonAbort")) sharedUI.abortEditing(formElement, element); + }) + + formElement.addEventListener("keydown", (e) => { + if (e.key == "Escape") sharedUI.abortEditing(formElement, element); + }); +} From 0b69384fb7faaefbf041d8c94aea5a08a29f9405 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Thu, 15 Oct 2026 11:38:49 +0200 Subject: [PATCH 38/41] dead code entfernt --- .../js/pages/list/frontend/categoryUI.js | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/src/main/resources/static/js/pages/list/frontend/categoryUI.js b/src/main/resources/static/js/pages/list/frontend/categoryUI.js index 46dd162..b016f74 100644 --- a/src/main/resources/static/js/pages/list/frontend/categoryUI.js +++ b/src/main/resources/static/js/pages/list/frontend/categoryUI.js @@ -1,5 +1,3 @@ - - export function addCategory(categoryAsJSON) { const list = document.querySelector(".displayedList"); const category = document.createElement("shopping-category"); @@ -29,36 +27,4 @@ export function deleteCategory(deleteAllItems, categoryID) { } category.remove() document.querySelector(`option[value='${categoryID}']`).remove(); - -} - -export function createEditCategoryForm(categoryName) { - const editForm = document.createElement("form"); - const inputName = document.createElement("input"); - const abortButton = document.createElement("button"); - const saveButton = document.createElement("button"); - - inputName.setAttribute("name", "newCategoryName"); - inputName.setAttribute("value", categoryName); - inputName.classList.add("editForm__name"); - - abortButton.setAttribute("type", "button"); - abortButton.classList.add("editForm__buttonAbort"); - abortButton.textContent = "Abbrechen"; - saveButton.textContent = "Speichern"; - - editForm.append(inputName, saveButton, abortButton); - - return editForm; -} - -export function editCategory(id, formElement, formData, categoryDiv) { - - let newName = formData.newCategoryName; - - categoryDiv.querySelector(".category__name").textContent = newName; - formElement.replaceWith(categoryDiv); - - document.querySelector(`option[value='${id}']`).textContent = newName; - } From 8c347d124ac330f99d0af48ba84558a20a2d50e9 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Thu, 15 Oct 2026 12:15:15 +0200 Subject: [PATCH 39/41] =?UTF-8?q?async=20und=20await=20fetch=20unn=C3=B6ti?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/js/pages/index/api/indexAPI.js | 12 ++++++------ .../static/js/pages/list/api/categoryAPI.js | 12 ++++++------ .../static/js/pages/list/api/itemAPI.js | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/resources/static/js/pages/index/api/indexAPI.js b/src/main/resources/static/js/pages/index/api/indexAPI.js index f9397d9..77676e0 100644 --- a/src/main/resources/static/js/pages/index/api/indexAPI.js +++ b/src/main/resources/static/js/pages/index/api/indexAPI.js @@ -1,8 +1,8 @@ -export async function addList(listName) { - return await fetch(`/api/lists`, +export function addList(listName) { + return fetch(`/api/lists`, { method: "POST", body: JSON.stringify({ listName: listName }), @@ -12,14 +12,14 @@ export async function addList(listName) { } -export async function deleteList(id) { - return await fetch(`/api/lists/${id}`, { method: "DELETE" }); +export function deleteList(id) { + return fetch(`/api/lists/${id}`, { method: "DELETE" }); } -export async function editList(listID, toChange) { - return await fetch(`/api/lists/${listID}`, +export function editList(listID, toChange) { + return fetch(`/api/lists/${listID}`, { method: "PATCH", body: JSON.stringify(toChange), diff --git a/src/main/resources/static/js/pages/list/api/categoryAPI.js b/src/main/resources/static/js/pages/list/api/categoryAPI.js index 99d3e29..c5b32dd 100644 --- a/src/main/resources/static/js/pages/list/api/categoryAPI.js +++ b/src/main/resources/static/js/pages/list/api/categoryAPI.js @@ -1,5 +1,5 @@ -export async function addCategory(listID, categoryName) { - return await fetch(`/api/categories`, +export function addCategory(listID, categoryName) { + return fetch(`/api/categories`, { method: "POST" , body: JSON.stringify({ "categoryName": categoryName, "listID": listID }) @@ -7,8 +7,8 @@ export async function addCategory(listID, categoryName) { }); } -export async function editCategory(categoryID, toChange) { - return await fetch(`/api/categories/${categoryID}`, +export function editCategory(categoryID, toChange) { + return fetch(`/api/categories/${categoryID}`, { method: "PATCH", body: JSON.stringify(toChange), @@ -16,6 +16,6 @@ export async function editCategory(categoryID, toChange) { }); } -export async function deleteCategory(deleteAllItems, categoryID) { - return await fetch(`/api/categories/${categoryID}?deleteAllItems=${deleteAllItems}`, { method: "DELETE" }); +export function deleteCategory(deleteAllItems, categoryID) { + return fetch(`/api/categories/${categoryID}?deleteAllItems=${deleteAllItems}`, { method: "DELETE" }); } diff --git a/src/main/resources/static/js/pages/list/api/itemAPI.js b/src/main/resources/static/js/pages/list/api/itemAPI.js index 7a30373..379acaa 100644 --- a/src/main/resources/static/js/pages/list/api/itemAPI.js +++ b/src/main/resources/static/js/pages/list/api/itemAPI.js @@ -1,5 +1,5 @@ -export async function addItem(listID, itemName, itemAmount, categoryID) { - return await fetch(`/api/items`, +export function addItem(listID, itemName, itemAmount, categoryID) { + return fetch(`/api/items`, { method: "POST", body: JSON.stringify({ @@ -12,14 +12,14 @@ export async function addItem(listID, itemName, itemAmount, categoryID) { }); } -export async function deleteItem(itemID) { +export function deleteItem(itemID) { - return await fetch(`/api/items/${itemID}`, { method: "DELETE" }); + return fetch(`/api/items/${itemID}`, { method: "DELETE" }); } -export async function editItem(itemID, toChange) { - return await fetch(`/api/items/${itemID}`, +export function editItem(itemID, toChange) { + return fetch(`/api/items/${itemID}`, { method: "PATCH", body: JSON.stringify(toChange), @@ -28,6 +28,6 @@ export async function editItem(itemID, toChange) { } -export async function deleteAllDoneItems(listID) { - return await fetch(`/api/lists/${listID}/items?done=true`, { method: "DELETE" }); +export function deleteAllDoneItems(listID) { + return fetch(`/api/lists/${listID}/items?done=true`, { method: "DELETE" }); } From 3f5856c86b01e7af77157ecb0049d994b4e5c69a Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Thu, 15 Oct 2026 12:15:29 +0200 Subject: [PATCH 40/41] =?UTF-8?q?errmsg=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/pages/list/list.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index 37b24ae..cca0bf6 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -28,8 +28,9 @@ async function addCategory(categoryName) { } async function deleteItem(li) { - const json = await handleResponse(api.deleteItem(li.dataset.id), `error deleting item`); + console.log(`deleting item ${li.dataset.id}`) + const json = await handleResponse(api.deleteItem(li.dataset.id), `error deleting item`); if (json) ui.deleteItem(li); } @@ -131,8 +132,8 @@ function init() { api.editItem(item.dataset.id, { isDone: e.target.checked }); } }); + console.log("javascript initialized!"); - return 0; } From 302419802b21a7a73b30fd33253835b5039e49dc Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Thu, 15 Oct 2026 12:15:39 +0200 Subject: [PATCH 41/41] imports --- src/main/resources/static/js/shared/editing.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/resources/static/js/shared/editing.js b/src/main/resources/static/js/shared/editing.js index ea40a01..f3762a6 100644 --- a/src/main/resources/static/js/shared/editing.js +++ b/src/main/resources/static/js/shared/editing.js @@ -1,5 +1,8 @@ +import { abortEditing, createEditForm } from "./sharedUI.js"; +import { handleResponse } from "./helper.js"; + export async function editElement({ element, fields, apiCall, id, onSuccess, errmsg }) { - const formElement = sharedUI.createEditForm(fields); + const formElement = createEditForm(fields); element.replaceWith(formElement); @@ -11,16 +14,16 @@ export async function editElement({ element, fields, apiCall, id, onSuccess, err let formData = Object.fromEntries(new FormData(formElement)); let result = await handleResponse(apiCall(id, formData), errmsg); - sharedUI.abortEditing(formElement, element); + abortEditing(formElement, element); if (result) onSuccess(formData); }); formElement.addEventListener("click", (e) => { - if (e.target.matches(".editForm__buttonAbort")) sharedUI.abortEditing(formElement, element); + if (e.target.matches(".editForm__buttonAbort")) abortEditing(formElement, element); }) formElement.addEventListener("keydown", (e) => { - if (e.key == "Escape") sharedUI.abortEditing(formElement, element); + if (e.key == "Escape") abortEditing(formElement, element); }); }