Include layout.html

This commit is contained in:
Mathis Kral 2023-11-13 20:09:39 +01:00 committed by Simon Bruder
parent 38eda35e6c
commit 97a020b59f
Signed by: simon
GPG key ID: 8D3C82F9F309F8EC
18 changed files with 551 additions and 597 deletions

View file

@ -1,90 +1,50 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" <html xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/extras/spring-security" xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"> xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html(title='Katalog')}">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<link rel="stylesheet" th:href="@{/resources/css/style.css}"> <link rel="stylesheet" th:href="@{/resources/css/style.css}">
<title th:text="Katalog">Katalog</title>
</head> </head>
<body> <body>
<div class="topnav"> <!-- später für css --> <section layout:fragment="content">
<a th:href="@{/}" th:text="Home">Home</a> <div>
<a th:href="@{/catalog}" th:text="Katalog">Katalog</a> <table style="width: 100%;">
<a th:href="@{/event}" th:text="Eventplaner">Eventplaner</a> <tr style="text-align: left;">
<a th:href="@{/orders}" th:text="Aufträge">Aufträge</a> <th></th>
<!--<a href="#account">Mein Konto</a>--> <th>Name</th>
</div> <th>Mindestzeitraum</th>
<th>Basisausstattung</th>
<div> <th>Preis ab</th>
<h1>Katalog</h1> </tr>
</div> <tr th:each="catalogEntry : ${catalogEntries}">
<td>
<div> **BILD**
<table style="width: 100%;"> </td>
<tr style="text-align: left;"> <td th:text="${catalogEntry.getEventType()}">
<th></th> <td th:text="${catalogEntry.getMinimumTimePeriod()}">h
<th>Name</th> <td>
<th>Mindestzeitraum</th> <ul th:each="product : ${catalogEntry.getProducts()}">
<th>Basisausstattung</th> <li th:text="${product}"/>
<th>Preis ab</th> </ul>
</tr> </td>
<tr th:each="catalogEntry : ${catalogEntries}"> <td th:text="${catalogEntry.getTotalCost()}">
<td> <td>
**BILD** <form method="post" th:action="@{/catalog/remove}">
</td> <input type="hidden" name="catalogEntryID" th:value="${catalogEntry.getId()}">
<td th:text="${catalogEntry.getEventType()}"> <button type="submit">Entfernen</button>
<td th:text="${catalogEntry.getMinimumTimePeriod()}">h </form>
<td> </td>
<ul th:each="product : ${catalogEntry.getProducts()}"> </tr>
<li th:text="${product}"/> </table>
</ul> </div>
</td>
<td th:text="${catalogEntry.getTotalCost()}">
<td>
<form method="post" th:action="@{/catalog/remove}">
<input type="hidden" name="catalogEntryID" th:value="${catalogEntry.getId()}">
<button type="submit">Entfernen</button>
</form>
</td>
</tr>
</table>
</div>
<div>
<form th:action="@{/catalog_editor}">
<button type="submit">Hinzufügen</button>
</form>
</div>
<div>
<form th:action="@{/catalog_editor}">
<button type="submit">Hinzufügen</button>
</form>
</div>
<div>
<form th:action="@{/catalog_editor}">
<button type="submit">Hinzufügen</button>
</form>
</div>
<div>
<form th:action="@{/catalog_editor}">
<button type="submit">Hinzufügen</button>
</form>
</div>
<div>
<button type="button">Hinzufügen</button>
</div>
<div>
<form th:action="@{/catalog_editor}">
<button type="submit">Hinzufügen</button>
</form>
</div>
</section>
</body> </body>
<footer style="bottom: 0; position: absolute;">
<p>© Hannes Wurst @ Mampf GmbH</p>
<p>
<a href="mailto:catering@mampf.com">catering@mampf.com</a>
</p>
</footer>
</html> </html>

View file

