From 9361de6cb09fb8fa49ece28c6c4f38fa95b54d60 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 21:00:43 +0200 Subject: [PATCH 01/12] =?UTF-8?q?dateien=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/js/pages/index/api/indexAPI.js | 21 +++++++++++++++++++ .../static/js/pages/index/frontend/indexUI.js | 0 2 files changed, 21 insertions(+) create mode 100644 src/main/resources/static/js/pages/index/api/indexAPI.js create mode 100644 src/main/resources/static/js/pages/index/frontend/indexUI.js diff --git a/src/main/resources/static/js/pages/index/api/indexAPI.js b/src/main/resources/static/js/pages/index/api/indexAPI.js new file mode 100644 index 0000000..d1bc5d8 --- /dev/null +++ b/src/main/resources/static/js/pages/index/api/indexAPI.js @@ -0,0 +1,21 @@ + + + +export async function addList(listName) { + const response = await fetch(`/api/list`, + { + method: "POST", + body: JSON.stringify({ listName: listName }), + headers: { "Content-Type": "application/json" } + } + ); + + return response; +} + +export async function deleteList(id) { + const response = await fetch(`/api/list/${id}`, { method: "DELETE" }) + .then(r => console.log("Liste entfernt")) + return response; +} + diff --git a/src/main/resources/static/js/pages/index/frontend/indexUI.js b/src/main/resources/static/js/pages/index/frontend/indexUI.js new file mode 100644 index 0000000..e69de29 From ab7734915b5e0c4a08fc0141c4488b29981068a3 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 21:29:59 +0200 Subject: [PATCH 02/12] bug: categoryID war noch id --- src/main/resources/static/js/models/ShoppingCategory.js | 2 +- src/main/resources/static/js/pages/list/frontend/categoryUI.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/static/js/models/ShoppingCategory.js b/src/main/resources/static/js/models/ShoppingCategory.js index f1b6525..3d1eee9 100644 --- a/src/main/resources/static/js/models/ShoppingCategory.js +++ b/src/main/resources/static/js/models/ShoppingCategory.js @@ -6,7 +6,7 @@ export class ShoppingCategory { static fromJSON(categoryAsJSON) { const category = new ShoppingCategory(categoryAsJSON.categoryName); - category.categoryID = categoryAsJSON.id; + category.categoryID = categoryAsJSON.categoryID; return category; } 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 93dd99d..287d4f2 100644 --- a/src/main/resources/static/js/pages/list/frontend/categoryUI.js +++ b/src/main/resources/static/js/pages/list/frontend/categoryUI.js @@ -9,7 +9,7 @@ export function addCategory(categoryAsJSON) { const categorySelect = document.querySelector(".addItemForm__categorySelect"); const newCategoryOption = document.createElement("option"); - newCategoryOption.setAttribute("value", categoryAsJSON.id); + newCategoryOption.setAttribute("value", category.categoryID); newCategoryOption.textContent = category.categoryName; categorySelect.appendChild(newCategoryOption); From d39acbd54a431451a516a195c3ea78649ab74272 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 21:31:56 +0200 Subject: [PATCH 03/12] addList implementiert --- .../Controller/ShoppingListController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index dbf3913..482d7d8 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -1,6 +1,9 @@ package de.timaldinger.einkaufsliste.Controller; +import de.timaldinger.einkaufsliste.Dto.Post.ShoppingListPostDTO; +import de.timaldinger.einkaufsliste.Dto.Response.ShoppingListResponseDTO; import de.timaldinger.einkaufsliste.Models.ShoppingItem; +import de.timaldinger.einkaufsliste.Models.ShoppingList; import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; @@ -21,6 +24,15 @@ public class ShoppingListController { @Autowired private ShoppingItemRepository shoppingItemRepository; + @PostMapping("/api/list") + public ShoppingListResponseDTO addList(@RequestBody ShoppingListPostDTO newList){ + ShoppingList list = new ShoppingList(newList.listName(), null, null, 0, 0); + + shoppingListRepository.save(list); + + return new ShoppingListResponseDTO(list.getListName(), list.getId()); + } + @DeleteMapping("/api/list/{listID}") public ResponseEntity deleteAllDoneItems(@PathVariable UUID listID, @RequestParam(required = false) boolean deleteAllDoneItems){ if(deleteAllDoneItems){ From c724bafb06bdb9c001ce30bc058c3a633ec595b4 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 21:32:04 +0200 Subject: [PATCH 04/12] refactor --- .../einkaufsliste/Dto/Response/ShoppingListResponseDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/Response/ShoppingListResponseDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/Response/ShoppingListResponseDTO.java index 3ef9109..96b9c71 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Dto/Response/ShoppingListResponseDTO.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/Response/ShoppingListResponseDTO.java @@ -2,5 +2,5 @@ package de.timaldinger.einkaufsliste.Dto.Response; import java.util.UUID; -public record ShoppingListResponseDTO (String listName, UUID shoppingListID){ +public record ShoppingListResponseDTO (String listName, UUID listID){ } From 0564d81b251504fdff4f0fe387d8f390890e1291 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 21:32:10 +0200 Subject: [PATCH 05/12] =?UTF-8?q?konstruktoren=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../de/timaldinger/einkaufsliste/Models/ShoppingList.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingList.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingList.java index 61597b1..6eb49d0 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingList.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingList.java @@ -2,7 +2,9 @@ package de.timaldinger.einkaufsliste.Models; import jakarta.persistence.Entity; import jakarta.validation.constraints.NotBlank; +import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import java.sql.Date; @@ -10,6 +12,8 @@ import java.sql.Date; @Getter @Setter @Entity +@AllArgsConstructor +@NoArgsConstructor public class ShoppingList extends ShoppingElement { @NotBlank private String listName; From 71d7d373ebfec08160b3f918dbebb2587945de69 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 21:32:25 +0200 Subject: [PATCH 06/12] ShoppingList li Element wird richtig erstellt --- .../static/js/models/ShoppingList.js | 46 +++++++++++++++---- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/src/main/resources/static/js/models/ShoppingList.js b/src/main/resources/static/js/models/ShoppingList.js index 08f3eee..afa859c 100644 --- a/src/main/resources/static/js/models/ShoppingList.js +++ b/src/main/resources/static/js/models/ShoppingList.js @@ -1,11 +1,39 @@ -export class ShoppingList{ - constructor(id){ - this.shoppingListName; - this.lastModified = ""; - this.created = ""; - this.id = id; - this.remove = false; - } -} \ No newline at end of file +export class ShoppingList { + constructor(name) { + this.listName = name; + this.lastModified = ""; + this.created = ""; + this.listID = 0; + } + + static fromJSON(listAsJSON) { + const list = new ShoppingList(listAsJSON.listName); + list.listID = listAsJSON.listID; + return list; + } + + 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.id = this.listID; + + a.setAttribute("href", `/list/${this.listID}`); + a.textContent = this.listName; + + editButton.classList.add("list__editButton"); + editButton.textContent = "Liste bearbeiten"; + + deleteButton.classList.add("list__deleteButton"); + deleteButton.textContent = "Liste löschen"; + + li.append(a, editButton, deleteButton); + + return li; + } +} From 6aa624a507748b425d1ae4531d226461aea7880c Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 21:32:35 +0200 Subject: [PATCH 07/12] response als json im return --- src/main/resources/static/js/pages/index/api/indexAPI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d1bc5d8..7a85ba6 100644 --- a/src/main/resources/static/js/pages/index/api/indexAPI.js +++ b/src/main/resources/static/js/pages/index/api/indexAPI.js @@ -10,7 +10,7 @@ export async function addList(listName) { } ); - return response; + return response.json(); } export async function deleteList(id) { From 66e8ac13ea79250937eac65802ef68f528067820 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 21:32:53 +0200 Subject: [PATCH 08/12] =?UTF-8?q?liste=20wird=20nun=20in=20den=20listen=20?= =?UTF-8?q?hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/static/js/pages/index/frontend/indexUI.js | 8 ++++++++ 1 file changed, 8 insertions(+) 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 e69de29..4a924a4 100644 --- a/src/main/resources/static/js/pages/index/frontend/indexUI.js +++ b/src/main/resources/static/js/pages/index/frontend/indexUI.js @@ -0,0 +1,8 @@ +import { ShoppingList } from "../../../models/ShoppingList.js"; + + +export function addList(listAsJSON) { + const list = document.querySelector(".displayedList"); + const listElement = ShoppingList.fromJSON(listAsJSON); + list.append(listElement.render()); +} From b5d61ff772e698ab0677c667175a2e3a244c2ced Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 21:33:26 +0200 Subject: [PATCH 09/12] =?UTF-8?q?addList()=20implementiert=20und=20eventHa?= =?UTF-8?q?ndler=20f=C3=BCr=20das=20hinzuf=C3=BCgen=20von=20Listen=20am=20?= =?UTF-8?q?Form=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/static/js/pages/index/index.js | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/resources/static/js/pages/index/index.js b/src/main/resources/static/js/pages/index/index.js index 60e1eec..fddc68e 100644 --- a/src/main/resources/static/js/pages/index/index.js +++ b/src/main/resources/static/js/pages/index/index.js @@ -1,9 +1,14 @@ -import { ShoppingList } from "./ShoppingList.js"; +import { ShoppingList } from "../../models/ShoppingList.js"; +import * as api from "./api/indexAPI.js"; +import * as ui from "./frontend/indexUI.js" +const addListForm = document.querySelector(".addListForm"); -const deleteListButtons = document.querySelectorAll('.shoppingListOverview__deleteListButton'); -const shoppingLists = []; - +async function addList(listName) { + const listAsJson = await api.addList(listName); + console.log(`${listAsJson}`); + if (listAsJson) ui.addList(listAsJson); +} function fillList() { document.querySelectorAll('.shoppingListOverview__shoppingList') @@ -20,13 +25,12 @@ function deleteList(id) { function init() { - deleteListButtons.forEach(button => { - button.addEventListener("click", () => { - const id = button.dataset.id; // liest data-id - deleteList(id); - }); + addListForm.addEventListener("submit", (e) => { + e.preventDefault(); + const formData = Object.fromEntries(new FormData(addListForm)); + addList(formData.listName); }); - fillList(); + } document.addEventListener('DOMContentLoaded', init); From 5a48acba2f430ce88c1517ad43b21b9efea43265 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 21:33:38 +0200 Subject: [PATCH 10/12] =?UTF-8?q?vorabgreifen=20f=C3=BCr=20bearbeiten=20un?= =?UTF-8?q?d=20l=C3=B6schen=20von=20listen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/pages/index/index.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/resources/static/js/pages/index/index.js b/src/main/resources/static/js/pages/index/index.js index fddc68e..09ddba9 100644 --- a/src/main/resources/static/js/pages/index/index.js +++ b/src/main/resources/static/js/pages/index/index.js @@ -10,17 +10,12 @@ async function addList(listName) { if (listAsJson) ui.addList(listAsJson); } -function fillList() { - document.querySelectorAll('.shoppingListOverview__shoppingList') - .forEach(list => { - shoppingLists.push(new ShoppingList(list.id)); - console.log(list.id); - }); +function editList() { } -function deleteList(id) { - fetch(`/api/list/${id}`, { method: "DELETE" }).then(r => console.log("Liste entfernt")) +function deleteList() { + } From c72b14e59420423825faba93bd509a29d43460ef Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 21:33:45 +0200 Subject: [PATCH 11/12] whitespace digga --- src/main/resources/static/js/pages/list/list.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/resources/static/js/pages/list/list.js b/src/main/resources/static/js/pages/list/list.js index d93a079..b857796 100644 --- a/src/main/resources/static/js/pages/list/list.js +++ b/src/main/resources/static/js/pages/list/list.js @@ -88,11 +88,8 @@ async function editCategory(categoryElement) { formElement.addEventListener("keydown", (e) => { if (e.key == "Escape") formElement.replaceWith(categoryDiv); }) - - } - function deleteItem(li) { api.deleteItem(li.id); ui.deleteItem(li); From b14b0ac08bdb0edd9fbc197aa9cd503ace08ccde Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 9 Oct 2026 21:34:41 +0200 Subject: [PATCH 12/12] =?UTF-8?q?struktur=20=C3=BCberarbeitet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit eine div index die alle inhalte hat, es wird jtz pro liste ein LI und ein UL mehr erstellt. li hat id. Im li gibt es jtz auch einen Bearbeitungsknopf --- src/main/resources/templates/index.html | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 20582af..20dd7e0 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -11,21 +11,19 @@ xmlns:th="http://www.thymeleaf.org"> +
+
+ + +
-
-
- - -
-
-
-
    -
  • - - +
      +
    • + + +
-