From 1598a57a61cbac44c2806d662fec45ef5a0aa0a3 Mon Sep 17 00:00:00 2001 From: Mathis Kral Date: Mon, 13 Nov 2023 20:09:39 +0100 Subject: [PATCH] Include layout.html --- src/main/resources/templates/catalog.html | 118 +++++--------- .../resources/templates/catalog_editor.html | 145 ++++++++---------- src/main/resources/templates/customer.html | 78 +++++----- .../resources/templates/edit-customer.html | 39 +++-- src/main/resources/templates/edit-staff.html | 35 +++-- src/main/resources/templates/event.html | 113 ++++++-------- .../resources/templates/inventory-mutate.html | 73 ++++----- src/main/resources/templates/inventory.html | 77 +++++----- src/main/resources/templates/layout.html | 7 + src/main/resources/templates/login.html | 36 +++-- src/main/resources/templates/navigation.html | 64 +++++--- src/main/resources/templates/orders.html | 132 +++++++--------- .../resources/templates/orders_calender.html | 2 +- src/main/resources/templates/profile.html | 67 ++++---- src/main/resources/templates/register.html | 45 +++--- src/main/resources/templates/staff.html | 88 ++++++----- src/main/resources/templates/welcome.html | 27 ++-- .../WelcomeControllerIntegrationTests.java | 2 +- 18 files changed, 551 insertions(+), 597 deletions(-) diff --git a/src/main/resources/templates/catalog.html b/src/main/resources/templates/catalog.html index b2c4fa0..4fc3f15 100644 --- a/src/main/resources/templates/catalog.html +++ b/src/main/resources/templates/catalog.html @@ -1,90 +1,50 @@ + xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" + layout:decorate="~{layout.html(title='Katalog')}"> - Katalog -
- Home - Katalog - Eventplaner - Aufträge - -
- -
-

Katalog

-
- -
- - - - - - - - - - - - - -
NameMindestzeitraumBasisausstattungPreis ab
- **BILD** - - h - -
    -
  • -
- 		- -
- - -
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
- -
+
+
+ + + + + + + + + + + + + +
NameMindestzeitraumBasisausstattungPreis ab
+ **BILD** + + h + +
    +
  • +
+ 		+ +
+ + +
+
+
+
+
+ +
+
+
- - diff --git a/src/main/resources/templates/catalog_editor.html b/src/main/resources/templates/catalog_editor.html index 821cfda..a210146 100644 --- a/src/main/resources/templates/catalog_editor.html +++ b/src/main/resources/templates/catalog_editor.html @@ -1,84 +1,75 @@ - - Basisevent-Konfiguration - + xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" + layout:decorate="~{layout.html(title='Katalog bearbeiten')}"> + - -

Basisevent konfigurieren

- -
-

Dienstleistung

- -
- - -
- Eventbasispreis: 500€ - -

Mindestzeitraum

-
- - - - -
- -

Basisausstattung

- - - - - - - - -
ProduktnameMengeStückpreis
- - € - -
- - -
-
-
-
-
- - - - - - -
hinzufügen -
-

Momentane Auswahl

- Eventtyp:
- Mindestzeitraum:
- Gesamtpreis: 90 € -
- - - - - -
-
+ diff --git a/src/main/resources/templates/customer.html b/src/main/resources/templates/customer.html index 384ce24..c0eb464 100644 --- a/src/main/resources/templates/customer.html +++ b/src/main/resources/templates/customer.html @@ -1,43 +1,43 @@ - - - - - - + + -
-

Kundenverwaltung

-

Kundenübersicht

- - - - - - - - - - - - - - - -
IDNachnameVornameAufträge
01MusterkochMaxAufträge - Bearbeiten - -
- - -
-
-
+
+
+

Kundenübersicht

+ + + + + + + + + + + + + + + +
IDNachnameVornameAufträge
01MusterkochMaxAufträge + Bearbeiten + +
+ + +
+
+
+
diff --git a/src/main/resources/templates/edit-customer.html b/src/main/resources/templates/edit-customer.html index 41a44c8..0e822b5 100644 --- a/src/main/resources/templates/edit-customer.html +++ b/src/main/resources/templates/edit-customer.html @@ -1,5 +1,8 @@ - + Kunde Bearbeiten @@ -10,24 +13,26 @@ /> -
-

Kunde Bearbeiten

-
- +
+
+

Kunde Bearbeiten

+ + - - + + - - + + - - - Cancel -
+ + + Cancel +
+ diff --git a/src/main/resources/templates/edit-staff.html b/src/main/resources/templates/edit-staff.html index 4fa6085..cf4080e 100644 --- a/src/main/resources/templates/edit-staff.html +++ b/src/main/resources/templates/edit-staff.html @@ -1,5 +1,8 @@ - + Personal Bearbeiten @@ -7,23 +10,25 @@ -
-

