From c371cf00df1dc3091cf2afb08321579c12bc148a Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 14:07:41 +0200 Subject: [PATCH] refactor von css und js Dateinamen und location --- .../static/css/{style.css => base.css} | 0 src/main/resources/static/css/index.css | 0 src/main/resources/static/css/list.css | 0 src/main/resources/static/js/list/main.js | 107 ------------------ .../static/js/shared/ShoppingList.js | 11 ++ src/main/resources/templates/index.html | 1 + src/main/resources/templates/list.html | 5 +- 7 files changed, 15 insertions(+), 109 deletions(-) rename src/main/resources/static/css/{style.css => base.css} (100%) create mode 100644 src/main/resources/static/css/index.css create mode 100644 src/main/resources/static/css/list.css delete mode 100644 src/main/resources/static/js/list/main.js create mode 100644 src/main/resources/static/js/shared/ShoppingList.js 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..e69de29 diff --git a/src/main/resources/static/js/list/main.js b/src/main/resources/static/js/list/main.js deleted file mode 100644 index b7e340d..0000000 --- a/src/main/resources/static/js/list/main.js +++ /dev/null @@ -1,107 +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"); - -const currentList = document.querySelector(".list"); - -let listElements = []; // Liste der erstellten Items und Kategorien - -function addNewCategory(categoryName) { - let id = currentList.id; - fetch(`/api/list/${id}/category/`, - { - method: "POST" - , body: JSON.stringify({ "categoryName": categoryName }) - , headers: { "Content-Type": "application/json" } - }).then(r => console.log("Add new category")); - 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/index.html b/src/main/resources/templates/index.html index 90d478c..c8e7ecf 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -6,6 +6,7 @@ xmlns:th="http://www.thymeleaf.org"> + diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index 93c6fda..8d6b0f5 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -4,8 +4,9 @@ Einkaufsliste - - + + +