mirrors/swt23w23
1
0
Fork 0
mirror of https://github.com/st-tu-dresden-praktikum/swt23w23 synced 2024-07-19 21:04:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Include layout.html

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/main/resources/templates/catalog.html
View file

@ -1,25 +1,14 @@
<!DOCTYPE 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">
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html(title='Katalog')}">
<head>
<meta charset="utf-8">
<link rel="stylesheet" th:href="@{/resources/css/style.css}">
<title th:text="Katalog">Katalog</title>
</head>
<body>
<div class="topnav"> <!-- später für css -->
<a th:href="@{/}" th:text="Home">Home</a>
<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>
<div>
<h1>Katalog</h1>
</div>
<section layout:fragment="content">
<div>
<table style="width: 100%;">
<tr style="text-align: left;">
@ -56,35 +45,6 @@
<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>
</section>
</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>

19
src/main/resources/templates/catalog_editor.html
View file

@ -1,21 +1,11 @@
<!DOCTYPE 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">
<head>
<title>Basisevent-Konfiguration</title>
</head>
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html(title='Katalog bearbeiten')}">
<body>
<nav>
<div class="topnav"> <!-- später für css -->
<a th:href="@{/}" th:text="Home">Home</a>
<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>
</nav>
<h1>Basisevent konfigurieren</h1>
<section layout:fragment="content">
<input type="hidden" name="addCatalog">
<div class="content">
<h2>Dienstleistung</h2>
@ -80,5 +70,6 @@
<button type="submit">Zum Katalog hinzufügen</button>
</form>
</div>
</section>
</body>
</html>

14
src/main/resources/templates/customer.html
View file

@ -1,13 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<link rel="stylesheet" th:href="@{/resources/css/customer/style.css}" />
<title th:text="${title}"></title>
</head>
<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='Kundenverwaltung')}">
<body>
<section layout:fragment="content">
<div class="verwaltung">
<h1>Kundenverwaltung</h1>
<h2>Kundenübersicht</h2>
<table>
<tr>
@ -39,5 +38,6 @@
</tr>
</table>
</div>
</section>
</body>
</html>

7
src/main/resources/templates/edit-customer.html
View file

@ -1,5 +1,8 @@
<!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>
<meta charset="UTF-8" />
<title>Kunde Bearbeiten</title>
@ -10,6 +13,7 @@
/>
</head>
<body>
<section layout:fragment="content">
<div class="edit-customer-form">
<h2>Kunde Bearbeiten</h2>
<form
@ -29,5 +33,6 @@
</form>
<a th:href="@{/customer}" class="button">Cancel</a>
</div>
</section>
</body>
</html>

7
src/main/resources/templates/edit-staff.html
View file

@ -1,5 +1,8 @@
<!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>
<meta charset="UTF-8" />
<title>Personal Bearbeiten</title>
@ -7,6 +10,7 @@
<link rel="stylesheet" th:href="@{/resources/css/staff/edit-style.css}" />
</head>
<body>
<section layout:fragment="content">
<div class="edit-staff-form">
<h2>Personal Bearbeiten</h2>
<form th:action="@{/staff/update}" th:object="${staff}" method="post">
@ -25,5 +29,6 @@
</form>
<a th:href="@{/staff}" class="button">Cancel</a>
</div>
</section>
</body>
</html>

29
src/main/resources/templates/event.html
View file

@ -1,23 +1,11 @@
<!DOCTYPE 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">
<head>
<meta charset="utf-8">
<link rel="stylesheet" th:href="@{/resources/css/style.css}">
<title th:text="Eventplaner">Katalog</title>
</head>
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html(title='Event konfigurieren')}">
<body>
<div class="topnav"> <!-- später für css -->
<a th:href="@{/}" th:text="Home">Home</a>
<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>
<section layout:fragment="content">
<span th:text="'Typ: ' + ${orderType}"/>
<form th:action="@{/event/changeOrderType}" method="post">
@ -63,13 +51,6 @@
<input type="submit" th:value="'Kostenpflichtig bestellen'"/>
</form>
</div>
</section>
</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>

7
src/main/resources/templates/inventory-mutate.html
View file

@ -1,10 +1,10 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
<head>
</head>
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html(title='Lagerverwaltung')}">
<body>
<h1>Lagerverwaltung</h1>
<section layout:fragment="content">
<h2 th:text="${'Produkt ' + (product == null ? 'anlegen' : 'bearbeiten')}"></h2>
<!-- TODO: maybe migrate to th:field (which is a pain) -->
<form method="post">
@ -38,5 +38,6 @@
</div>
<!-- KANN: Bild und Beschreibungstext -->
</form>
</section>
</body>
</html>

7
src/main/resources/templates/inventory.html
View file