Personal Bearbeiten

-
- +
+
+

Personal Bearbeiten

+ + - - + + - - + + - - + + - - - Cancel -
+ + + Cancel +
+ diff --git a/src/main/resources/templates/event.html b/src/main/resources/templates/event.html index 303bf13..c45a869 100644 --- a/src/main/resources/templates/event.html +++ b/src/main/resources/templates/event.html @@ -1,75 +1,56 @@ - - - - Katalog - + xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" + layout:decorate="~{layout.html(title='Event konfigurieren')}"> + -
- Home - Katalog - Eventplaner - Aufträge - -
+
+ -

Eventplaner (planen Sie Ihr Event)

- - - -
- - -
- - - - - - - - - - -
ProduktAnzahl
Sake Nigiri200
- -

Product hinzufügen

- -
-
- - -
- -
- - -
- - -
- -
-
- + + +
-
+ + + + + + + + + +
ProduktAnzahl
Sake Nigiri200
+ +

Product hinzufügen

+ +
+
+ + +
+ +
+ + +
+ + +
+ +
+
+ +
+
+
- - diff --git a/src/main/resources/templates/inventory-mutate.html b/src/main/resources/templates/inventory-mutate.html index 354f801..0d07eba 100644 --- a/src/main/resources/templates/inventory-mutate.html +++ b/src/main/resources/templates/inventory-mutate.html @@ -1,42 +1,43 @@ - + xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" + layout:decorate="~{layout.html(title='Lagerverwaltung')}"> -

Lagerverwaltung

-

- -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - - -
-
- -
- -
+
+

+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + +
+
+ +
+ +
+
diff --git a/src/main/resources/templates/inventory.html b/src/main/resources/templates/inventory.html index 8d78cee..b82dbdc 100644 --- a/src/main/resources/templates/inventory.html +++ b/src/main/resources/templates/inventory.html @@ -1,44 +1,45 @@ - + xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" + layout:decorate="~{layout.html(title='Inventar')}"> -

Lagerverwaltung

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ID ProduktnameMengeEinkaufspreisUVPGesamtwert
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ID ProduktnameMengeEinkaufspreisUVPGesamtwert
+
diff --git a/src/main/resources/templates/layout.html b/src/main/resources/templates/layout.html index ec9a5ff..9cb4fe9 100644 --- a/src/main/resources/templates/layout.html +++ b/src/main/resources/templates/layout.html @@ -5,6 +5,7 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"> + @@ -20,4 +21,10 @@
+ diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index b076068..43841dd 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -1,6 +1,8 @@ - -

Login

+ @@ -38,32 +40,34 @@ -
+
+ -
+
- + - + -
+
-
+
- + - + -
+
-
+
- + -
+
- + -

Haben Sie noch keinen Account? Registrieren Sie sich hier.

+

Haben Sie noch keinen Account? Registrieren Sie sich hier.

+
diff --git a/src/main/resources/templates/navigation.html b/src/main/resources/templates/navigation.html index facd503..225fa98 100644 --- a/src/main/resources/templates/navigation.html +++ b/src/main/resources/templates/navigation.html @@ -6,100 +6,116 @@ diff --git a/src/main/resources/templates/orders.html b/src/main/resources/templates/orders.html index f94afd4..2a6d065 100644 --- a/src/main/resources/templates/orders.html +++ b/src/main/resources/templates/orders.html @@ -1,83 +1,61 @@ - - - - Aufträge - + xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" + layout:decorate="~{layout.html(title='Bestellungen')}"> -
- Home - Katalog - Eventplaner - Aufträge - -
- -
-

Auftragsliste

-
- -
- - - - - - - - - - - - - - - - - - -
VonBisKundeProduktdetailsRechnungBezahltPreis
- - - - - -
- Rechnung -
-
- Keine Rechnung verfügbar -
- 		☒ - - - -
- - -
-
-
- - - - - - +
+
+ + + + + + + + + + + + + + + + + + +
VonBisKundeProduktdetailsRechnungBezahltPreis
+ + + + + +
+ Rechnung +
+
+ Keine Rechnung verfügbar +
+ 		☒ + + + +
+ + +
+
+
+ + + + + +
- - diff --git a/src/main/resources/templates/orders_calender.html b/src/main/resources/templates/orders_calender.html index 72608cf..2cbfb88 100644 --- a/src/main/resources/templates/orders_calender.html +++ b/src/main/resources/templates/orders_calender.html @@ -2,7 +2,7 @@ + layout:decorate="~{layout.html(title='Kalender')}">