@ -1,84 +1,75 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" <html xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/extras/spring-security" xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"> xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<head> layout:decorate="~{layout.html(title='Katalog bearbeiten')}">
<title>Basisevent-Konfiguration</title>
</head>
<body> <body>
<nav> <section layout:fragment="content">
<div class="topnav"> <!-- später für css --> <input type="hidden" name="addCatalog">
<a th:href="@{/}" th:text="Home">Home</a> <div class="content">
<a th:href="@{/catalog}" th:text="Katalog">Katalog</a> <h2>Dienstleistung</h2>
<a th:href="@{/event}" th:text="Eventplaner">Eventplaner</a> <label for="events"></label>
<a th:href="@{/orders}" th:text="Aufträge">Aufträge</a> <form th:object="${formCatalogEntry}" method="post" th:action="@{/catalog_editor/chooseEvent}">
<!--<a href="#account">Mein Konto</a>--> <select name="events" id="events">
<option value="event_catering">Eventcatering</option>
<option value="party_service">Partyservice</option>
<option value="mobile_breakfast">Mobile Breakfast</option>
<option value="rent_a_cook">Rent-a-Cook</option>
</select>
<button type="submit">Event auswählen</button>
</form>
Eventbasispreis: 500€
<h2>Mindestzeitraum</h2>
<form th:object="${formCatalogEntry}" method="post" th:action="@{/catalog_editor/add_time}">
<label>Mindestzeitraum:</label>
<input type="hidden" th:field="*{eventType}">
<input th:field="*{minimumTimePeriod}" type="number" min="0" step="1" value="1"/>
<button type="submit">Zum Model hinzufügen</button>
</form>
<h2>Basisausstattung</h2>
<table>
<tr>
<th>Produktname</th>
<th>Menge</th>
<th>Stückpreis</th>
</tr>
<tr th:each="item : ${inventory}">
<td th:text="${item.getName()}">
<td th:text="${item.getAmount()}">
<td th:text="${item.getCost()}">
<td>
<form method="post" th:action="@{/catalog_editor/remove_product}">
<input type="hidden" name="id" th:value="${item.getItemId()}">
<button type="submit">Entfernen</button>
</form>
</td>
</table>
<hr>
<div style="height: 20px;"></div>
<form method="post" th:action="@{/catalog_editor/product_add}">
<label for="name">Produktname</label>
<input type="text" id="name" name="name" required>
<label for="amount">Menge</label>
<input type="number" id="amount" name="amount" min="1" required>
<input type="hidden" name="cost" value="50.0">
<button type="submit">Artikel hinzufügen</button>
</form>hinzufügen
<br>
<h3>Momentane Auswahl</h3>
Eventtyp: <span th:text="${formCatalogEntry.getEventType()}"></span><br>
Mindestzeitraum: <span th:text="${formCatalogEntry.getMinimumTimePeriod()}"></span><br>
<span>Gesamtpreis: 90 €</span>
<form method="post" th:action="@{/catalog_editor/catalog_add}" th:object="${formCatalogEntry}">
<input type="hidden" name="eventType" th:value="${formCatalogEntry.getEventType()}">
<input type="hidden" name="products" th:value="${inventory}">
<input type="hidden" name="minimumTimePeriod" th:value="${formCatalogEntry.getMinimumTimePeriod}">
<input type="hidden" name="totalCost" th:value="${formCatalogEntry.getTotalCost()}">
<button type="submit">Zum Katalog hinzufügen</button>
</form>
</div> </div>
</nav> </section>
<h1>Basisevent konfigurieren</h1>
<input type="hidden" name="addCatalog">
<div class="content">
<h2>Dienstleistung</h2>
<label for="events"></label>
<form th:object="${formCatalogEntry}" method="post" th:action="@{/catalog_editor/chooseEvent}">
<select name="events" id="events">
<option value="event_catering">Eventcatering</option>
<option value="party_service">Partyservice</option>
<option value="mobile_breakfast">Mobile Breakfast</option>
<option value="rent_a_cook">Rent-a-Cook</option>
</select>
<button type="submit">Event auswählen</button>
</form>
Eventbasispreis: 500€
<h2>Mindestzeitraum</h2>
<form th:object="${formCatalogEntry}" method="post" th:action="@{/catalog_editor/add_time}">
<label>Mindestzeitraum:</label>
<input type="hidden" th:field="*{eventType}">
<input th:field="*{minimumTimePeriod}" type="number" min="0" step="1" value="1"/>
<button type="submit">Zum Model hinzufügen</button>
</form>
<h2>Basisausstattung</h2>
<table>
<tr>
<th>Produktname</th>
<th>Menge</th>
<th>Stückpreis</th>
</tr>
<tr th:each="item : ${inventory}">
<td th:text="${item.getName()}">
<td th:text="${item.getAmount()}">
<td th:text="${item.getCost()}">
<td>
<form method="post" th:action="@{/catalog_editor/remove_product}">
<input type="hidden" name="id" th:value="${item.getItemId()}">
<button type="submit">Entfernen</button>
</form>
</td>
</table>
<hr>
<div style="height: 20px;"></div>
<form method="post" th:action="@{/catalog_editor/product_add}">
<label for="name">Produktname</label>
<input type="text" id="name" name="name" required>
<label for="amount">Menge</label>
<input type="number" id="amount" name="amount" min="1" required>
<input type="hidden" name="cost" value="50.0">
<button type="submit">Artikel hinzufügen</button>
</form>hinzufügen
<br>
<h3>Momentane Auswahl</h3>
Eventtyp: <span th:text="${formCatalogEntry.getEventType()}"></span><br>
Mindestzeitraum: <span th:text="${formCatalogEntry.getMinimumTimePeriod()}"></span><br>
<span>Gesamtpreis: 90 €</span>
<form method="post" th:action="@{/catalog_editor/catalog_add}" th:object="${formCatalogEntry}">
<input type="hidden" name="eventType" th:value="${formCatalogEntry.getEventType()}">
<input type="hidden" name="products" th:value="${inventory}">
<input type="hidden" name="minimumTimePeriod" th:value="${formCatalogEntry.getMinimumTimePeriod}">
<input type="hidden" name="totalCost" th:value="${formCatalogEntry.getTotalCost()}">
<button type="submit">Zum Katalog hinzufügen</button>
</form>
</div>
</body> </body>
</html> </html>

View file

@ -1,43 +1,43 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html xmlns:th="http://www.thymeleaf.org"
<head> xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
<meta charset="utf-8" /> xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<link rel="stylesheet" th:href="@{/resources/css/customer/style.css}" /> layout:decorate="~{layout.html(title='Kundenverwaltung')}">
<title th:text="${title}"></title>
</head>
<body> <body>
<div class="verwaltung"> <section layout:fragment="content">
<h1>Kundenverwaltung</h1> <div class="verwaltung">
<h2>Kundenübersicht</h2> <h2>Kundenübersicht</h2>
<table> <table>
<tr> <tr>
<th>ID</th> <th>ID</th>
<th>Nachname</th> <th>Nachname</th>
<th>Vorname</th> <th>Vorname</th>
<th>Aufträge</th> <th>Aufträge</th>
</tr> </tr>
<tr th:each="customer : ${customers}"> <tr th:each="customer : ${customers}">
<td th:text="${customer.id}">01</td> <td th:text="${customer.id}">01</td>
<td th:text="${customer.surname}">Musterkoch</td> <td th:text="${customer.surname}">Musterkoch</td>
<td th:text="${customer.name}">Max</td> <td th:text="${customer.name}">Max</td>
<td><a>Aufträge</a></td> <td><a>Aufträge</a></td>
<td> <td>
<a th:href="@{'/customer/edit/' + ${customer.id}}" class="button" <a th:href="@{'/customer/edit/' + ${customer.id}}" class="button"
>Bearbeiten</a >Bearbeiten</a
> >
</td> </td>
<td> <td>
<form th:action="@{/customer/remove}" method="post"> <form th:action="@{/customer/remove}" method="post">
<input <input
type="hidden" type="hidden"
th:name="customerID" th:name="customerID"
th:value="${customer.id}" th:value="${customer.id}"
/> />
<button type="submit" class="delete-icon">Entfernen</button> <button type="submit" class="delete-icon">Entfernen</button>
</form> </form>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
</section>
</body> </body>
</html> </html>

