Compare commits

Author SHA1 Message Date
Technoir ca0f7cda5d doc: userStories.md hinzugefügt
erste UserStories dokumentiert
2026-09-28 15:45:36 +02:00
Technoir f710137067 doc: readme updated 2026-09-28 15:45:10 +02:00
Technoir 4f9a33baec feat: Gegenstände können nun entfernt werden
Gegenstände können nun entfernt werden. Dies wird erzielt durch einen
Knopf der dynamisch erstellt wird beim hinzufügen, dabei wird ihm ein
index übergeben welcher auf ihn selbst zeigt in listItems.
2026-09-28 15:44:07 +02:00
Technoir 2d68961487 refactor: bessere Lesbarkeit / Modularität
index.html: Umbenennung von Klassennamen
index.html: Funktionen und init() erstellt für Modularität und
Lesbarkeit
2026-09-28 15:42:31 +02:00
Technoir 54caa5faad hinzugefügt index.js
website kann Gegenstände zum kaufen hinzufügen
2026-09-28 15:42:31 +02:00
Technoir 8f848c6d9d index.html hinzugefügt
website hat einen Form mit welchem man Gegenstände hinzufügen kann
2026-09-28 15:42:31 +02:00
Technoir 508aefb9bc gitinore 2026-09-28 13:32:23 +02:00
Technoir 3f1ac72faa inital commit 2026-09-28 13:07:28 +02:00
58 changed files with 110 additions and 1796 deletions

No files matched your search

