diff --git a/.gitea/user_stories.yml b/.gitea/user_stories.yml new file mode 100644 index 0000000..c65ca73 --- /dev/null +++ b/.gitea/user_stories.yml @@ -0,0 +1,57 @@ +name: User Story template +about: Vorlage für eine User Story mit Backend- und Frontend-Aufgaben +title: "[User Story]: " +body: + - type: textarea + id: user-story + attributes: + label: User Story + description: Die User Story erscheint im Issue als Zitat (Zeilen mit `>` beginnen). + placeholder: Als möchte ich , damit . + value: "> " + validations: + required: true + + - type: markdown + attributes: + value: "# Technisch" + + - type: markdown + attributes: + value: "## Backend" + + - type: textarea + id: backend-beschreibung + attributes: + label: Was muss gemacht werden + description: Fließtext + validations: + required: false + + - type: textarea + id: backend-todos + attributes: + label: To-Do Liste + description: Pro Zeile ein To-Do, beliebig viele. + value: "- [ ] " + validations: + required: false + + - type: markdown + attributes: + value: "## Frontend" + + - type: textarea + id: frontend-beschreibung + attributes: + label: Was muss gemacht werden + description: Fließtext + validations: + required: false + + - type: textarea + id: frontend-todos + attributes: + label: To-Do Liste + description: Pro Zeile ein To-Do, beliebig viele. + value: "- [ ] " \ No newline at end of file diff --git a/.gitignore b/.gitignore index b6fe1e1..7037dc0 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,6 @@ target *.njsproj *.sln *.sw? + +# H2 +data \ No newline at end of file diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java new file mode 100644 index 0000000..8b4ecc0 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java @@ -0,0 +1,54 @@ +package de.timaldinger.einkaufsliste.Controller; + +import de.timaldinger.einkaufsliste.Models.ShoppingList; +import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; +import jakarta.validation.Valid; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.UUID; + +@Controller +@RequestMapping("/") +public class PageController { + + @Autowired + private ShoppingListRepository shoppingListRepository; + + @Autowired + private ShoppingCategoryRepository shoppingCategoryRepository; + + @Autowired + private ShoppingItemRepository shoppingItemRepository; + + @PostMapping("api/list") + public String addList(@Valid @ModelAttribute ShoppingList newList){ + shoppingListRepository.save(newList); + return "redirect:/"; + } + + @GetMapping("/") + public String index(Model model){ + model.addAttribute("lists", shoppingListRepository.findAll()); + return "index"; + } + + /** + * Gibt die list.html Seite einer Liste zurück mit den Attributen list, categories und items + * @param model + * @param id + * @return + */ + @GetMapping("/list/{id}") + public String list(Model model, @PathVariable UUID id){ + ShoppingList list = shoppingListRepository.findById(id).orElseThrow(); + model.addAttribute("list", list); + model.addAttribute("categories", shoppingCategoryRepository.findByShoppingList(list)); + model.addAttribute("items", shoppingItemRepository.findByList_IdAndCategoryIsNull(id)); + return "list"; + } +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java new file mode 100644 index 0000000..6ec7cf7 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java @@ -0,0 +1,76 @@ +package de.timaldinger.einkaufsliste.Controller; + +import de.timaldinger.einkaufsliste.Dto.ShoppingCategoryDTO; +import de.timaldinger.einkaufsliste.Dto.ShoppingCategoryPatchDTO; +import de.timaldinger.einkaufsliste.Dto.ShoppingItemPatchDTO; +import de.timaldinger.einkaufsliste.Models.ShoppingCategory; +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; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.server.ResponseStatusException; + +import java.util.List; +import java.util.UUID; + +@RestController +public class ShoppingCategoryController { + @Autowired + private ShoppingCategoryRepository shoppingCategoryRepository; + @Autowired + private ShoppingListRepository shoppingListRepository; + @Autowired + private ShoppingItemRepository shoppingItemRepository; + + @PostMapping("/api/category") + public ShoppingCategory addCategory(@RequestBody ShoppingCategoryDTO newCategory){ + + String name = newCategory.categoryName(); + ShoppingList list = shoppingListRepository.findById(newCategory.listID()).orElseThrow(); + + ShoppingCategory category = new ShoppingCategory(name, List.of(),list); + + shoppingCategoryRepository.save(category); + + return category; + } + + @PatchMapping("/api/category/{categoryID}") + public ResponseEntity editCategory(@PathVariable UUID categoryID,@RequestBody ShoppingCategoryPatchDTO toChange){ + ShoppingCategory category = shoppingCategoryRepository.findById(categoryID).orElseThrow(); + + if(toChange.categoryName() != null) category.setCategoryName(toChange.categoryName()); + + shoppingCategoryRepository.save(category); + + return ResponseEntity.noContent().build(); + } + + + @DeleteMapping("/api/category/{categoryID}") + public ResponseEntity deleteCategory(@PathVariable UUID categoryID, @RequestParam(required = false) Boolean deleteAllItems){ + + if(deleteAllItems == null){ + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Missing required parameter deleteAllItems (can be either true or false)"); + } + + List itemList = shoppingItemRepository.findAllByCategory_Id(categoryID); + if(deleteAllItems){ + itemList.forEach((item) -> shoppingItemRepository.deleteById(item.getId())); + }else{ + itemList.forEach((item) -> item.setCategory(null)); + shoppingItemRepository.saveAll(itemList); + } + + shoppingCategoryRepository.deleteById(categoryID); + + return ResponseEntity.noContent().build(); + } + + +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java new file mode 100644 index 0000000..01f8d79 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java @@ -0,0 +1,66 @@ +package de.timaldinger.einkaufsliste.Controller; + +import de.timaldinger.einkaufsliste.Dto.ShoppingItemDTO; +import de.timaldinger.einkaufsliste.Dto.ShoppingItemPatchDTO; +import de.timaldinger.einkaufsliste.Dto.ShoppingItemResponseDTO; +import de.timaldinger.einkaufsliste.Models.ShoppingCategory; +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; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.UUID; + +@RestController +public class ShoppingItemController { + @Autowired + private ShoppingCategoryRepository shoppingCategoryRepository; + @Autowired + private ShoppingListRepository shoppingListRepository; + @Autowired + private ShoppingItemRepository shoppingItemRepository; + + @PostMapping("/api/item") + public ShoppingItemResponseDTO addItem(@RequestBody ShoppingItemDTO newItem){ + String name = newItem.itemName(); + String amount = newItem.itemAmount(); + ShoppingCategory c; + if(newItem.categoryID() != null){ + c = shoppingCategoryRepository.findById(newItem.categoryID()).orElseThrow(); + }else{ + c = null; + } + ShoppingList list = shoppingListRepository.findById(newItem.listID()).orElseThrow(); + ShoppingItem item = new ShoppingItem(name, amount, false, c, list); + shoppingItemRepository.save(item); + + return new ShoppingItemResponseDTO(name, amount, item.getId(), c != null? c.getId() : null); + } + + @PatchMapping("/api/item/{itemID}") + public ResponseEntity editItem(@PathVariable UUID itemID ,@RequestBody ShoppingItemPatchDTO toChange){ + ShoppingItem item = shoppingItemRepository.findById(itemID).orElseThrow(); + + if(toChange.itemName() != null) item.setItemName(toChange.itemName()); + if(toChange.itemAmount() != null) item.setItemAmount(toChange.itemAmount()); + if(toChange.isDone() != null) item.setDone(toChange.isDone()); + if(toChange.categoryID() != null) item.setCategory(shoppingCategoryRepository.findById(toChange.categoryID()).orElseThrow()); + + shoppingItemRepository.save(item); + + return ResponseEntity.noContent().build(); + } + + @DeleteMapping("/api/item/{itemID}") + public ResponseEntity deleteItem(@PathVariable UUID itemID){ + if(!shoppingItemRepository.existsById(itemID)){ + return ResponseEntity.notFound().build(); + } + shoppingItemRepository.deleteById(itemID); + return ResponseEntity.noContent().build(); + } +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java new file mode 100644 index 0000000..98b9774 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -0,0 +1,38 @@ +package de.timaldinger.einkaufsliste.Controller; + +import de.timaldinger.einkaufsliste.Dto.ShoppingCategoryDTO; +import de.timaldinger.einkaufsliste.Dto.ShoppingItemResponseDTO; +import de.timaldinger.einkaufsliste.Dto.ShoppingItemDTO; +import de.timaldinger.einkaufsliste.Models.ShoppingList; +import de.timaldinger.einkaufsliste.Models.ShoppingCategory; +import de.timaldinger.einkaufsliste.Models.ShoppingItem; +import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.UUID; + +@RestController +public class ShoppingListController { + + @Autowired + private ShoppingCategoryRepository shoppingCategoryRepository; + @Autowired + private ShoppingListRepository shoppingListRepository; + @Autowired + private ShoppingItemRepository shoppingItemRepository; + + @DeleteMapping("/api/list/{listID}") + public ResponseEntity deleteAllDoneItems(@PathVariable UUID listID, @RequestParam(required = false) boolean deleteAllDoneItems){ + if(deleteAllDoneItems){ + List items = shoppingItemRepository.findByList_IdAndIsDoneIsTrue(listID); + shoppingItemRepository.deleteAll(items); + } + return ResponseEntity.noContent().build(); + } + +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryDTO.java new file mode 100644 index 0000000..2eb04e2 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryDTO.java @@ -0,0 +1,6 @@ +package de.timaldinger.einkaufsliste.Dto; + +import java.util.UUID; + +public record ShoppingCategoryDTO(String categoryName, UUID listID) { +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryPatchDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryPatchDTO.java new file mode 100644 index 0000000..34da89b --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryPatchDTO.java @@ -0,0 +1,4 @@ +package de.timaldinger.einkaufsliste.Dto; + +public record ShoppingCategoryPatchDTO(String categoryName) { +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemDTO.java new file mode 100644 index 0000000..3626d9a --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemDTO.java @@ -0,0 +1,6 @@ +package de.timaldinger.einkaufsliste.Dto; + +import java.util.UUID; + +public record ShoppingItemDTO(String itemName, String itemAmount, UUID categoryID, UUID listID){ +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemPatchDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemPatchDTO.java new file mode 100644 index 0000000..442b2c5 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemPatchDTO.java @@ -0,0 +1,6 @@ +package de.timaldinger.einkaufsliste.Dto; + +import java.util.UUID; + +public record ShoppingItemPatchDTO(String itemName, String itemAmount, Boolean isDone, UUID categoryID) { +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemResponseDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemResponseDTO.java new file mode 100644 index 0000000..3f1a8ac --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemResponseDTO.java @@ -0,0 +1,6 @@ +package de.timaldinger.einkaufsliste.Dto; + +import java.util.UUID; + +public record ShoppingItemResponseDTO(String itemName, String itemAmount, UUID itemID, UUID categoryID) { +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java new file mode 100644 index 0000000..b39e680 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java @@ -0,0 +1,27 @@ +package de.timaldinger.einkaufsliste.Models; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotBlank; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.util.List; + +@Getter +@Setter +@Entity +@AllArgsConstructor +@NoArgsConstructor +public class ShoppingCategory extends ShoppingElement{ + + @NotBlank + private String categoryName; + @OneToMany(mappedBy = "category") //eine Liste hat mehrere Kategorien, diese sind mappedBy category (Feld in ShoppingItem) damit keine extra Tabelle erzeugt wird + private List itemsInCategory; + @ManyToOne //mehrere Kategorien (Many) gehören (to) einer Liste an (one) + @JoinColumn(name="list_id", nullable = false) + private ShoppingList shoppingList; + +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingElement.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingElement.java new file mode 100644 index 0000000..0bc8deb --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingElement.java @@ -0,0 +1,19 @@ +package de.timaldinger.einkaufsliste.Models; + +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import lombok.Getter; +import lombok.Setter; + +import java.util.UUID; + +@Getter +@Setter +@MappedSuperclass +public abstract class ShoppingElement{ + @Id @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java new file mode 100644 index 0000000..b7540fe --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java @@ -0,0 +1,29 @@ +package de.timaldinger.einkaufsliste.Models; + +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.validation.constraints.NotBlank; +import lombok.*; + +@Getter +@Setter +@Entity +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class ShoppingItem extends ShoppingElement { + + @NotBlank + private String itemName; + private String itemAmount; + private boolean isDone; + + @ManyToOne + @JoinColumn(name = "category_id", nullable = true) + private ShoppingCategory category; + + @ManyToOne + @JoinColumn(name = "list_id", nullable = false) + private ShoppingList list; +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingList.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingList.java new file mode 100644 index 0000000..61597b1 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingList.java @@ -0,0 +1,20 @@ +package de.timaldinger.einkaufsliste.Models; + +import jakarta.persistence.Entity; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +import java.sql.Date; + +@Getter +@Setter +@Entity +public class ShoppingList extends ShoppingElement { + @NotBlank + private String listName; + private Date dateCreated; + private Date lastChanged; + private int numberItems; + private int numberCategory; +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java new file mode 100644 index 0000000..ad361f8 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java @@ -0,0 +1,13 @@ +package de.timaldinger.einkaufsliste.Repository; + +import de.timaldinger.einkaufsliste.Models.ShoppingList; +import de.timaldinger.einkaufsliste.Models.ShoppingCategory; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.UUID; + +public interface ShoppingCategoryRepository extends JpaRepository{ + List findByShoppingList(ShoppingList list); + +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java new file mode 100644 index 0000000..fa5e64f --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java @@ -0,0 +1,15 @@ +package de.timaldinger.einkaufsliste.Repository; + +import de.timaldinger.einkaufsliste.Models.ShoppingItem; +import de.timaldinger.einkaufsliste.Models.ShoppingList; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.UUID; + +public interface ShoppingItemRepository extends JpaRepository { + + List findByList_IdAndCategoryIsNull(UUID list); + List findAllByCategory_Id(UUID categoryID); + List findByList_IdAndIsDoneIsTrue(UUID listID); +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListRepository.java new file mode 100644 index 0000000..01aef05 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListRepository.java @@ -0,0 +1,10 @@ +package de.timaldinger.einkaufsliste.Repository; + +import de.timaldinger.einkaufsliste.Models.ShoppingList; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.UUID; + +public interface ShoppingListRepository extends JpaRepository{ + +} diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/base.css similarity index 100% rename from src/main/resources/static/css/style.css rename to src/main/resources/static/css/base.css diff --git a/src/main/resources/static/css/index.css b/src/main/resources/static/css/index.css new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/static/css/list.css b/src/main/resources/static/css/list.css new file mode 100644 index 0000000..4a0ac6d --- /dev/null +++ b/src/main/resources/static/css/list.css @@ -0,0 +1,6 @@ +.category__name--bold { + font-weight: bold; +} +.category__name--big { + font-size : 1.5rem; +} diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html deleted file mode 100644 index addd006..0000000 --- a/src/main/resources/static/index.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - Einkaufsliste - - - - -
-