View file

@ -1,5 +1,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html(title='Kunden bearbeiten')}">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<title>Kunde Bearbeiten</title> <title>Kunde Bearbeiten</title>
@ -10,24 +13,26 @@
/> />
</head> </head>
<body> <body>
<div class="edit-customer-form"> <section layout:fragment="content">
<h2>Kunde Bearbeiten</h2> <div class="edit-customer-form">
<form <h2>Kunde Bearbeiten</h2>
th:action="@{/customer/update}" <form
th:object="${customer}" th:action="@{/customer/update}"
method="post" th:object="${customer}"
> method="post"
<input type="hidden" th:field="*{id}" /> >
<input type="hidden" th:field="*{id}" />
<label for="name">Name:</label> <label for="name">Name:</label>
<input type="text" th:field="*{name}" required /> <input type="text" th:field="*{name}" required />
<label for="surname">Nachname:</label> <label for="surname">Nachname:</label>
<input type="text" th:field="*{surname}" required /> <input type="text" th:field="*{surname}" required />
<button type="submit">Save</button> <button type="submit">Save</button>
</form> </form>
<a th:href="@{/customer}" class="button">Cancel</a> <a th:href="@{/customer}" class="button">Cancel</a>
</div> </div>
</section>
</body> </body>
</html> </html>

View file

@ -1,5 +1,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html(title='Personal bearbeiten')}">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<title>Personal Bearbeiten</title> <title>Personal Bearbeiten</title>
@ -7,23 +10,25 @@
<link rel="stylesheet" th:href="@{/resources/css/staff/edit-style.css}" /> <link rel="stylesheet" th:href="@{/resources/css/staff/edit-style.css}" />
</head> </head>
<body> <body>
<div class="edit-staff-form"> <section layout:fragment="content">
<h2>Personal Bearbeiten</h2> <div class="edit-staff-form">
<form th:action="@{/staff/update}" th:object="${staff}" method="post"> <h2>Personal Bearbeiten</h2>
<input type="hidden" th:field="*{id}" /> <form th:action="@{/staff/update}" th:object="${staff}" method="post">
<input type="hidden" th:field="*{id}" />
<label for="name">Name:</label> <label for="name">Name:</label>
<input type="text" th:field="*{name}" required /> <input type="text" th:field="*{name}" required />
<label for="surname">Nachname:</label> <label for="surname">Nachname:</label>
<input type="text" th:field="*{surname}" required /> <input type="text" th:field="*{surname}" required />
<label for="job">Beruf:</label> <label for="job">Beruf:</label>
<input type="text" th:field="*{job}" required /> <input type="text" th:field="*{job}" required />
<button type="submit">Save</button> <button type="submit">Save</button>
</form> </form>
<a th:href="@{/staff}" class="button">Cancel</a> <a th:href="@{/staff}" class="button">Cancel</a>
</div> </div>
</section>
</body> </body>
</html> </html>

View file