-57
View File
@@ -1,57 +0,0 @@
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 <Rolle> möchte ich <Ziel>, damit <Nutzen>.
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: "- [ ] "
-57
View File
@@ -1,57 +0,0 @@
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 <Rolle> möchte ich <Ziel>, damit <Nutzen>.
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: "- [ ] "
+19 -24
View File
@@ -1,28 +1,23 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
node_modules
dist
dist-ssr
*.local
target
# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
# Output
.output
.vercel
.netlify
.wrangler
/.svelte-kit
/build
# OS
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
Thumbs.db
# H2
data
# Env
.env
.env.*
!.env.example
!.env.test
# Vite
vite.config.js.timestamp-*
vite.config.ts.timestamp-*
+4
View File
@@ -0,0 +1,4 @@
# Einkaufsliste
Dies ist die Dokumentation des Projektes Einkaufsliste der WInfo Klasse
DBWINFO B/C 05.
+9
View File
@@ -0,0 +1,9 @@
# User stories
Liste der User Stories und ihr Status:
## Als ein Nutzer möchte ich
- ... Gegenstände mit Namen und Menge hinzufügen
- ... Kategorien erstellen können und darunter Gegenstände hinzufügen
- ... Kategorien samt Inhalt speichern und wiederaufrufen können
+29
View File
@@ -0,0 +1,29 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Einkaufsliste</title>
<link href="css/style.css" rel="stylesheet">
<script src="js/index.js" defer></script>
</head>
<body>
<div class="title">
<h1>Einkaufsliste</h1>
</div>
<div class="list">
<form class="list__inputForm">
<input type="text" class="list__inputForm__itemName" name="itemName">
<input type="text" class="list__inputForm__itemAmount" name="itemAmount">
<button class="list__inputForm__submitButton" type="submit">Hinzufügen</button>
</form>
<ul class="list__displayedList">
</ul>
</div>
</body>
</html>
+49
View File
@@ -0,0 +1,49 @@
const form = document.querySelector(".list__inputForm");
const itemList = document.querySelector(".list__displayedList");
let listItems = []; //list of items that the user has
function handleListElement(itemName, itemAmount,) {
listItems.push({ name: itemName, amount: itemAmount });
renderList();
return 0;
}
function renderList() {
itemList.innerHTML = ""; //reset innerItemList
listItems.forEach((element, index) => {
const li = document.createElement("li");
const removeButton = document.createElement("button");
removeButton.textContent = "Löschen";
removeButton.addEventListener("click", () => {
listItems.splice(index, 1);
renderList();
});
li.textContent = element.name + " " + element.amount;
li.appendChild(removeButton)
itemList.appendChild(li);
});
}
function init() {
document.querySelector(".list__inputForm").addEventListener("submit", (event) => {
if (!form.checkValidity()) return;
event.preventDefault();
formData = Object.fromEntries(new FormData(form));
handleListElement(formData.itemName, formData.itemAmount);
});
}
init();
-132
View File
@@ -1,132 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>4.1.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>de.timaldinger</groupId>
<artifactId>einkaufsliste</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name/>
<description/>
<url/>
<licenses>
<license/>
</licenses>
<developers>
<developer/>
</developers>
<scm>
<connection/>
<developerConnection/>
<tag/>
<url/>
</scm>
<properties>
<java.version>25</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-rest</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webmvc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-rest-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webmvc-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</path>
</annotationProcessorPaths>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</path>
</annotationProcessorPaths>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
@@ -1,52 +0,0 @@
package de.timaldinger.einkaufsliste.Controller;
import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException;
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.List;
import java.util.UUID;
@Controller
@RequestMapping("/")
public class PageController {
@Autowired
private ShoppingListRepository shoppingListRepository;
@Autowired
private ShoppingCategoryRepository shoppingCategoryRepository;
@Autowired
private ShoppingItemRepository shoppingItemRepository;
@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(() -> new ResourceNotFoundException("Seite",id));
List<ShoppingList> lists = shoppingListRepository.findAll();
model.addAttribute("lists", lists);
model.addAttribute("list", list);
model.addAttribute("categories", shoppingCategoryRepository.findByList(list));
model.addAttribute("items", shoppingItemRepository.findByList_IdAndCategoryIsNull(id));
return "list";
}
}
@@ -1,89 +0,0 @@
package de.timaldinger.einkaufsliste.Controller;
import de.timaldinger.einkaufsliste.Dto.Post.ShoppingCategoryPostDTO;
import de.timaldinger.einkaufsliste.Dto.Patch.ShoppingCategoryPatchDTO;
import de.timaldinger.einkaufsliste.Dto.Response.ShoppingCategoryResponseDTO;
import de.timaldinger.einkaufsliste.Exceptions.BadRequestException;
import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException;
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 jakarta.validation.Valid;
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 org.springframework.web.servlet.support.ServletUriComponentsBuilder;
import java.net.URI;
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/categories")
public ResponseEntity<ShoppingCategoryResponseDTO> addCategory(@Valid @RequestBody ShoppingCategoryPostDTO newCategory){
String name = newCategory.categoryName();
ShoppingList list = shoppingListRepository.findById(newCategory.listID()).orElseThrow(() -> new ResourceNotFoundException("listID",newCategory.listID()));
ShoppingCategory category = new ShoppingCategory(name, List.of(),list);
shoppingCategoryRepository.save(category);
URI location = ServletUriComponentsBuilder
.fromCurrentRequest()
.path("/{id}")
.buildAndExpand(category.getId())
.toUri();
return ResponseEntity.created(location).body(new ShoppingCategoryResponseDTO(name, category.getId()));
}
@PatchMapping("/api/categories/{categoryID}")
public ResponseEntity<Void> editCategory(@PathVariable UUID categoryID,@Valid @RequestBody ShoppingCategoryPatchDTO toChange){
ShoppingCategory category = shoppingCategoryRepository.findById(categoryID).orElseThrow(() -> new ResourceNotFoundException("categoryID",categoryID));
if(toChange.categoryName() != null) category.setCategoryName(toChange.categoryName());
shoppingCategoryRepository.save(category);
return ResponseEntity.noContent().build();
}
@DeleteMapping("/api/categories/{categoryID}")
public ResponseEntity<Void> deleteCategory(@PathVariable UUID categoryID, @RequestParam(required = false) Boolean deleteAllItems){
if(deleteAllItems == null){
throw new BadRequestException("Missing required parameter deleteAllItems (can be either true or false)");
}
shoppingCategoryRepository.findById(categoryID).orElseThrow(() -> new ResourceNotFoundException("categoryID", categoryID));
List<ShoppingItem> 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();
}
}
@@ -1,92 +0,0 @@
package de.timaldinger.einkaufsliste.Controller;
import de.timaldinger.einkaufsliste.Dto.Post.ShoppingItemPostDTO;
import de.timaldinger.einkaufsliste.Dto.Patch.ShoppingItemPatchDTO;
import de.timaldinger.einkaufsliste.Dto.Response.ShoppingItemResponseDTO;
import de.timaldinger.einkaufsliste.Exceptions.BadRequestException;
import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException;
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 jakarta.annotation.Resource;
import jakarta.validation.Valid;
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 org.springframework.web.servlet.support.ServletUriComponentsBuilder;
import java.net.URI;
import java.util.List;
import java.util.UUID;
@RestController
public class ShoppingItemController {
@Autowired
private ShoppingCategoryRepository shoppingCategoryRepository;
@Autowired
private ShoppingListRepository shoppingListRepository;
@Autowired
private ShoppingItemRepository shoppingItemRepository;
@PostMapping("/api/items")
public ResponseEntity<ShoppingItemResponseDTO> addItem(@Valid @RequestBody ShoppingItemPostDTO newItem){
String name = newItem.itemName();
String amount = newItem.itemAmount();
ShoppingCategory c;
if(newItem.categoryID() != null){
c = shoppingCategoryRepository.findById(newItem.categoryID()).orElseThrow(() -> new ResourceNotFoundException("categoryID", newItem.categoryID()));
}else{
c = null;
}
ShoppingList list = shoppingListRepository.findById(newItem.listID()).orElseThrow(() -> new ResourceNotFoundException("listID", newItem.listID()));
ShoppingItem item = new ShoppingItem(name, amount, false, c, list);
shoppingItemRepository.save(item);
URI location = ServletUriComponentsBuilder
.fromCurrentRequest()
.path("/{id}")
.buildAndExpand(item.getId())
.toUri();
return ResponseEntity.created(location).body(new ShoppingItemResponseDTO(name,amount,item.getId(),c != null ? c.getId() : null));
}
@PatchMapping("/api/items/{itemID}")
public ResponseEntity<Void> editItem(@PathVariable UUID itemID , @Valid @RequestBody ShoppingItemPatchDTO toChange){
ShoppingItem item = shoppingItemRepository.findById(itemID).orElseThrow(() -> new ResourceNotFoundException("itemID",itemID));
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(() -> new ResourceNotFoundException("categoryID",toChange.categoryID())));
shoppingItemRepository.save(item);
return ResponseEntity.noContent().build();
}
@DeleteMapping("/api/items/{itemID}")
public ResponseEntity<Void> deleteItem(@PathVariable UUID itemID){
shoppingItemRepository.findById(itemID).orElseThrow(() ->new ResourceNotFoundException("itemID",itemID));
shoppingItemRepository.deleteById(itemID);
return ResponseEntity.noContent().build();
}
@DeleteMapping("/api/lists/{listID}/items")
public ResponseEntity<Void> deleteAllDoneItems(@PathVariable UUID listID, @RequestParam boolean done){
if(!done) throw new BadRequestException("Parameter \"done\" must be true!");
shoppingListRepository.findById(listID).orElseThrow(() -> new ResourceNotFoundException("listID", listID));
List<ShoppingItem> items = shoppingItemRepository.findByList_IdAndIsDoneIsTrue(listID);
shoppingItemRepository.deleteAll(items);
return ResponseEntity.noContent().build();
}
}
@@ -1,70 +0,0 @@
package de.timaldinger.einkaufsliste.Controller;
import de.timaldinger.einkaufsliste.Dto.Patch.ShoppingListPatchDTO;
import de.timaldinger.einkaufsliste.Dto.Post.ShoppingListPostDTO;
import de.timaldinger.einkaufsliste.Dto.Response.ShoppingListResponseDTO;
import de.timaldinger.einkaufsliste.Exceptions.ResourceNotFoundException;
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 de.timaldinger.einkaufsliste.Service.ShoppingListService;
import jakarta.validation.Valid;
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 org.springframework.web.servlet.support.ServletUriComponentsBuilder;
import java.net.URI;
import java.util.List;
import java.util.UUID;
@RestController
public class ShoppingListController {
@Autowired
private ShoppingCategoryRepository shoppingCategoryRepository;
@Autowired
private ShoppingListRepository shoppingListRepository;
@Autowired
private ShoppingItemRepository shoppingItemRepository;
@Autowired
private ShoppingListService shoppingListService;
@PostMapping("/api/lists")
public ResponseEntity<ShoppingListResponseDTO> addList(@Valid @RequestBody ShoppingListPostDTO newList){
ShoppingList list = new ShoppingList(newList.listName(), null, null, 0, 0);
shoppingListRepository.save(list);
URI location = ServletUriComponentsBuilder
.fromCurrentRequest()
.path("/{id}")
.buildAndExpand(list.getId())
.toUri();
return ResponseEntity.created(location).body(new ShoppingListResponseDTO(list.getListName(), list.getId()));
}
@DeleteMapping("/api/lists/{listID}")
public ResponseEntity<Void> deleteList(@PathVariable UUID listID){
shoppingListRepository.findById(listID).orElseThrow(() -> new ResourceNotFoundException("listID",listID));
shoppingListService.deleteList(listID);
return ResponseEntity.noContent().build();
}
@PatchMapping("/api/lists/{listID}")
public ResponseEntity<Void> editList(@PathVariable UUID listID,@Valid @RequestBody ShoppingListPatchDTO toChange){
ShoppingList list = shoppingListRepository.findById(listID).orElseThrow(() -> new ResourceNotFoundException("listID", listID));
if(toChange.newListName() != null) list.setListName(toChange.newListName());
shoppingListRepository.save(list);
return ResponseEntity.noContent().build();
}
}
@@ -1,6 +0,0 @@
package de.timaldinger.einkaufsliste.Dto.Patch;
import jakarta.validation.constraints.NotBlank;
public record ShoppingCategoryPatchDTO(@NotBlank(message = "categoryName can't be blank") String categoryName) {
}
@@ -1,15 +0,0 @@
package de.timaldinger.einkaufsliste.Dto.Patch;
import jakarta.validation.constraints.AssertTrue;
import java.util.UUID;
public record ShoppingItemPatchDTO(String itemName, String itemAmount, Boolean isDone, UUID categoryID) {
@AssertTrue(message = "itemName and itemAmount both cant be blank!")
private boolean isAtleastOneNotBlank(){
boolean n = itemName != null && !itemName.isBlank();
boolean a = itemAmount != null && !itemAmount.isBlank();
return n || a || isDone != null || categoryID != null;
}
}
@@ -1,6 +0,0 @@
package de.timaldinger.einkaufsliste.Dto.Patch;
import jakarta.validation.constraints.NotBlank;
public record ShoppingListPatchDTO(@NotBlank(message = "listName must not be blank!") String newListName) {
}
@@ -1,8 +0,0 @@
package de.timaldinger.einkaufsliste.Dto.Post;
import jakarta.validation.constraints.NotBlank;
import java.util.UUID;
public record ShoppingCategoryPostDTO(@NotBlank String categoryName, UUID listID) {
}
@@ -1,20 +0,0 @@
package de.timaldinger.einkaufsliste.Dto.Post;
import jakarta.validation.constraints.AssertTrue;
import jakarta.validation.constraints.NotNull;
import java.util.UUID;
public record ShoppingItemPostDTO(String itemName,
String itemAmount,
UUID categoryID,
@NotNull(message = "listID must not be empty!")
UUID listID){
@AssertTrue(message = "itemName and itemAmount cant both be blank!")
private boolean isAtleastOneNotBlank(){
boolean n = itemName != null && !itemName.isBlank();
boolean a = itemAmount != null && !itemAmount.isBlank();
return n || a;
}
}
@@ -1,6 +0,0 @@
package de.timaldinger.einkaufsliste.Dto.Post;
import jakarta.validation.constraints.NotBlank;
public record ShoppingListPostDTO(@NotBlank(message = "listName must not be blank!") String listName) {
}
@@ -1,6 +0,0 @@
package de.timaldinger.einkaufsliste.Dto.Response;
import java.util.UUID;
public record ShoppingCategoryResponseDTO (String categoryName, UUID categoryID){
}
@@ -1,6 +0,0 @@
package de.timaldinger.einkaufsliste.Dto.Response;
import java.util.UUID;
public record ShoppingItemResponseDTO(String itemName, String itemAmount, UUID itemID, UUID categoryID) {
}
@@ -1,6 +0,0 @@
package de.timaldinger.einkaufsliste.Dto.Response;
import java.util.UUID;
public record ShoppingListResponseDTO (String listName, UUID listID){
}
@@ -1,13 +0,0 @@
package de.timaldinger.einkaufsliste;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class EinkaufslisteApplication {
public static void main(String[] args) {
SpringApplication.run(EinkaufslisteApplication.class, args);
}
}
@@ -1,11 +0,0 @@
package de.timaldinger.einkaufsliste.Exceptions;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
@ResponseStatus(HttpStatus.BAD_REQUEST)
public class BadRequestException extends RuntimeException {
public BadRequestException(String message) {
super(message);
}
}
@@ -1,4 +0,0 @@
package de.timaldinger.einkaufsliste.Exceptions;
public record ErrorResponse(int status, String msg, String path) {
}
@@ -1,58 +0,0 @@
package de.timaldinger.einkaufsliste.Exceptions;
import jakarta.servlet.http.HttpServletRequest;
import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.support.DefaultMessageSourceResolvable;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.HttpStatusCode;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.context.request.ServletWebRequest;
import org.springframework.web.context.request.WebRequest;
import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
import java.util.stream.Collectors;
@RestControllerAdvice
public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
@ExceptionHandler(BadRequestException.class)
public ResponseEntity<ErrorResponse> handleBadRequest(BadRequestException e, HttpServletRequest req) {
return ResponseEntity.status(HttpStatus.BAD_REQUEST)
.body(new ErrorResponse(400, e.getMessage(), req.getRequestURI()));
}
@ExceptionHandler(ResourceNotFoundException.class)
public ResponseEntity<ErrorResponse> handleResourceNotFound(ResourceNotFoundException e, HttpServletRequest req) {
return ResponseEntity.status(HttpStatus.NOT_FOUND)
.body(new ErrorResponse(404, e.getMessage(), req.getRequestURI()));
}
@ExceptionHandler(Exception.class)
public ResponseEntity<ErrorResponse> handleAll(Exception e, HttpServletRequest req){
log.error("{}",req.getRequestURI(), e);
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new ErrorResponse(500,"Internal error", req.getRequestURI()));
}
@Override
protected @Nullable ResponseEntity<Object> handleExceptionInternal(Exception ex, @Nullable Object body, HttpHeaders headers, HttpStatusCode statusCode, WebRequest request) {
var error = new ErrorResponse(statusCode.value(), ex.getMessage(),((ServletWebRequest) request).getRequest().getRequestURI());
return new ResponseEntity<>(error,headers,statusCode);
}
@Override
protected @Nullable ResponseEntity<Object> handleMethodArgumentNotValid(MethodArgumentNotValidException ex, HttpHeaders headers, HttpStatusCode status, WebRequest request) {
String msg = ex.getBindingResult().getFieldErrors().stream()
.map(DefaultMessageSourceResolvable::getDefaultMessage)
.collect(Collectors.joining(", "));
var error = new ErrorResponse(status.value(), msg ,((ServletWebRequest) request).getRequest().getRequestURI());
return new ResponseEntity<>(error,headers,status);
}
}
@@ -1,9 +0,0 @@
package de.timaldinger.einkaufsliste.Exceptions;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
@ResponseStatus(HttpStatus.NOT_FOUND)
public class ResourceNotFoundException extends RuntimeException {
public ResourceNotFoundException(String resource, Object value){ super("Resource " + resource + ":"+value.toString()+" not found");}
}
@@ -1,26 +0,0 @@
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{
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<ShoppingItem> itemsInCategory;
@ManyToOne //mehrere Kategorien (Many) gehören (to) einer Liste an (one)
@JoinColumn(name="list_id", nullable = false)
private ShoppingList list;
}
@@ -1,19 +0,0 @@
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;
}
@@ -1,28 +0,0 @@
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 {
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;
}
@@ -1,23 +0,0 @@
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;
@Getter
@Setter
@Entity
@AllArgsConstructor
@NoArgsConstructor
public class ShoppingList extends ShoppingElement {
private String listName;
private Date dateCreated;
private Date lastChanged;
private int numberItems;
private int numberCategory;
}
@@ -1,18 +0,0 @@
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 org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.List;
import java.util.UUID;
public interface ShoppingCategoryRepository extends JpaRepository<ShoppingCategory, UUID>{
List<ShoppingCategory> findByList(ShoppingList list);
@Modifying
@Query("DELETE FROM ShoppingCategory c WHERE c.list.id = :listID")
void deleteByListId(@Param("listID") UUID listID);
}
@@ -1,21 +0,0 @@
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 org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.List;
import java.util.UUID;
public interface ShoppingItemRepository extends JpaRepository<ShoppingItem, UUID> {
List<ShoppingItem> findByList_IdAndCategoryIsNull(UUID list);
List<ShoppingItem> findAllByCategory_Id(UUID categoryID);
List<ShoppingItem> findByList_IdAndIsDoneIsTrue(UUID listID);
@Modifying
@Query("DELETE FROM ShoppingItem i WHERE i.list.id = :listID")
void deleteByListId(@Param("listID") UUID listID);
}
@@ -1,10 +0,0 @@
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<ShoppingList, UUID>{
}
@@ -1,27 +0,0 @@
package de.timaldinger.einkaufsliste.Service;
import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository;
import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository;
import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository;
import jakarta.transaction.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.UUID;
@Service
public class ShoppingListService {
@Autowired
private ShoppingItemRepository shoppingItemRepository;
@Autowired
private ShoppingListRepository shoppingListRepository;
@Autowired
private ShoppingCategoryRepository shoppingCategoryRepository;
@Transactional
public void deleteList(UUID listID){
shoppingItemRepository.deleteByListId(listID);
shoppingCategoryRepository.deleteByListId(listID);
shoppingListRepository.deleteById(listID);
}
}
@@ -1,7 +0,0 @@
spring.application.name=einkaufsliste
spring.datasource.url=jdbc:h2:file:./data/einkaufsliste
spring.jpa.hibernate.ddl-auto=update
spring.h2.console.enabled=true
server.error.include-stacktrace=never
-28
View File
@@ -1,28 +0,0 @@
.nav__dropdown {
position: relative;
}
.nav__dropdownMenu {
display: none;
position: absolute;
top: 100%;
left: 0;
}
.nav__dropdown:hover .nav__dropdownMenu,
.nav__dropdown.is-open .nav__dropdownMenu{
display: block;
}
.nav > ul {
display: flex;
gap: 1rem;
list-style: none;
margin: 1;
padding: 1;
}
.nav__dropdownMenu {
background-color: grey;
}
Whitespace-only changes.
-22
View File
@@ -1,22 +0,0 @@
.category__name--bold {
font-weight: bold;
}
.category__name--big {
font-size : 1.5rem;
}
shopping-item[is-checked="true"] .item__text{
text-decoration: line-through;
}
.item {
display: flex;
align-items: center;
gap: .5em;
}
.item__text{
display: inline-flex;
gap: .25em;
}
@@ -1,58 +0,0 @@
export class ShoppingCategory extends HTMLElement {
static get observedAttributes() { return ["category-name"] }
constructor() {
super();
this._rendered = false;
}
connectedCallback() {
if (this._rendered) return;
const categoryHeaderDiv = document.createElement("div");
const span = document.createElement("span");
const deleteCategoryButton = document.createElement("button");
const labelDeleteAllItems = document.createElement("label");
const deleteAllItemsCheckbox = document.createElement("input");
const ul = document.createElement("ul");
categoryHeaderDiv.classList.add("category__header");
span.textContent = this.getAttribute("category-name");
span.classList.add("category__name", "category__name--bold", "category__name--big");
labelDeleteAllItems.classList.add("category__labelDeleteAll");
labelDeleteAllItems.textContent = "Gegenstände mit Kategorie löschen?";
deleteCategoryButton.classList.add("category__deleteButton");
deleteCategoryButton.textContent = "Kategorie löschen";
deleteAllItemsCheckbox.setAttribute("type", "checkbox");
labelDeleteAllItems.append(deleteAllItemsCheckbox);
categoryHeaderDiv.append(span, deleteCategoryButton, labelDeleteAllItems);
this.prepend(categoryHeaderDiv);
if (!this.querySelector("ul")) this.append(ul);
this._rendered = true;
}
attributeChangedCallback(name, oldVal, newVal) {
if (!this._rendered) return;
if (newVal == oldVal) return;
switch (name) {
case "category-name":
this.querySelector(".category__name").textContent = newVal;
break;
default:
break;
}
}
}
@@ -1,59 +0,0 @@
export class ShoppingItem extends HTMLElement {
static get observedAttributes() { return ["item-name", "item-amount"] }
constructor() {
super();
this._rendered = false;
}
connectedCallback() {
if (this._rendered) return;
console.log(`rendering element shopping-item`);
const checkboxDone = document.createElement("input");
const spanText = document.createElement("span");
const spanName = document.createElement("span");
const spanAmount = document.createElement("span");
const buttonDelete = document.createElement("button");
checkboxDone.classList.add("item__checkboxDone");
checkboxDone.setAttribute("type", "checkbox");
checkboxDone.setAttribute("autocomplete", "off");
checkboxDone.checked = this.getAttribute("is-checked") === "true";
spanText.classList.add("item__text");
spanName.classList.add("item__itemName");
spanAmount.classList.add("item__itemAmount");
spanName.textContent = this.getAttribute("item-name");
spanAmount.textContent = this.getAttribute("item-amount");
buttonDelete.classList.add("item__buttonDeleteItem");
buttonDelete.setAttribute("type", "button ");
buttonDelete.textContent = "Löschen";
spanText.append(spanName, spanAmount);
this.append(checkboxDone, spanText, buttonDelete);
this._rendered = true;
}
attributeChangedCallback(name, oldVal, newVal) {
if (!this._rendered) return;
if (newVal == oldVal) return;
switch (name) {
case "item-name":
this.querySelector(".item__itemName").textContent = newVal;
break;
case "item-amount":
this.querySelector(".item__itemAmount").textContent = newVal;
break;
default:
break;
}
}
}
@@ -1,55 +0,0 @@
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.dataset.id = this.listID;
a.setAttribute("href", `/list/${this.listID}`);
a.classList.add("list__name");
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;
}
renderNavElement() {
const li = document.createElement("li");
const a = document.createElement("a");
li.classList.add("navbar__list");
li.dataset.id = this.listID;
a.setAttribute("href", `/list/${this.listID}`);
a.textContent = this.listName;
li.append(a);
return li;
}
}
@@ -1,28 +0,0 @@
export function addList(listName) {
return fetch(`/api/lists`,
{
method: "POST",
body: JSON.stringify({ listName: listName }),
headers: { "Content-Type": "application/json" }
}
);
}
export function deleteList(id) {
return fetch(`/api/lists/${id}`, { method: "DELETE" });
}
export function editList(listID, toChange) {
return fetch(`/api/lists/${listID}`,
{
method: "PATCH",
body: JSON.stringify(toChange),
headers: { "Content-Type": "application/json" }
});
}
@@ -1,52 +0,0 @@
import { ShoppingList } from "../../../models/ShoppingList.js";
export function addList(listAsJSON) {
const list = document.querySelector(".displayedList");
const navList = document.querySelector(".nav__dropdownMenu");
const listElement = ShoppingList.fromJSON(listAsJSON);
list.append(listElement.render());
navList.append(listElement.renderNavElement());
}
export function deleteList(listElement) {
document.querySelector(`li.navbar__list[data-id='${listElement.dataset.id}']`).remove();
listElement.remove();
}
export function createEditListForm(textElement) {
const editForm = document.createElement("form");
const inputName = document.createElement("input");
const abortButton = document.createElement("button");
const saveButton = document.createElement("button");
inputName.setAttribute("name", "newListName");
inputName.setAttribute("value", textElement.querySelector(".list__name").textContent);
inputName.classList.add("editForm__name");
abortButton.textContent = "Abbrechen";
saveButton.textContent = "Speichern";
saveButton.classList.add("editForm__saveButton");
abortButton.classList.add("editForm__abortButton");
editForm.append(inputName, saveButton, abortButton);
return editForm;
}
export function editList(id, formElement, formData, listLi) {
let newName = formData.newListName;
document.querySelector(`.navbar__list[data-id='${listLi.dataset.id}'] > a`).textContent = newName;
listLi.querySelector(".list__name").textContent = newName;
listLi.setAttribute("href", `/list/${id}`);
formElement.replaceWith(listLi);
}
@@ -1,68 +0,0 @@
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 json = await handleResponse(api.addList(listName), `error creating list`);
if (json) ui.addList(json);
}
function editList(listLi) {
//erstellen das Forms
const formElement = ui.createEditListForm(listLi);
let id = listLi.dataset.id;
listLi.replaceWith(formElement);
formElement.querySelector(".editForm__name").focus();
formElement.addEventListener("submit", async (event) => {
event.preventDefault();
let formData = Object.fromEntries(new FormData(formElement));
const result = await handleResponse(api.editList(id, { newListName: formData.newListName }), `error editing list`);
if (result) ui.editList(id, formElement, formData, listLi);
});
formElement.querySelector(".editForm__abortButton").addEventListener("click", () => {
abortEditing(formElement, listLi);
})
formElement.addEventListener("keydown", (e) => {
if (e.key == "Escape") abortEditing(formElement, listLi);
})
}
async function deleteList(listElement) {
const json = await handleResponse(api.deleteList(listElement.dataset.id), `error deleting list`);
if (json) ui.deleteList(listElement);
}
function init() {
initErrors(document.querySelector(".nav"));
addListForm.addEventListener("submit", (e) => {
e.preventDefault();
const formData = Object.fromEntries(new FormData(addListForm));
addList(formData.listName);
});
document.querySelector(".index").addEventListener("click", (event) => {
if (event.target.matches(".list__editButton")) {
editList(event.target.closest("li"));
} else if (event.target.matches(".list__deleteButton")) {
deleteList(event.target.closest("li"));
}
});
}
document.addEventListener('DOMContentLoaded', init);
@@ -1,21 +0,0 @@
export function addCategory(listID, categoryName) {
return fetch(`/api/categories`,
{
method: "POST"
, body: JSON.stringify({ "categoryName": categoryName, "listID": listID })
, headers: { "Content-Type": "application/json" }
});
}
export function editCategory(categoryID, toChange) {
return fetch(`/api/categories/${categoryID}`,
{
method: "PATCH",
body: JSON.stringify(toChange),
headers: { "Content-Type": "application/json" }
});
}
export function deleteCategory(deleteAllItems, categoryID) {
return fetch(`/api/categories/${categoryID}?deleteAllItems=${deleteAllItems}`, { method: "DELETE" });
}
@@ -1,33 +0,0 @@
export function addItem(listID, itemName, itemAmount, categoryID) {
return fetch(`/api/items`,
{
method: "POST",
body: JSON.stringify({
"itemName": itemName,
"itemAmount": itemAmount,
"categoryID": categoryID,
"listID": listID
}),
headers: { "Content-Type": "application/json" }
});
}
export function deleteItem(itemID) {
return fetch(`/api/items/${itemID}`, { method: "DELETE" });
}
export function editItem(itemID, toChange) {
return fetch(`/api/items/${itemID}`,
{
method: "PATCH",
body: JSON.stringify(toChange),
headers: { "Content-Type": "application/json" }
});
}
export function deleteAllDoneItems(listID) {
return fetch(`/api/lists/${listID}/items?done=true`, { method: "DELETE" });
}
@@ -1,3 +0,0 @@
export * from "./itemAPI.js";
export * from "./categoryAPI.js"
@@ -1,30 +0,0 @@
export function addCategory(categoryAsJSON) {
const list = document.querySelector(".displayedList");
const category = document.createElement("shopping-category");
const li = document.createElement("li");
li.classList.add("category");
li.dataset.id = categoryAsJSON.categoryID;
category.setAttribute("category-name", categoryAsJSON.categoryName);
li.append(category); //fügt Kategorie der Liste hinzu
list.append(li);
const categorySelect = document.querySelector(".addItemForm__categorySelect");
const newCategoryOption = document.createElement("option");
newCategoryOption.setAttribute("value", categoryAsJSON.categoryID);
newCategoryOption.textContent = categoryAsJSON.categoryName;
categorySelect.append(newCategoryOption);
}
export function deleteCategory(deleteAllItems, categoryID) {
const category = document.querySelector(`li[data-id='${categoryID}']`);
if (!deleteAllItems) {
const ul = category.querySelector("ul");
if (ul) document.querySelector(".displayedList").append(...ul.children);
}
category.remove()
document.querySelector(`option[value='${categoryID}']`).remove();
}
@@ -1,25 +0,0 @@
export function addItem(itemAsJSON) {
let list;
if (!itemAsJSON.categoryID) {
list = document.querySelector(".displayedList");
} else {
list = document.querySelector(`li[data-id='${itemAsJSON.categoryID}']`).querySelector("ul");
}
const li = document.createElement("li");
const item = document.createElement("shopping-item");
li.dataset.id = itemAsJSON.itemID;
li.classList.add("item");
item.setAttribute("item-name", itemAsJSON.itemName);
item.setAttribute("item-amount", itemAsJSON.itemAmount);
li.append(item);
list.append(li);
}
export function deleteItem(li) {
li.remove();
}
@@ -1,11 +0,0 @@
export * from "./itemUI.js";
export * from "./categoryUI.js";
export function deleteAllDoneItems() {
const doneItems = document.querySelectorAll("li.item:has(shopping-item[is-checked=true])");
doneItems.forEach((li) => {
li.remove();
})
}
@@ -1,141 +0,0 @@
import { ShoppingCategory } from "../../models/ShoppingCategory.js";
import { ShoppingItem } from "../../models/ShoppingItem.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";
import { editElement } from "../../shared/editing.js";
import * as sharedUI from "../../shared/sharedUI.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.dataset.id}, name: ${itemName}, amount: ${itemAmount}, category: ${categoryID}`)
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 json = await handleResponse(api.addCategory(currentList.dataset.id, categoryName), `category couldnt be added!`);
if (json) ui.addCategory(json);
}
async function deleteItem(li) {
console.log(`deleting item ${li.dataset.id}`)
const json = await handleResponse(api.deleteItem(li.dataset.id), `error deleting item`);
if (json) ui.deleteItem(li);
}
async function deleteCategory(deleteAllItems, categoryID) {
console.log(`deleting category with allItems: ${deleteAllItems} id: ${categoryID}`);
const json = await handleResponse(api.deleteCategory(deleteAllItems, categoryID), `error deleting category`);
if (json) ui.deleteCategory(deleteAllItems, categoryID);
}
async function deleteAllDoneItems() {
console.log(`deleting all done items...`)
const json = await handleResponse(api.deleteAllDoneItems(currentList.dataset.id), `error deleting all done items`);
if (json) ui.deleteAllDoneItems();
}
function init() {
initErrors(document.querySelector(".nav"));
customElements.define("shopping-item", ShoppingItem);
customElements.define("shopping-category", ShoppingCategory);
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__buttonDeleteItem")) {
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.dataset.id);
} else if (event.target.closest(".item__text")) {
const shoppingItemElement = event.target.closest("shopping-item");
const id = event.target.closest("li").dataset.id;
let itemName = shoppingItemElement.querySelector(".item__itemName").textContent;
let itemAmount = shoppingItemElement.querySelector(".item__itemAmount").textContent;
/*
* { name: "", value: "", class: "", attr: ""}
*/
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" }
]
, onSuccess: (f) => { sharedUI.setElementAttributes(shoppingItemElement, { "item-name": f.itemName, "item-amount": f.itemAmount }) }
, errmsg: `konnte Item nicht bearbeiten`
});
} 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({
element: categoryHeader, apiCall: api.editCategory, id: id,
fields: [
{ name: "categoryName", value: categoryName, class: "editForm__name", attr: "category-name" },
]
, onSuccess: (f) => {
sharedUI.setElementAttributes(categoryElement, { "category-name": f.categoryName })
document.querySelector(`option[value='${id}']`).textContent = f.categoryName;
}
, errmsg: `konnte Kategorie nicht bearbeiten`
});
}
});
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!");
}
document.addEventListener('DOMContentLoaded', init);
@@ -1,29 +0,0 @@
import { abortEditing, createEditForm } from "./sharedUI.js";
import { handleResponse } from "./helper.js";
export async function editElement({ element, fields, apiCall, id, onSuccess, errmsg }) {
const formElement = 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);
abortEditing(formElement, element);
if (result) onSuccess(formData);
});
formElement.addEventListener("click", (e) => {
if (e.target.matches(".editForm__buttonAbort")) abortEditing(formElement, element);
})
formElement.addEventListener("keydown", (e) => {
if (e.key == "Escape") abortEditing(formElement, element);
});
}
@@ -1,22 +0,0 @@
const errorDiv = document.createElement("div");
const errorSpan = document.createElement("span");
let errorTimer;
export function showError(msg) {
errorSpan.textContent = msg;
errorDiv.hidden = false
clearTimeout(errorTimer);
errorTimer = (setTimeout(() => {
errorDiv.hidden = true;
errorSpan.textContent = "";
}, 3000));
}
export function initErrors(element) {
errorDiv.hidden = true;
errorDiv.append(errorSpan);
element.append(errorDiv);
}
@@ -1,21 +0,0 @@
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;
}
@@ -1,36 +0,0 @@
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 setElementAttributes(element, attributes) {
for (const [attr, val] of Object.entries(attributes)) element.setAttribute(attr, val);
}
-43
View File
@@ -1,43 +0,0 @@
<!DOCTYPE html>
<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:th="http://www.thymeleaf.org">
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="" />
<meta name="author" content="" />
<link href="/css/base.css" rel="stylesheet">
<link href="/css/index.css" rel="stylesheet" >
<script src="/js/pages/index/index.js" type="module"></script>
<body>
<nav class="nav">
<ul class="nav__links">
<li class="nav__link"><a href="/">Alle Einkaufslisten</a></li>
<li class="nav__dropdown">Listen &gt;
<ul class="nav__dropdownMenu">
<li th:each="list : ${lists}" th:data-id="${list.id}" class="navbar__list">
<a th:text="${list.listName}" th:href="@{/list/{id}(id=${list.id})}"></a>
</li>
</ul>
</li>
</ul>
</nav>
<div class="index">
<form class="addListForm">
<input type="text" name="listName" required />
<button type="submit">Neue Liste erstellen</button>
</form>
<ul class="displayedList">
<li th:each="list : ${lists}" class="list" th:data-id="${list.id}">
<a class="list__name" th:text="${list.listName}" th:href="@{/list/{id}(id=${list.id})}"></a>
<button type="button" class="list__editButton">Liste bearbeiten</button>
<button type="button" class="list__deleteButton">Liste löschen</button>
</li>
</ul>
</div>
</body>
-72
View File
@@ -1,72 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Einkaufsliste</title>
<link href="/css/base.css" rel="stylesheet">
<link href="/css/list.css" rel="stylesheet">
<script src="/js/pages/list/list.js" type="module"></script>
</head>
<body>
<nav class="nav">
<ul class="nav__links">
<li class="nav__link"><a href="/">Alle Einkaufslisten</a></li>
<li class="nav__dropdown">Listen &gt;
<ul class="nav__dropdownMenu">
<li th:each="list : ${lists}" th:data-id="${list.id}" class="navbar__list">
<a th:text="${list.listName}" th:href="@{/list/{id}(id=${list.id})}"></a>
</li>
</ul>
</li>
</ul>
</nav>
<div class="title">
<h1 th:text="${list.listName}"></h1>
</div>
<div class="list" th:data-id="${list.id}">
<form class="addCategoryForm">
<span>Neue Kategorie hinzufügen:</span>
<input type="text" class="addCategoryForm__nameInput" name="categoryName" placeholder="Neue Kategorie hinzufügen...">
<button class="addCategoryForm__submitButton" type="submit">Hinzufügen</button>
</form>
<br>
<form class="addItemForm">
<span>Neuen Gegenstand hinzufügen:</span>
<input type="text" class="addItemForm__nameInput" name="itemName" placeholder="Gegenstand eingeben...">
<input type="text" class="addItemForm__amountInput" name="itemAmount" placeholder="Menge eingeben...">
<select class="addItemForm__categorySelect" name="itemCategoryID">
<option value="">Keine</option>
<option th:each="category : ${categories}" th:text="${category.categoryName}" th:value="${category.id}"></option>
</select>
<button class="addItemForm__submitButton" type="submit">Hinzufügen</button>
</form>
<button class="deleteAllDoneItemsButton">Alle fertigen Items löschen</button>
<ul class="displayedList">
<!-- Es werden erste alle Kategorien erstellt, jede Kategorie muss ein ul in einem li sein um Verschachtelung zu ermöglichen -->
<li th:each="category: ${categories}" th:data-id="${category.id}" class="category">
<shopping-category th:attr="category-name=${category.categoryName}">
<ul>
<li th:each="item: ${category.itemsInCategory}" th:data-id="${item.id}" class="item">
<shopping-item th:attr="item-name=${item.itemName}, item-amount=${item.itemAmount}, is-checked=${item.isDone}"></shopping-item>
</li>
</ul>
</shopping-category>
</li>
<li th:each="item: ${items}" th:data-id="${item.id}" class="item"> <!-- erstellung items ohne Kategorie -->
<shopping-item th:attr="item-name=${item.itemName}, item-amount=${item.itemAmount}, is-checked=${item.isDone}"></shopping-item>
</li>
</ul>
</div>
</body>
</html>
@@ -1,13 +0,0 @@
package de.timaldinger.einkaufsliste;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
class EinkaufslisteApplicationTests {
@Test
void contextLoads() {
}
}