@ -1,10 +1,10 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
<head>
</head>
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html(title='Inventar')}">
<body>
<h1>Lagerverwaltung</h1>
<section layout:fragment="content">
<table border>
<thead>
<!-- TODO: i18n? -->
@ -40,5 +40,6 @@
</tr>
</tbody>
</table>
</section>
</body>
</html>

7
src/main/resources/templates/layout.html
View file

@ -5,6 +5,7 @@
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<head>
<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"-->
<!--href="../static/resources/css/style.css" type="text/css"/>-->
@ -20,4 +21,10 @@
<section layout:fragment="content"></section>
</div>
</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>

8
src/main/resources/templates/login.html
View file

@ -1,6 +1,8 @@
<!DOCTYPE html>
<html lang="en">
<h1>Login</h1>
<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='Login')}">
<!-- FIXME no inline styles -->
@ -38,6 +40,7 @@
</style>
<section layout:fragment="content">
<form class="ui form" role="form" th:action="@{/login}" method="post">
<div class="field">
@ -65,5 +68,6 @@
</form>
<p>Haben Sie noch keinen Account? Registrieren Sie sich <a th:href="@{/register}">hier</a>.</p>
</section>
</html>

62
src/main/resources/templates/navigation.html
View file

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

30
src/main/resources/templates/orders.html
View file

@ -1,25 +1,10 @@
<!DOCTYPE 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">
<head>
<meta charset="utf-8">
<link rel="stylesheet" th:href="@{/resources/css/style.css}">
<title th:text="Aufträge">Aufträge</title>
</head>
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html(title='Bestellungen')}">
<body>
<div class="topnav"> <!-- später für css -->
<a th:href="@{/}" th:text="Home">Home</a>
<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>
<div>
<h1>Auftragsliste</h1>
</div>
<section layout:fragment="content">
<div> <!--th:unless"${cart.empty}"-->
<table style="width:100%; text-align:left">
<tr>
@ -66,18 +51,11 @@
</tr>
</table>
</div>
<span>
<th:block th:text="Insgesamt "/>
<th:block th:text="${total}"/>
<th:block th:text=" Aufträge"/>
</span>
</section>
</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>

2
src/main/resources/templates/orders_calender.html
View file

@ -2,7 +2,7 @@
<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=calender_of_orders)}">
layout:decorate="~{layout.html(title='Kalender')}">
<head>
<style>
table {

7
src/main/resources/templates/profile.html
View file

@ -1,11 +1,15 @@
<!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>
<meta charset="utf-8" />
<link rel="stylesheet" th:href="@{/resources/css/profile/style.css}" />
<title th:text="#{profile.title}" />
</head>
<body>
<section layout:fragment="content">
<form th:action="@{/profile}" method="post" >
<h1 th:text="#{profile.title}"></h1>
<h2 class="settings" th:text="#{profile.authentification}"></h2>
@ -36,5 +40,6 @@
</div>
</div>
</form>
</section>
</body>
</html>

9
src/main/resources/templates/register.html
View file

@ -1,7 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<h1>Registrierung</h1>
<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='Registrierung')}">
<section layout:fragment="content">
<form method="post" role="form" class="ui form" id="form" th:action="@{/register}">
<div class="field">
@ -35,6 +38,6 @@
</div>
</form>
</section>
</html>

8
src/main/resources/templates/staff.html
View file

@ -1,13 +1,16 @@
<!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>
<meta charset="utf-8" />
<link rel="stylesheet" th:href="@{/resources/css/staff/style.css}" />
<title th:text="${title}"></title>
</head>
<body>
<section layout:fragment="content">
<div class="verwaltung">
<h1>Personalverwaltung</h1>
<h2>Mitarbeiterdetails</h2>
<table>
<tr>
@ -51,5 +54,6 @@
<button type="submit">Hinzufügen</button>
</form>
</div>
</section>
</body>
</html>

27
src/main/resources/templates/welcome.html
View file

@ -1,22 +1,15 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<link rel="stylesheet" th:href="@{/resources/css/style.css}">
<title th:text="#{welcome.title}">Welcome!</title>
</head>
<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='Wilkommen bei Wurst’s Catering')}">
<body>
<div class="topnav"> <!-- später für css -->
<a th:href="@{/}" th:text="Home">Home</a>
<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 th:text="#{welcome.title}">Welcome!</h1>
<p th:text="#{welcome.text}"></p>
<section layout:fragment="content">
<!--<h1 th:text="#{welcome.title}">Welcome!</h1>-->
<p th:text="'Hier bekommen Sie übrigens nicht nur Wurst.'"></p>
<p th:text="'Test: (äöü)'"
</section>
</body>
<footer style="bottom: 0; position: absolute;">

2
src/test/java/kickstart/welcome/WelcomeControllerIntegrationTests.java
View file

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