@ -1,75 +1,56 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" <html xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/extras/spring-security" xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"> xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<head> layout:decorate="~{layout.html(title='Event konfigurieren')}">
<meta charset="utf-8">
<link rel="stylesheet" th:href="@{/resources/css/style.css}">
<title th:text="Eventplaner">Katalog</title>
</head>
<body> <body>
<div class="topnav"> <!-- später für css --> <section layout:fragment="content">
<a th:href="@{/}" th:text="Home">Home</a> <span th:text="'Typ: ' + ${orderType}"/>
<a th:href="@{/catalog}" th:text="Katalog">Katalog</a>
<a th:href="@{/event}" th:text="Eventplaner">Eventplaner</a>
<a th:href="@{/orders}" th:text="Aufträge">Aufträge</a>
<!--<a href="#account">Mein Konto</a>-->
</div>
<h1>Eventplaner (planen Sie Ihr Event)</h1> <form th:action="@{/event/changeOrderType}" method="post">
<select name="orderType">
<span th:text="'Typ: ' + ${orderType}"/> <option disabled="disabled" selected value="NULL" th:text="' -- Wählen Sie eine Option -- '"/>
<option th:value="'SE'" th:text="'Something else'"/>
<form th:action="@{/event/changeOrderType}" method="post"> <option th:value="'RaK'" th:text="Rent-a-Cook"/>
<select name="orderType"> <option th:value="'EK'" th:text="Eventcatering"/>
<option disabled="disabled" selected value="NULL" th:text="' -- Wählen Sie eine Option -- '"/> <option th:value="'SN'" th:text="'Sushi Night'"/>
<option th:value="'SE'" th:text="'Something else'"/> </select>
<option th:value="'RaK'" th:text="Rent-a-Cook"/> <input type="submit" value="Eventtypen ändern"/>
<option th:value="'EK'" th:text="Eventcatering"/>
<option th:value="'SN'" th:text="'Sushi Night'"/>
</select>
<input type="submit" value="Eventtypen ändern"/>
</form>
<table style="width:100%; text-align:left">
<tr>
<th>Produkt</th>
<th>Anzahl</th>
</tr>
<tr th:each="key : ${items.keySet()}">
<td th:text="${key}">Sake Nigiri</td>
<td th:text="${items.get(key)}">200</td>
</tr>
</table>
<h4>Product hinzufügen</h4>
<form th:action="@{/event/addProduct}" th:object="${productForm}" method="post">
<div>
<label>Produkt</label>
<input type="text" th:field="*{product}" placeholder="Produktname" required/>
</div>
<div>
<label>Anzahl</label>
<input type="number" th:field="*{number}" placeholder="Anzahl" min="1" required/>
</div>
<input type="submit" value="Submit"/>
</form>
<div>
<form method="post" th:action="@{/event/checkout}">
<input type="submit" th:value="'Kostenpflichtig bestellen'"/>
</form> </form>
</div>
<table style="width:100%; text-align:left">
<tr>
<th>Produkt</th>
<th>Anzahl</th>
</tr>
<tr th:each="key : ${items.keySet()}">
<td th:text="${key}">Sake Nigiri</td>
<td th:text="${items.get(key)}">200</td>
</tr>
</table>
<h4>Product hinzufügen</h4>
<form th:action="@{/event/addProduct}" th:object="${productForm}" method="post">
<div>
<label>Produkt</label>
<input type="text" th:field="*{product}" placeholder="Produktname" required/>
</div>
<div>
<label>Anzahl</label>
<input type="number" th:field="*{number}" placeholder="Anzahl" min="1" required/>
</div>
<input type="submit" value="Submit"/>
</form>
<div>
<form method="post" th:action="@{/event/checkout}">
<input type="submit" th:value="'Kostenpflichtig bestellen'"/>
</form>
</div>
</section>
</body> </body>
<footer style="bottom: 0; position: absolute;">
<p>© Hannes Wurst @ Mampf GmbH</p>
<p>
<a href="mailto:catering@mampf.com">catering@mampf.com</a>
</p>
</footer>
</html> </html>

View file

@ -1,42 +1,43 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" <html xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/extras/spring-security" xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
<head> xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
</head> layout:decorate="~{layout.html(title='Lagerverwaltung')}">
<body> <body>
<h1>Lagerverwaltung</h1> <section layout:fragment="content">
<h2 th:text="${'Produkt ' + (product == null ? 'anlegen' : 'bearbeiten')}"></h2> <h2 th:text="${'Produkt ' + (product == null ? 'anlegen' : 'bearbeiten')}"></h2>
<!-- TODO: maybe migrate to th:field (which is a pain) --> <!-- TODO: maybe migrate to th:field (which is a pain) -->
<form method="post"> <form method="post">
<div> <div>
<label for="type">Typ</label> <label for="type">Typ</label>
<input type="radio" name="type" th:each="type : ${T(catering.catalog.CatalogDummyType).values()}" th:value="${type}" th:text="${type}" th:checked="${type.name() == product?.type?.name()}" required/> <input type="radio" name="type" th:each="type : ${T(catering.catalog.CatalogDummyType).values()}" th:value="${type}" th:text="${type}" th:checked="${type.name() == product?.type?.name()}" required/>
</div> </div>
<div> <div>
<label for="name">Produktname</label> <label for="name">Produktname</label>
<input type="text" name="name" th:value="${product?.name}" required/> <input type="text" name="name" th:value="${product?.name}" required/>
</div> </div>
<div> <div>
<label for="quantity">Menge im Bestand</label> <label for="quantity">Menge im Bestand</label>
<input type="number" name="quantity" th:value="${item?.quantity}" required/> <input type="number" name="quantity" th:value="${item?.quantity}" required/>
</div> </div>
<div> <div>
<label for="wholesalePrice">Einkaufspreis</label> <label for="wholesalePrice">Einkaufspreis</label>
<input type="number" name="wholesalePrice" step="0.01" min="0" th:value="${#numbers.formatDecimal(product?.wholesalePrice?.getNumber()?.doubleValueExact(), 1, 2)}" required/> <input type="number" name="wholesalePrice" step="0.01" min="0" th:value="${#numbers.formatDecimal(product?.wholesalePrice?.getNumber()?.doubleValueExact(), 1, 2)}" required/>
</div> </div>
<div> <div>
<label for="retailPrice">UVP</label> <label for="retailPrice">UVP</label>
<input type="number" name="retailPrice" step="0.01" min="0" th:value="${#numbers.formatDecimal(product?.price?.getNumber()?.doubleValueExact(), 1, 2)}" required/> <input type="number" name="retailPrice" step="0.01" min="0" th:value="${#numbers.formatDecimal(product?.price?.getNumber()?.doubleValueExact(), 1, 2)}" required/>
</div> </div>
<div> <div>
<!-- FIXME darf nur bei angeboten als teil von partyservice angezeigt werden --> <!-- FIXME darf nur bei angeboten als teil von partyservice angezeigt werden -->
<label for="promotionPrice">Aktionspreis</label> <label for="promotionPrice">Aktionspreis</label>
<input type="number" name="promotionPrice" step="0.01" min="0" th:value="${#numbers.formatDecimal(product?.promotionPrice?.getNumber()?.doubleValueExact(), 1, 2)}"/> <input type="number" name="promotionPrice" step="0.01" min="0" th:value="${#numbers.formatDecimal(product?.promotionPrice?.getNumber()?.doubleValueExact(), 1, 2)}"/>
</div> </div>
<div> <div>
<button type="submit" th:text="${product == null ? 'Hinzufügen' : 'Bearbeiten'}"></button> <button type="submit" th:text="${product == null ? 'Hinzufügen' : 'Bearbeiten'}"></button>
</div> </div>
<!-- KANN: Bild und Beschreibungstext --> <!-- KANN: Bild und Beschreibungstext -->
</form> </form>
</section>
</body> </body>
</html> </html>

