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){ 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){ } 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; 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; + } +} 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..7a85ba6 --- /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.json(); +} + +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..4a924a4 --- /dev/null +++ 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()); +} diff --git a/src/main/resources/static/js/pages/index/index.js b/src/main/resources/static/js/pages/index/index.js index 60e1eec..09ddba9 100644 --- a/src/main/resources/static/js/pages/index/index.js +++ b/src/main/resources/static/js/pages/index/index.js @@ -1,32 +1,31 @@ -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') - .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() { + } 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); 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); 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"> +
+
+ + +
-
-
- - -
-
-
-
    -
  • - - +
      +
    • + + +
-