Einkaufsliste

-
- -
-
- Neue Kategorie hinzufügen: - - -
- -
- -
- Neuen Gegenstand hinzufügen: - - - - -
- - -
    -
- -
- - diff --git a/src/main/resources/static/js/ShoppingCategory.js b/src/main/resources/static/js/ShoppingCategory.js deleted file mode 100644 index 3a2d076..0000000 --- a/src/main/resources/static/js/ShoppingCategory.js +++ /dev/null @@ -1,120 +0,0 @@ -import { addNewItem } from "./main.js"; - -export class ShoppingCategory { - - constructor(categoryName, onDelete, onUpdate) { - this.categoryName = categoryName; - this.itemsInCategory = []; - this.remove = false; - this.isEditing = false; - this.onDelete = onDelete; - this.onUpdate = onUpdate; - } - - render() { - let element; - const outerLi = document.createElement("li"); - //if (this.itemsInCategory.length == 0) return; - - - if (this.isEditing) { - element = this.#renderEditing(); - } else { - element = this.#renderNormal(); - } - outerLi.append(element); - return outerLi; - } - - #renderEditing() { - //const li = document.createElement("li"); - const editForm = document.createElement("form"); - const editCategoryNameField = document.createElement("input"); - const saveButton = document.createElement("button"); - const abortButton = document.createElement("button"); - - - editCategoryNameField.setAttribute("name", "newCategoryName"); - editCategoryNameField.setAttribute("value", this.categoryName); - - - abortButton.textContent = "Abbrechen"; - abortButton.addEventListener("click", (event) => { - event.preventDefault(); - this.isEditing = false; - this.onUpdate(); - }); - - saveButton.textContent = "Speichern"; - editForm.addEventListener("submit", (event) => { - event.preventDefault(); - - const editFormData = Object.fromEntries(new FormData(editForm)); - - if (!editFormData.newCategoryName) { - return; - } - - this.categoryName = editFormData.newCategoryName; - this.isEditing = false; - this.onUpdate(); - this.onDelete(); - }); - - editForm.appendChild(editCategoryNameField); - editForm.appendChild(saveButton); - editForm.appendChild(abortButton); - //li.appendChild(editForm); - - return editForm; - - } - - #renderNormal() { - - const spanCategoryName = document.createElement("span"); - const removeCategoryButton = document.createElement("button"); // Entfernen der Kategorie - const removeCategoryItemsCheckbox = document.createElement("input"); // alle Gegenstände drunter entfernen oder nicht - const removeCategoryItemsText = document.createElement("span"); - const ul = document.createElement("ul"); - const items = this.itemsInCategory.filter((item) => !item.remove); - - spanCategoryName.textContent = this.categoryName; - spanCategoryName.classList.add("category__name--big", "category__name--bold"); - spanCategoryName.addEventListener("click", () => { - this.isEditing = true; - this.onUpdate(); - }); - - removeCategoryItemsCheckbox.setAttribute("type", "checkbox"); - removeCategoryItemsText.textContent = "Alle Gegenstände in dieser Kategorie löschen? :"; - - - removeCategoryButton.textContent = "Löschen"; - removeCategoryButton.addEventListener("click", () => { - this.remove = true; - if (!removeCategoryItemsCheckbox.checked) { - this.itemsInCategory.forEach((element) => { - addNewItem(element.itemName, element.itemAmount, ""); - }); - } - this.onUpdate(); - this.onDelete(); - - }); - - ul.appendChild(spanCategoryName); - ul.appendChild(removeCategoryButton); - ul.appendChild(removeCategoryItemsText); - ul.appendChild(removeCategoryItemsCheckbox); - items.forEach((item, index) => { - ul.append(item.render()); - }); - - return ul; - } - - addItem(item) { - this.itemsInCategory.push(item); - } -} diff --git a/src/main/resources/static/js/ShoppingListItem.js b/src/main/resources/static/js/ShoppingListItem.js deleted file mode 100644 index bd8ad2a..0000000 --- a/src/main/resources/static/js/ShoppingListItem.js +++ /dev/null @@ -1,104 +0,0 @@ -export class ShoppingListItem { - - constructor(itemName, itemAmount, onChange) { - this.itemName = itemName; - this.itemAmount = itemAmount; - this.isEditing = false; - this.isDone = false; - this.remove = false; - this.onChange = onChange; - } - - //gibt ein
  • Element zurück - render() { - let li; - if (this.isEditing) { - li = this.#renderEditing(); - } else { - li = this.#renderNormal() - } - return li; - - } - - #renderEditing() { - const li = document.createElement("li"); - const editForm = document.createElement("form"); - const editItemNameField = document.createElement("input"); - const editItemAmountField = document.createElement("input"); - const saveButton = document.createElement("button"); - const abortButton = document.createElement("button"); - - - editItemNameField.setAttribute("name", "newItemName"); - editItemNameField.setAttribute("value", this.itemName); - - editItemAmountField.setAttribute("itemName", "newItemAmount"); - editItemAmountField.setAttribute("value", this.itemAmount); - - abortButton.textContent = "Abbrechen"; - abortButton.addEventListener("click", (event) => { - event.preventDefault(); - this.isEditing = false; - this.onChange(); - }); - - saveButton.textContent = "Speichern"; - editForm.addEventListener("submit", (event) => { - event.preventDefault(); - - const editFormData = Object.fromEntries(new FormData(editForm)); - - if (!editFormData.newItemName && !editFormData.newItemAmount) { - return; - } - - this.itemName = editFormData.newItemName; - this.itemAmount = editFormData.newItemAmount; - this.isEditing = false; - this.onChange(); - }); - - editForm.appendChild(editItemNameField); - editForm.appendChild(editItemAmountField); - editForm.appendChild(saveButton); - editForm.appendChild(abortButton); - li.appendChild(editForm); - - return li; - } - - #renderNormal() { - const li = document.createElement("li"); - const listContent = document.createElement("span"); - const removeButton = document.createElement("button"); - const doneButton = document.createElement("input"); - - - doneButton.setAttribute("type", "checkbox"); - doneButton.addEventListener("change", () => { - this.isDone = true; - li.classList.toggle("displayedList__item--checked"); - }); - - listContent.addEventListener("click", () => { - this.isEditing = true; - this.onChange(); - }); - - removeButton.textContent = "Löschen"; - removeButton.addEventListener("click", () => { - this.remove = true; - this.onChange(); - }); - - listContent.textContent = this.itemName + " " + this.itemAmount; - - li.appendChild(doneButton); - li.appendChild(listContent); - li.appendChild(removeButton); - - return li; - - } -} diff --git a/src/main/resources/static/js/index.js b/src/main/resources/static/js/index.js new file mode 100644 index 0000000..60e1eec --- /dev/null +++ b/src/main/resources/static/js/index.js @@ -0,0 +1,32 @@ +import { ShoppingList } from "./ShoppingList.js"; + + +const deleteListButtons = document.querySelectorAll('.shoppingListOverview__deleteListButton'); +const shoppingLists = []; + + +function fillList() { + document.querySelectorAll('.shoppingListOverview__shoppingList') + .forEach(list => { + shoppingLists.push(new ShoppingList(list.id)); + console.log(list.id); + }); + +} + +function deleteList(id) { + fetch(`/api/list/${id}`, { method: "DELETE" }).then(r => console.log("Liste entfernt")) +} + + +function init() { + deleteListButtons.forEach(button => { + button.addEventListener("click", () => { + const id = button.dataset.id; // liest data-id + deleteList(id); + }); + }); + fillList(); +} + +document.addEventListener('DOMContentLoaded', init); diff --git a/src/main/resources/static/js/list/ShoppingCategory.js b/src/main/resources/static/js/list/ShoppingCategory.js new file mode 100644 index 0000000..345b5ee --- /dev/null +++ b/src/main/resources/static/js/list/ShoppingCategory.js @@ -0,0 +1,37 @@ +export class ShoppingCategory { + constructor(categoryName) { + this.categoryName = categoryName; + this.categoryID = null; + } + + static fromJSON(categoryAsJSON) { + const category = new ShoppingCategory(categoryAsJSON.categoryName); + category.categoryID = categoryAsJSON.id; + return category; + } + + render() { + const li = document.createElement("li"); + const span = document.createElement("span"); + const deleteCategoryButton = document.createElement("button"); + const deleteAllItemsCheckbox = document.createElement("input"); + const innerUl = document.createElement("ul"); + li.id = this.categoryID; + li.classList.add("category"); + + span.textContent = this.categoryName; + span.classList.add("category__name--bold", "category__name--big"); + + deleteCategoryButton.classList.add("category__deleteButton"); + deleteCategoryButton.textContent = "Kategorie löschen"; + + deleteAllItemsCheckbox.setAttribute("type", "checkbox"); + + li.appendChild(span); + li.appendChild(deleteCategoryButton); + li.appendChild(deleteAllItemsCheckbox); + li.appendChild(innerUl); + + return li; + } +} diff --git a/src/main/resources/static/js/list/ShoppingItem.js b/src/main/resources/static/js/list/ShoppingItem.js new file mode 100644 index 0000000..6d2d75f --- /dev/null +++ b/src/main/resources/static/js/list/ShoppingItem.js @@ -0,0 +1,44 @@ +export class ShoppingItem { + + constructor(itemName, itemAmount) { + this.itemName = itemName; + this.itemAmount = itemAmount; + this.itemID = null; + this.isEditing = true; + } + + + static fromJSON(itemAsJSON) { + const item = new ShoppingItem(itemAsJSON.itemName, itemAsJSON.itemAmount); + item.itemID = itemAsJSON.itemID; + return item; + } + + // gibt das darzustellende
  • zurück + render() { + const li = document.createElement("li"); + + const checkboxDone = document.createElement("input"); + const span = document.createElement("span"); + const deleteItemButton = document.createElement("button"); + + li.id = this.itemID; + li.classList.add("item"); + + checkboxDone.setAttribute("type", "checkbox"); + checkboxDone.setAttribute("autocomplete", "off"); + checkboxDone.classList.add("item__markAsDone"); + + span.textContent = this.itemName + " " + this.itemAmount; + + deleteItemButton.classList.add("item__deleteButton"); + deleteItemButton.textContent = "Löschen"; + + li.appendChild(checkboxDone) + li.appendChild(span); + li.appendChild(deleteItemButton); + + return li; + } + +} diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js new file mode 100644 index 0000000..43e5307 --- /dev/null +++ b/src/main/resources/static/js/list/list.js @@ -0,0 +1,81 @@ +import * as api from "./listAPI.js" +import * as ui from "./listFrontend.js" + + +const addCategoryForm = document.querySelector(".addCategoryForm"); +const addItemForm = document.querySelector(".addItemForm"); +const currentList = document.querySelector(".list"); +const deleteAllDoneItemsButton = document.querySelector(".deleteAllDoneItemsButton"); + +async function addItem(itemName, itemAmount, categoryID) { + console.log(` adding item with id:${currentList.id}, name: ${itemName}, amount: ${itemAmount}, category: ${categoryID}`) + const itemAsJSON = await api.addItem(currentList.id, itemName, itemAmount, categoryID); + console.log(`rendering frointend item: ${itemAsJSON}`); + ui.addItem(itemAsJSON); +} + +async function addCategory(categoryName) { + console.log(`adding category ${categoryName}`) + const categoryAsJSON = await api.addCategory(currentList.id, categoryName); + console.log(categoryAsJSON); + ui.addCategory(categoryAsJSON); + return 0; +} + +function deleteItem(li) { + api.deleteItem(li.id); + ui.deleteItem(li); +} + +function deleteCategory(deleteAllItems, categoryID) { + console.log(`deleting category with allItems: ${deleteAllItems} id: ${categoryID}`); + api.deleteCategory(deleteAllItems, categoryID); + ui.deleteCategory(deleteAllItems, categoryID); +} + +function deleteAllDoneItems() { + console.log(`deleting all done items...`) + api.deleteAllDoneItems(currentList.id); + ui.deleteAllDoneItems(); +} + +function init() { + addCategoryForm.addEventListener("submit", (event) => { + event.preventDefault(); + let formData = Object.fromEntries(new FormData(addCategoryForm)); + addCategory(formData.categoryName); + }); + + addItemForm.addEventListener("submit", event => { + event.preventDefault(); + let formData = Object.fromEntries(new FormData(addItemForm)); + addItem(formData.itemName, formData.itemAmount, formData.itemCategoryID); + }); + + deleteAllDoneItemsButton.addEventListener("click", event => { + deleteAllDoneItems(); + }); + + //event delegation ist schon geil + document.querySelector(".displayedList").addEventListener("click", (event) => { + if (event.target.matches(".item__deleteButton")) { + deleteItem(event.target.closest("li")); + } else if (event.target.matches(".category__deleteButton")) { + const li = event.target.closest("li"); + const checkbox = li.querySelector("input[type=checkbox]"); + deleteCategory(checkbox.checked, li.id); + } + + document.querySelector(".displayedList").addEventListener("change", (e) => { + if (e.target.matches(".item__markAsDone")) { + const item = e.target.closest("li"); + api.editItem(item.id, { isDone: e.target.checked }); + } + }); + + console.log("javascript initialized!"); + return 0; +} + + +document.addEventListener('DOMContentLoaded', init); diff --git a/src/main/resources/static/js/list/listAPI.js b/src/main/resources/static/js/list/listAPI.js new file mode 100644 index 0000000..bf238ac --- /dev/null +++ b/src/main/resources/static/js/list/listAPI.js @@ -0,0 +1,72 @@ + +export async function addItem(listID, itemName, itemAmount, categoryID) { + const newItem = await fetch(`/api/item`, + { + method: "POST", + body: JSON.stringify({ + "itemName": itemName, + "itemAmount": itemAmount, + "categoryID": categoryID, + "listID": listID + }), + headers: { "Content-Type": "application/json" } + }); + + + return await newItem.json(); +} + + +export async function deleteItem(itemID) { + + const response = await fetch(`/api/item/${itemID}`, { method: "DELETE" }); + + if (response.status == 204) { + console.log(`deleted item ${itemID}`); + } + + return response; + +} + +export async function editItem(itemID, toChange) { + const response = await fetch(`/api/item/${itemID}`, + { + method: "PATCH", + body: JSON.stringify(toChange), + headers: { "Content-Type": "application/json" } + }); + + return response; +} + +export async function addCategory(listID, categoryName) { + const newCategory = await fetch(`/api/category`, + { + method: "POST" + , body: JSON.stringify({ "categoryName": categoryName, "listID": listID }) + , headers: { "Content-Type": "application/json" } + }); + return await newCategory.json(); +} + + +export async function deleteCategory(deleteAllItems, categoryID) { + const response = await fetch(`/api/category/${categoryID}?deleteAllItems=${deleteAllItems}`, { method: "DELETE" }); + + if (response.status == 204) { + console.log(`deleted item ${categoryID}`); + } + return response; +} + +export async function deleteAllDoneItems(listID) { + + const response = await fetch(`/api/list/${listID}?deleteAllDoneItems=true`, { method: "DELETE" }); + + if (response.status == 204) { + console.log(`items have been deleted`); + } + return response; + +} diff --git a/src/main/resources/static/js/list/listFrontend.js b/src/main/resources/static/js/list/listFrontend.js new file mode 100644 index 0000000..74cad93 --- /dev/null +++ b/src/main/resources/static/js/list/listFrontend.js @@ -0,0 +1,42 @@ +import { ShoppingCategory } from "./ShoppingCategory.js"; +import { ShoppingItem } from "./ShoppingItem.js"; + +export function addItem(itemAsJSON) { + let list; + if (!itemAsJSON.categoryID) { + list = document.querySelector(".displayedList"); + } else { + list = document.getElementById(`${itemAsJSON.categoryID}`).querySelector("ul"); + } + + const item = ShoppingItem.fromJSON(itemAsJSON); + + list.appendChild(item.render()); +} + +export function deleteItem(li) { + li.remove(); +} + +export function addCategory(categoryAsJSON) { + const list = document.querySelector(".displayedList"); + const category = ShoppingCategory.fromJSON(categoryAsJSON); + + list.appendChild(category.render()); +} + +export function deleteCategory(deleteAllItems, categoryID) { + const category = document.getElementById(categoryID); + if (!deleteAllItems) { + const ul = category.querySelector("ul"); + if (ul) document.querySelector(".displayedList").append(...ul.children); + } + category.remove() +} + +export function deleteAllDoneItems() { + const doneItems = document.querySelectorAll("li.item:has(input[type=checkbox]:checked)"); + doneItems.forEach((li) => { + li.remove(); + }) +} diff --git a/src/main/resources/static/js/main.js b/src/main/resources/static/js/main.js deleted file mode 100644 index 678ee5d..0000000 --- a/src/main/resources/static/js/main.js +++ /dev/null @@ -1,99 +0,0 @@ -import { ShoppingListItem } from "./ShoppingListItem.js"; -import { ShoppingCategory } from "./ShoppingCategory.js"; - -const addItemForm = document.querySelector(".addItemForm"); -const addCategoryForm = document.querySelector(".addCategoryForm") -const itemListElement = document.querySelector(".displayedList"); -const deleteAllDoneItemsButton = document.querySelector(".deleteAllDoneItemsButton"); - -let listElements = []; // Liste der erstellten Items und Kategorien - -function addNewCategory(categoryName) { - - listElements.push(new ShoppingCategory(categoryName, renderAddItemPrompt, renderItemList)); - renderItemList(); - return 0; -} - - -export function addNewItem(itemName, itemAmount, category) { - if (category) { - category = listElements.find((element) => element instanceof ShoppingCategory && element.categoryName == category) - category.addItem(new ShoppingListItem(itemName, itemAmount, renderItemList)); - } else { - listElements.push(new ShoppingListItem(itemName, itemAmount, renderItemList)); - } - renderItemList(); - - return 0; -} - -function renderItemList() { - listElements = listElements.filter(item => !item.remove) - itemListElement.innerHTML = ""; //reset innerItemList - - listElements.forEach((element, index) => { - itemListElement.appendChild(element.render(index)); - }); - -} - -function deleteAllDoneItems() { - listElements.forEach((category, index) => { - if (category instanceof ShoppingCategory) { - category.itemsInCategory = category.itemsInCategory.filter((item) => !item.isDone); - } - }); - listElements = listElements.filter((element) => !element.isDone); - renderItemList(); -} - -function renderAddItemPrompt() { - const selectMenu = document.querySelector(".addItemForm__categorySelect"); - let categories = listElements.filter(element => element instanceof ShoppingCategory); - const emptySelection = document.createElement("option"); - - - emptySelection.setAttribute("value", ""); - emptySelection.selected = true; - emptySelection.textContent = "Keine" - - selectMenu.innerHTML = ""; - selectMenu.appendChild(emptySelection); - - categories.forEach(category => { - const option = document.createElement("option"); - option.setAttribute("value", category.categoryName); - option.textContent = category.categoryName; - - selectMenu.appendChild(option); - }); - -} - -function init() { - - renderAddItemPrompt(); - - addItemForm.addEventListener("submit", (event) => { - if (!addItemForm.checkValidity()) return; - event.preventDefault(); - const addItemFormData = Object.fromEntries(new FormData(addItemForm)); - addNewItem(addItemFormData.itemName, addItemFormData.itemAmount, addItemFormData.itemCategory); - }); - - - addCategoryForm.addEventListener("submit", (event) => { - if (!addCategoryForm.checkValidity()) return; - event.preventDefault(); - const addCategoryFormData = Object.fromEntries(new FormData(addCategoryForm)); - addNewCategory(addCategoryFormData.categoryName); - renderAddItemPrompt(); - }); - - deleteAllDoneItemsButton.addEventListener("click", (event) => { - deleteAllDoneItems(); - }) -} - -init(); diff --git a/src/main/resources/static/js/shared/ShoppingList.js b/src/main/resources/static/js/shared/ShoppingList.js new file mode 100644 index 0000000..08f3eee --- /dev/null +++ b/src/main/resources/static/js/shared/ShoppingList.js @@ -0,0 +1,11 @@ + + +export class ShoppingList{ + constructor(id){ + this.shoppingListName; + this.lastModified = ""; + this.created = ""; + this.id = id; + this.remove = false; + } +} \ No newline at end of file diff --git a/src/main/resources/templates/einkaufsliste.html b/src/main/resources/templates/einkaufsliste.html deleted file mode 100644 index 305a19a..0000000 --- a/src/main/resources/templates/einkaufsliste.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - niggas - - - - - \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html new file mode 100644 index 0000000..a94e9f0 --- /dev/null +++ b/src/main/resources/templates/index.html @@ -0,0 +1,31 @@ + + + + + + + + + + + + +
    +
    + + +
    +
    +
    +
      +
    • + + +
    • +
    +
    + + + diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html new file mode 100644 index 0000000..fc1dd83 --- /dev/null +++ b/src/main/resources/templates/list.html @@ -0,0 +1,64 @@ + + + + + + Einkaufsliste + + + + + +
    +

    +
    + +
    +
    + Neue Kategorie hinzufügen: + + +
    + +
    + +
    + Neuen Gegenstand hinzufügen: + + + + +
    + + + + +
      + +
    • + + + + +
        +
      • + + + +
      • +
      +
    • + +
    • + + + +
    • +
    + +
    + +