View file

@ -1,44 +1,45 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" <html xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/extras/spring-security" xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
<head> xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
</head> layout:decorate="~{layout.html(title='Inventar')}">
<body> <body>
<h1>Lagerverwaltung</h1> <section layout:fragment="content">
<table border> <table border>
<thead> <thead>
<!-- TODO: i18n? --> <!-- TODO: i18n? -->
<tr> <tr>
<th>ID</th> <!-- FIXME UUIDs are long --> <th>ID</th> <!-- FIXME UUIDs are long -->
<th>Produktname</th> <th>Produktname</th>
<th>Menge</th> <th>Menge</th>
<th>Einkaufspreis</th> <th>Einkaufspreis</th>
<th>UVP</th> <th>UVP</th>
<th>Gesamtwert</th> <th>Gesamtwert</th>
<th></th> <!-- FIXME: this should be replaced by something more reasonable once CSS comes into play --> <th></th> <!-- FIXME: this should be replaced by something more reasonable once CSS comes into play -->
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr th:each="item : ${inventory}"> <tr th:each="item : ${inventory}">
<td th:text="${item.id}"></td> <td th:text="${item.id}"></td>
<td th:text="${item.product.name}"></td> <td th:text="${item.product.name}"></td>
<td th:text="${item.quantity}"></td> <td th:text="${item.quantity}"></td>
<td th:text="${item.product.wholesalePrice}"></td> <td th:text="${item.product.wholesalePrice}"></td>
<td th:if="${item.product.promotionPrice != null}"><del th:text="${item.product.price}"></del> <span th:text="${item.product.promotionPrice}"></span></td> <td th:if="${item.product.promotionPrice != null}"><del th:text="${item.product.price}"></del> <span th:text="${item.product.promotionPrice}"></span></td>
<td th:if="${item.product.promotionPrice == null}" th:text="${item.product.price}"></td> <td th:if="${item.product.promotionPrice == null}" th:text="${item.product.price}"></td>
<td th:text="${item.product.wholesalePrice.multiply(item.quantity.getAmount())}"></td> <td th:text="${item.product.wholesalePrice.multiply(item.quantity.getAmount())}"></td>
<td><a th:href="@{/inventory/edit/{id}(id=${item.product.id})}"><button></button></a><a th:href="@{/inventory/delete/{id}(id=${item.product.id})}"><button>X</button></a></td> <td><a th:href="@{/inventory/edit/{id}(id=${item.product.id})}"><button></button></a><a th:href="@{/inventory/delete/{id}(id=${item.product.id})}"><button>X</button></a></td>
</tr> </tr>
<tr> <tr>
<td><a href="/inventory/add"><button></button></a></td> <td><a href="/inventory/add"><button></button></a></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td><!-- TODO (optional): add total monetary value of inventory --> <td></td><!-- TODO (optional): add total monetary value of inventory -->
<td></td> <td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</section>
</body> </body>
</html> </html>

View file

@ -5,6 +5,7 @@
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"> xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/> <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" th:href="@{/resources/css/style.css}">
<!--<link th:href="@{/resources/css/style.css}" rel="stylesheet"--> <!--<link th:href="@{/resources/css/style.css}" rel="stylesheet"-->
<!--href="../static/resources/css/style.css" type="text/css"/>--> <!--href="../static/resources/css/style.css" type="text/css"/>-->
@ -20,4 +21,10 @@
<section layout:fragment="content"></section> <section layout:fragment="content"></section>
</div> </div>
</body> </body>
<footer style="bottom: 0; position: absolute;">
<p>© Hannes Wurst @ Mampf GmbH</p>
<p>
<a href="mailto:catering@mampf.com">catering@mampf.com</a>
</p>
</footer>
</html> </html>

View file

@ -1,6 +1,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html xmlns:th="http://www.thymeleaf.org"
<h1>Login</h1> xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html(title='Login')}">
<!-- FIXME no inline styles --> <!-- FIXME no inline styles -->
@ -38,32 +40,34 @@
</style> </style>
<form class="ui form" role="form" th:action="@{/login}" method="post"> <section layout:fragment="content">
<form class="ui form" role="form" th:action="@{/login}" method="post">
<div class="field"> <div class="field">
<label for="username">Nutzername</label> <label for="username">Nutzername</label>
<input class="form-control" type="text" id="username" name="username" autofocus="autofocus" placeholder="Username"> <input class="form-control" type="text" id="username" name="username" autofocus="autofocus" placeholder="Username">
</div> </div>
<div class="field"> <div class="field">
<label for="password">Passwort</label> <label for="password">Passwort</label>
<input type="password" id="password" name="password" placeholder="Password"> <input type="password" id="password" name="password" placeholder="Password">
</div> </div>
<div> <div>
<button type="submit" class="ui button">Login</button> <button type="submit" class="ui button">Login</button>
</div> </div>
</form> </form>
<p>Haben Sie noch keinen Account? Registrieren Sie sich <a th:href="@{/register}">hier</a>.</p> <p>Haben Sie noch keinen Account? Registrieren Sie sich <a th:href="@{/register}">hier</a>.</p>
</section>
</html> </html>

View file

