diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java index c901d90..17c99b4 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java @@ -10,6 +10,7 @@ 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 @@ -40,6 +41,8 @@ public class PageController { @GetMapping("/list/{id}") public String list(Model model, @PathVariable UUID id){ ShoppingList list = shoppingListRepository.findById(id).orElseThrow(); + List lists = shoppingListRepository.findAll(); + model.addAttribute("lists", lists); model.addAttribute("list", list); model.addAttribute("categories", shoppingCategoryRepository.findByList(list)); model.addAttribute("items", shoppingItemRepository.findByList_IdAndCategoryIsNull(id)); diff --git a/src/main/resources/static/css/base.css b/src/main/resources/static/css/base.css index 66e9c74..131255f 100644 --- a/src/main/resources/static/css/base.css +++ b/src/main/resources/static/css/base.css @@ -1,12 +1,28 @@ -li.displayedList__item--checked{ - text-decoration: line-through; + +.nav__dropdown { + position: relative; } -.category__name--big{ - font-weight: bold; +.nav__dropdownMenu { + display: none; + position: absolute; + top: 100%; + left: 0; } +.nav__dropdown:hover .nav__dropdownMenu, +.nav__dropdown.is-open .nav__dropdownMenu{ + display: block; +} -.category__name--big{ - font-size: 2rem; +.nav > ul { + display: flex; + gap: 1rem; + list-style: none; + margin: 1; + padding: 1; +} + +.nav__dropdownMenu { + background-color: grey; } diff --git a/src/main/resources/static/js/models/ShoppingList.js b/src/main/resources/static/js/models/ShoppingList.js index 2a1d0b5..3974cae 100644 --- a/src/main/resources/static/js/models/ShoppingList.js +++ b/src/main/resources/static/js/models/ShoppingList.js @@ -21,7 +21,7 @@ export class ShoppingList { const deleteButton = document.createElement("button"); li.classList.add("list"); - li.id = this.listID; + li.dataset.id = this.listID; a.setAttribute("href", `/list/${this.listID}`); a.classList.add("list__name"); @@ -37,4 +37,19 @@ export class ShoppingList { 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; + } } diff --git a/src/main/resources/static/js/pages/index/frontend/indexUI.js b/src/main/resources/static/js/pages/index/frontend/indexUI.js index 4728daf..4322465 100644 --- a/src/main/resources/static/js/pages/index/frontend/indexUI.js +++ b/src/main/resources/static/js/pages/index/frontend/indexUI.js @@ -3,11 +3,16 @@ 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(); } @@ -35,6 +40,9 @@ 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); diff --git a/src/main/resources/static/js/pages/index/index.js b/src/main/resources/static/js/pages/index/index.js index d21deac..7814242 100644 --- a/src/main/resources/static/js/pages/index/index.js +++ b/src/main/resources/static/js/pages/index/index.js @@ -12,9 +12,8 @@ async function addList(listName) { function editList(listLi) { //erstellen das Forms - //wir nutzen für das Element nur das div, weil sonst alle items mitgelöscht werden würden const formElement = ui.createEditListForm(listLi); - let id = listLi.id; + let id = listLi.dataset.id; listLi.replaceWith(formElement); @@ -43,7 +42,7 @@ function editList(listLi) { async function deleteList(listElement) { - const response = await api.deleteList(listElement.id); + const response = await api.deleteList(listElement.dataset.id); if (response.status == 204) ui.deleteList(listElement); } diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 5948bda..ea487ca 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -11,6 +11,20 @@ xmlns:th="http://www.thymeleaf.org"> + + +
@@ -18,7 +32,7 @@ xmlns:th="http://www.thymeleaf.org">