@ -6,100 +6,116 @@
<body> <body>
<nav th:fragment="navigation"> <nav th:fragment="navigation">
<div class="ui menu"> <div class="ui menu">
<a
class="item"
href="welcome.html"
th:href="@{/}"
th:text="Startseite"
>
Startseite
</a>
<!--prototype-paul-simon--> <!--prototype-paul-simon-->
<!--sec:authorize="hasRole('CUSTOMER')"-->
<a <a
class="item" class="item"
href="register.html" href="register.html"
th:href="@{/register}" th:href="@{/register}"
sec:authorize="hasRole('CUSTOMER')" th:text="Registrierung"
th:text="#{nav.register}"
> >
Registrierung Registrierung
</a> </a>
<!--sec:authorize="hasAnyRole('BOSS','CUSTOMER')"-->
<a <a
class="item" class="item"
href="login.html" href="login.html"
th:href="@{/login}" th:href="@{/login}"
sec:authorize="hasAnyRole('BOSS','CUSTOMER')" th:text="Login"
th:text="#{nav.login}"
> >
Login Login
</a> </a>
<!--sec:authorize="hasRole('BOSS')"-->
<a <a
class="item" class="item"
href="inventory.html" href="inventory.html"
th:href="@{/inventory}" th:href="@{/inventory}"
sec:authorize="hasRole('BOSS')" th:text="Inventar"
th:text="#{nav.inventory}"
> >
Inventar Inventar
</a> </a>
<!--prototype-eren-denis-->
<a <a
class="item" class="item"
href="employee.html" href="catalog.html"
th:href="@{/employee}" th:href="@{/catalog}"
sec:authorize="hasRole('BOSS')" th:text="Katalog"
th:text="#{nav.employee}" >
Katalog
</a>
<!--prototype-eren-denis-->
<!--sec:authorize="hasRole('BOSS')"-->
<a
class="item"
href="staff.html"
th:href="@{/staff}"
th:text="Angestellte"
> >
Angestellte Angestellte
</a> </a>
<!--sec:authorize="hasRole('BOSS')"-->
<a <a
class="item" class="item"
href="customer.html" href="customer.html"
th:href="@{/customer}" th:href="@{/customer}"
sec:authorize="hasRole('BOSS')" th:text="Kunden"
th:text="#{nav.customer}"
> >
Kunden Kunden
</a> </a>
<!--sec:authorize="hasAnyRole('BOSS','CUSTOMER')"-->
<a <a
class="item" class="item"
href="profile.html" href="profile.html"
th:href="@{/profile}" th:href="@{/profile}"
sec:authorize="hasAnyRole('BOSS','CUSTOMER')" th:text="Profil"
th:text="#{nav.profile}"
> >
Registrierung Registrierung
</a> </a>
<!--prototype-eric-mathis--> <!--prototype-eric-mathis-->
<!--sec:authorize="hasAnyRole('BOSS','CUSTOMER')"-->
<a <a
class="item" class="item"
href="orders.html" href="orders.html"
th:href="@{/orders}" th:href="@{/orders}"
sec:authorize="hasAnyRole('BOSS','CUSTOMER')" th:text="Bestellungen"
th:text="#{nav.orders}"
> >
Bestellungen Bestellungen
</a> </a>
<!--sec:authorize="hasAnyRole('BOSS','CUSTOMER')"-->
<a <a
class="item" class="item"
href="event.html" href="event.html"
th:href="@{/event}" th:href="@{/event}"
sec:authorize="hasAnyRole('BOSS','CUSTOMER')" th:text="'Event planen'"
th:text="#{nav.event}"
> >
Events Events
</a> </a>
<!--prototpye-theo--> <!--prototpye-theo-->
<!--sec:authorize="hasRole('BOSS')"-->
<a <a
class="item" class="item"
href="orders.calender.html" href="orders.calender.html"
th:href="@{/orders/calender}" th:href="@{/orders/calender}"
sec:authorize="hasRole('BOSS')" th:text="Kalender"
th:text="#{nav.orders.calender}"
> >
Kalender der Bestellungen Kalender der Bestellungen
</a> </a>
@ -111,7 +127,7 @@
</form> </form>
</div> </div>
</div> </div>
<br/> <br/>
</nav> </nav>
</body> </body>
</html> </html>

View file

@ -1,83 +1,61 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" <html xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/extras/spring-security" xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"> xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<head> layout:decorate="~{layout.html(title='Bestellungen')}">
<meta charset="utf-8">
<link rel="stylesheet" th:href="@{/resources/css/style.css}">
<title th:text="Aufträge">Aufträge</title>
</head>
<body> <body>
<div class="topnav"> <!-- später für css --> <section layout:fragment="content">
<a th:href="@{/}" th:text="Home">Home</a> <div> <!--th:unless"${cart.empty}"-->
<a th:href="@{/catalog}" th:text="Katalog">Katalog</a> <table style="width:100%; text-align:left">
<a th:href="@{/event}" th:text="Eventplaner">Eventplaner</a> <tr>
<a th:href="@{/orders}" th:text="Aufträge">Aufträge</a> <th style="width:10%">Von</th>
<!--<a href="#account">Mein Konto</a>--> <th style="width:10%">Bis</th>
</div> <th style="width:15%">Kunde</th>
<th style="width:30%">Produktdetails</th>
<div> <th style="width:10%">Rechnung</th>
<h1>Auftragsliste</h1> <th>Bezahlt</th>
</div> <th>Preis</th>
<th></th>
<div> <!--th:unless"${cart.empty}"--> </tr>
<table style="width:100%; text-align:left"> <tr th:each="order : ${orders}">
<tr> <td th:text="${order.getFormattedStart()}">
<th style="width:10%">Von</th> <td th:text="${order.getFormattedFinish()}">
<th style="width:10%">Bis</th> <td th:text="BeispielKunde"/>
<th style="width:15%">Kunde</th> <td>
<th style="width:30%">Produktdetails</th> <div>
<th style="width:10%">Rechnung</th> <a href="#productDetails" th:text="${order.getOrderType()}"/>
<th>Bezahlt</th> <ul th:each="product : ${order.getFormattedProducts()}">
<th>Preis</th> <li th:text="${product}"/>
<th></th> </ul>
</tr> </div>
<tr th:each="order : ${orders}"> </td>
<td th:text="${order.getFormattedStart()}"> <td>
<td th:text="${order.getFormattedFinish()}"> <div th:if="${order.invoiceAvailable()}">
<td th:text="BeispielKunde"/> <a href="#invoice">Rechnung</a>
<td> </div>
<div> <div th:unless="${order.invoiceAvailable()}">
<a href="#productDetails" th:text="${order.getOrderType()}"/> <span>Keine Rechnung verfügbar</span>
<ul th:each="product : ${order.getFormattedProducts()}"> </div>
<li th:text="${product}"/> </td>
</ul> <td>&#9746</td> <!--von Admin bearbeitbar-->
</div> <td>
</td> <th:block th:text="${order.getTotalCost()}"/>
<td> <th:block th:text="€"/>
<div th:if="${order.invoiceAvailable()}"> </td>
<a href="#invoice">Rechnung</a> <td>
</div> <form method="post" th:action="@{/orders/remove}">
<div th:unless="${order.invoiceAvailable()}"> <input type="hidden" name="orderID" value="0" th:value="${order.getId()}"/>
<span>Keine Rechnung verfügbar</span> <input type="submit" value="remove" th:value="Entfernen"/>
</div> </form>
</td> </td>
<td>&#9746</td> <!--von Admin bearbeitbar--> </tr>
<td> </table>
<th:block th:text="${order.getTotalCost()}"/> </div>
<th:block th:text="€"/> <span>
</td> <th:block th:text="Insgesamt "/>
<td> <th:block th:text="${total}"/>
<form method="post" th:action="@{/orders/remove}"> <th:block th:text=" Aufträge"/>
<input type="hidden" name="orderID" value="0" th:value="${order.getId()}"/> </span>
<input type="submit" value="remove" th:value="Entfernen"/> </section>
</form>
</td>
</tr>
</table>
</div>
<span>
<th:block th:text="Insgesamt "/>
<th:block th:text="${total}"/>
<th:block th:text=" Aufträge"/>
</span>
</body> </body>
<footer style="bottom: 0; position: absolute;">
<p>© Hannes Wurst @ Mampf GmbH</p>
<p>
<a href="mailto:catering@mampf.com">catering@mampf.com</a>
</p>
</footer>
</html> </html>

View file

@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org" <html xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/extras/spring-security" xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html(title=calender_of_orders)}"> layout:decorate="~{layout.html(title='Kalender')}">
<head> <head>
<style> <style>
table { table {

View file

@ -1,40 +1,45 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html(title='Profil')}">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="stylesheet" th:href="@{/resources/css/profile/style.css}" /> <link rel="stylesheet" th:href="@{/resources/css/profile/style.css}" />
<title th:text="#{profile.title}" /> <title th:text="#{profile.title}" />
</head> </head>
<body> <body>
<form th:action="@{/profile}" method="post" > <section layout:fragment="content">
<h1 th:text="#{profile.title}"></h1> <form th:action="@{/profile}" method="post" >
<h2 class="settings" th:text="#{profile.authentification}"></h2> <h1 th:text="#{profile.title}"></h1>
<table> <h2 class="settings" th:text="#{profile.authentification}"></h2>
<tr> <table>
<td th:text="#{profile.username}"></td> <tr>
<td><input name="username" th:value="${user.username}" type="text"/></td> <td th:text="#{profile.username}"></td>
</tr> <td><input name="username" th:value="${user.username}" type="text"/></td>
<tr> </tr>
<td th:text="#{profile.password}"></td> <tr>
<td><input name="password" type="password"/></td> <td th:text="#{profile.password}"></td>
</tr> <td><input name="password" type="password"/></td>
</table> </tr>
<h2 class="settings" th:text="#{profile.userinformation}"></h2> </table>
<table> <h2 class="settings" th:text="#{profile.userinformation}"></h2>
<tr> <table>
<td th:text="#{profile.address}"></td> <tr>
<td><input name="address" th:value="${user.address}" type="text"/></td> <td th:text="#{profile.address}"></td>
</tr> <td><input name="address" th:value="${user.address}" type="text"/></td>
</table> </tr>
<div class="danger_zone"> </table>
<h1 class="danger_zone" th:text="#{profile.danger_zone}"></h1> <div class="danger_zone">
<div class="horizontal_center"> <h1 class="danger_zone" th:text="#{profile.danger_zone}"></h1>
<button class="danger_zone" th:text="#{profile.edit}" type="submit"></button> <div class="horizontal_center">
<a th:href="@{/profile/delete}"> <button class="danger_zone" th:text="#{profile.edit}" type="submit"></button>
<button class="danger_zone" th:text="#{profile.delete}" type="button"></button> <a th:href="@{/profile/delete}">
</a> <button class="danger_zone" th:text="#{profile.delete}" type="button"></button>
</div> </a>
</div> </div>
</form> </div>
</form>
</section>
</body> </body>
</html> </html>

View file

@ -1,40 +1,43 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html xmlns:th="http://www.thymeleaf.org"
<h1>Registrierung</h1> xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html(title='Registrierung')}">
<form method="post" role="form" class="ui form" id="form" th:action="@{/register}"> <section layout:fragment="content">
<form method="post" role="form" class="ui form" id="form" th:action="@{/register}">
<div class="field"> <div class="field">
<label for="username">Nutzername</label> <label for="username">Nutzername</label>
<input id="username" name="username" type="text" required="required"> <input id="username" name="username" type="text" required="required">
</div> </div>
<div class="field"> <div class="field">
<label for="password">Passwort</label> <label for="password">Passwort</label>
<input id="password" name="password" type="password" <input id="password" name="password" type="password"
required="required"> required="required">
</div> </div>
<div class="field"> <div class="field">
<label for="address">Adresse</label> <label for="address">Adresse</label>
<input id="address" name="address" type="text"><!-- FIXME: Address should be required!--> <input id="address" name="address" type="text"><!-- FIXME: Address should be required!-->
</div> </div>
<div> <div>
<button type="submit" class="ui button">Registrieren</button> <button type="submit" class="ui button">Registrieren</button>
</div> </div>
</form>
</form>
</section>
</html> </html>

View file

@ -1,55 +1,59 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html(title='Angestellte')}">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="stylesheet" th:href="@{/resources/css/staff/style.css}" /> <link rel="stylesheet" th:href="@{/resources/css/staff/style.css}" />
<title th:text="${title}"></title> <title th:text="${title}"></title>
</head> </head>
<body> <body>
<div class="verwaltung"> <section layout:fragment="content">
<h1>Personalverwaltung</h1> <div class="verwaltung">
<h2>Mitarbeiterdetails</h2> <h2>Mitarbeiterdetails</h2>
<table> <table>
<tr> <tr>
<th>ID</th> <th>ID</th>
<th>Nachname</th> <th>Nachname</th>
<th>Vorname</th> <th>Vorname</th>
<th>Beruf</th> <th>Beruf</th>
</tr> </tr>
<tr th:each="staff : ${staffs}"> <tr th:each="staff : ${staffs}">
<td th:text="${staff.id}">01</td> <td th:text="${staff.id}">01</td>
<td th:text="${staff.surname}">Musterkoch</td> <td th:text="${staff.surname}">Musterkoch</td>
<td th:text="${staff.name}">Max</td> <td th:text="${staff.name}">Max</td>
<td th:text="${staff.job}">Koch</td> <td th:text="${staff.job}">Koch</td>
<td> <td>
<a th:href="@{'/staff/edit/' + ${staff.id}}" class="button" <a th:href="@{'/staff/edit/' + ${staff.id}}" class="button"
>Bearbeiten</a >Bearbeiten</a
> >
</td> </td>
<td> <td>
<form th:action="@{/staff/remove}" method="post"> <form th:action="@{/staff/remove}" method="post">
<input type="hidden" th:name="staffID" th:value="${staff.id}" /> <input type="hidden" th:name="staffID" th:value="${staff.id}" />
<button type="submit" class="delete-icon">Entfernen</button> <button type="submit" class="delete-icon">Entfernen</button>
</form> </form>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="add-staff-form"> <div class="add-staff-form">
<h2>Personal Hinzufügen</h2> <h2>Personal Hinzufügen</h2>
<form action="/staff/add" method="post"> <form action="/staff/add" method="post">
<label for="name">Name:</label> <label for="name">Name:</label>
<input type="text" id="name" name="name" required /> <input type="text" id="name" name="name" required />
<label for="surname">Nachname:</label> <label for="surname">Nachname:</label>
<input type="text" id="surname" name="surname" required /> <input type="text" id="surname" name="surname" required />
<label for="job">Beruf:</label> <label for="job">Beruf:</label>
<input type="text" id="job" name="job" required /> <input type="text" id="job" name="job" required />
<button type="submit">Hinzufügen</button> <button type="submit">Hinzufügen</button>
</form> </form>
</div> </div>
</section>
</body> </body>
</html> </html>

View file

@ -1,22 +1,15 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html xmlns:th="http://www.thymeleaf.org"
<head> xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
<meta charset="utf-8"> xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<link rel="stylesheet" th:href="@{/resources/css/style.css}"> layout:decorate="~{layout.html(title='Wilkommen bei Wursts Catering')}">
<title th:text="#{welcome.title}">Welcome!</title>
</head>
<body> <body>
<section layout:fragment="content">
<div class="topnav"> <!-- später für css --> <!--<h1 th:text="#{welcome.title}">Welcome!</h1>-->
<a th:href="@{/}" th:text="Home">Home</a> <p th:text="'Hier bekommen Sie übrigens nicht nur Wurst.'"></p>
<a th:href="@{/catalog}" th:text="Katalog">Katalog</a> <p th:text="'Test: (äöü)'"
<a th:href="@{/event}" th:text="Eventplaner">Eventplaner</a> </section>
<a th:href="@{/orders}" th:text="Aufträge">Aufträge</a>
<!--<a href="#account">Mein Konto</a>-->
</div>
<h1 th:text="#{welcome.title}">Welcome!</h1>
<p th:text="#{welcome.text}"></p>
</body> </body>
<footer style="bottom: 0; position: absolute;"> <footer style="bottom: 0; position: absolute;">

View file

@ -35,6 +35,6 @@ class WelcomeControllerIntegrationTests {
void showsWelcomeMessage() throws Exception { void showsWelcomeMessage() throws Exception {
mvc.perform(get("/")) // mvc.perform(get("/")) //
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(content().string(containsString("Welcome back!"))); .andExpect(content().string(containsString("Wilkommen bei Wursts Catering")));
} }
} }