From 4d899f444639b181f74b596ab570d96dee3ee9d2 Mon Sep 17 00:00:00 2001 From: CodeSteak Date: Sun, 9 Feb 2020 15:00:07 +0100 Subject: [PATCH] fix project setup for enabling production builds --- prototype/.gitignore | 6 + prototype/build.gradle | 6 +- .../hso/ecommerce/app/RequestController.java | 76 +++++------ .../main/resources/application-dev.properties | 13 ++ .../src/main/resources/application.properties | 8 +- prototype/src/main/resources/application.yml | 10 -- .../src/main/resources/templates/about.html | 4 +- .../intern/accounting/addManual.html | 6 +- .../templates/intern/accounting/index.html | 6 +- .../templates/intern/accounting/main.html | 6 +- .../templates/intern/accounting/vat.html | 6 +- .../templates/intern/articles/index.html | 6 +- .../templates/intern/customerOrders/id.html | 6 +- .../intern/customerOrders/index.html | 6 +- .../templates/intern/customers/id.html | 6 +- .../templates/intern/customers/index.html | 6 +- .../resources/templates/intern/index.html | 6 +- .../templates/intern/listedArticles/id.html | 6 +- .../intern/listedArticles/index.html | 6 +- .../intern/supplierOrders/index.html | 6 +- .../templates/intern/suppliers/id.html | 6 +- .../templates/intern/suppliers/index.html | 6 +- .../templates/intern/warehouse/addManual.html | 6 +- .../warehouse/error_progress_failed.html | 2 +- .../intern/warehouse/id_progress.html | 2 +- .../templates/intern/warehouse/index.html | 6 +- .../intern/warehouse/slots/index.html | 6 +- .../templates/intern/warehouse/todo.html | 6 +- .../src/main/resources/templates/login.html | 4 +- .../src/main/resources/templates/privacy.html | 4 +- .../main/resources/templates/register.html | 4 +- .../resources/templates/shop/articles/id.html | 6 +- .../resources/templates/shop/checkout.html | 4 +- .../templates/shop/checkoutFinish.html | 4 +- .../main/resources/templates/shop/index.html | 4 +- .../main/resources/templates/shop/search.html | 6 +- .../src/main/resources/templates/terms.html | 4 +- .../resources/templates/user/bonuspoints.html | 6 +- .../templates/user/notifications/index.html | 6 +- .../templates/user/orders/index.html | 6 +- .../resources/templates/user/settings.html | 6 +- .../main/resources/templatesOld/about.html | 21 --- .../resources/templatesOld/articleDetail.html | 45 ------- .../customer/accountSettings.html | 78 ----------- .../templatesOld/customer/bonusProgram.html | 15 --- .../templatesOld/customer/orderHistory.html | 58 -------- .../src/main/resources/templatesOld/home.html | 82 ------------ .../templatesOld/intern/accounting.html | 95 ------------- .../templatesOld/intern/accountingmain.html | 90 ------------- .../templatesOld/intern/accountingmanual.html | 76 ----------- .../templatesOld/intern/accountingvat.html | 65 --------- .../templatesOld/intern/addarticle.html | 96 -------------- .../templatesOld/intern/articles.html | 104 --------------- .../intern/customers_allOrders_overview.html | 48 ------- .../customers_detailview_bookings_orders.html | 74 ----------- .../intern/customers_order_detailview.html | 69 ---------- .../intern/customers_overview.html | 101 -------------- .../templatesOld/intern/listedArticles.html | 119 ----------------- .../intern/listedArticlesEdit.html | 125 ------------------ .../intern/suppliers_allOrders_overview.html | 56 -------- .../suppliers_detailview_bookings_orders.html | 79 ----------- .../intern/suppliers_order_detailview.html | 59 --------- .../intern/suppliers_overview.html | 44 ------ .../main/resources/templatesOld/login.html | 55 -------- .../resources/templatesOld/notification.html | 29 ---- .../main/resources/templatesOld/privacy.html | 21 --- .../main/resources/templatesOld/register.html | 60 --------- .../resources/templatesOld/searchResults.html | 73 ---------- .../resources/templatesOld/shoppingCart.html | 111 ---------------- .../main/resources/templatesOld/terms.html | 21 --- 70 files changed, 158 insertions(+), 2116 deletions(-) create mode 100644 prototype/src/main/resources/application-dev.properties delete mode 100644 prototype/src/main/resources/application.yml delete mode 100644 prototype/src/main/resources/templatesOld/about.html delete mode 100644 prototype/src/main/resources/templatesOld/articleDetail.html delete mode 100644 prototype/src/main/resources/templatesOld/customer/accountSettings.html delete mode 100644 prototype/src/main/resources/templatesOld/customer/bonusProgram.html delete mode 100644 prototype/src/main/resources/templatesOld/customer/orderHistory.html delete mode 100644 prototype/src/main/resources/templatesOld/home.html delete mode 100644 prototype/src/main/resources/templatesOld/intern/accounting.html delete mode 100644 prototype/src/main/resources/templatesOld/intern/accountingmain.html delete mode 100644 prototype/src/main/resources/templatesOld/intern/accountingmanual.html delete mode 100644 prototype/src/main/resources/templatesOld/intern/accountingvat.html delete mode 100644 prototype/src/main/resources/templatesOld/intern/addarticle.html delete mode 100644 prototype/src/main/resources/templatesOld/intern/articles.html delete mode 100644 prototype/src/main/resources/templatesOld/intern/customers_allOrders_overview.html delete mode 100644 prototype/src/main/resources/templatesOld/intern/customers_detailview_bookings_orders.html delete mode 100644 prototype/src/main/resources/templatesOld/intern/customers_order_detailview.html delete mode 100644 prototype/src/main/resources/templatesOld/intern/customers_overview.html delete mode 100644 prototype/src/main/resources/templatesOld/intern/listedArticles.html delete mode 100644 prototype/src/main/resources/templatesOld/intern/listedArticlesEdit.html delete mode 100644 prototype/src/main/resources/templatesOld/intern/suppliers_allOrders_overview.html delete mode 100644 prototype/src/main/resources/templatesOld/intern/suppliers_detailview_bookings_orders.html delete mode 100644 prototype/src/main/resources/templatesOld/intern/suppliers_order_detailview.html delete mode 100644 prototype/src/main/resources/templatesOld/intern/suppliers_overview.html delete mode 100644 prototype/src/main/resources/templatesOld/login.html delete mode 100644 prototype/src/main/resources/templatesOld/notification.html delete mode 100644 prototype/src/main/resources/templatesOld/privacy.html delete mode 100644 prototype/src/main/resources/templatesOld/register.html delete mode 100644 prototype/src/main/resources/templatesOld/searchResults.html delete mode 100644 prototype/src/main/resources/templatesOld/shoppingCart.html delete mode 100644 prototype/src/main/resources/templatesOld/terms.html diff --git a/prototype/.gitignore b/prototype/.gitignore index a08614f..59529a7 100644 --- a/prototype/.gitignore +++ b/prototype/.gitignore @@ -1 +1,7 @@ ./test.db +./build +./gradle +./out +./e-commerce.iml +./e-commerce.ipr +./e-commerce.iws diff --git a/prototype/build.gradle b/prototype/build.gradle index 7378260..d035df8 100644 --- a/prototype/build.gradle +++ b/prototype/build.gradle @@ -29,4 +29,8 @@ dependencies { } group 'org.hso' -version '0.1.0' \ No newline at end of file +version '0.1.0' + +bootRun { + args = ["--spring.profiles.active=dev"] +} diff --git a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java index 961ebba..7eab0c6 100644 --- a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java +++ b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java @@ -27,7 +27,7 @@ public class RequestController { @GetMapping("/login") public String login() { - return "/login"; + return "login"; } @PostMapping("/login") @@ -44,36 +44,36 @@ public class RequestController { @GetMapping("/register") public String register() { - return "/register"; + return "register"; } @GetMapping("/shop/") public String shop() { - return "/shop/index"; + return "shop/index"; } @GetMapping("/shop/search") public String shopSearch() { - return "/shop/search"; + return "shop/search"; } @GetMapping("/shop/checkout") public String shopCheckout() { - return "/shop/checkout"; + return "shop/checkout"; } @PostMapping("/shop/checkoutFinish") public String shopCheckoutFinish() { - return "/shop/checkoutFinish"; + return "shop/checkoutFinish"; } @GetMapping("/shop/checkoutFinish") public String shopCheckoutFinishGET() { - return "/shop/checkoutFinish"; + return "shop/checkoutFinish"; } @GetMapping("/shop/articles/{id}") public String shopArticlesById() { - return "/shop/articles/id"; + return "shop/articles/id"; } @PostMapping("/shop/articles/{id}") @@ -88,140 +88,140 @@ public class RequestController { @GetMapping("/user/settings") public String userSettings() { - return "/user/settings"; + return "user/settings"; } @GetMapping("/user/orders/") public String userOrdeers() { - return "/user/orders/index"; + return "user/orders/index"; } @GetMapping("/user/bonuspoints") public String userBonuspoints() { - return "/user/bonuspoints"; + return "user/bonuspoints"; } @GetMapping("/user/notifications/") public String userNotifications() { - return "/user/notifications/index"; + return "user/notifications/index"; } @GetMapping("/about") public String about() { - return "/about"; + return "about"; } @GetMapping("/terms") public String terms() { - return "/terms"; + return "terms"; } @GetMapping("/privacy") public String privacy() { - return "/privacy"; + return "privacy"; } @GetMapping("/intern/") public String intern() { - return "/intern/index"; + return "intern/index"; } @GetMapping("/intern/listedArticles/") public String internListedArticles() { - return "/intern/listedArticles/index"; + return "intern/listedArticles/index"; } @GetMapping("/intern/listedArticles/{id}") public String internListedArticlesId() { - return "/intern/listedArticles/id"; + return "intern/listedArticles/id"; } @GetMapping("/intern/articles/") public String internArticles() { - return "/intern/articles/index"; + return "intern/articles/index"; } @GetMapping("/intern/articles/{id}") public String internArticlesId() { - return "/intern/articles/id"; + return "intern/articles/id"; } @GetMapping("/intern/customers/") public String internCustomers() { - return "/intern/customers/index"; + return "intern/customers/index"; } @GetMapping("/intern/customers/{id}") public String internCustomersId() { - return "/intern/customers/id"; + return "intern/customers/id"; } @GetMapping("/intern/customerOrders/") public String internCustomerOrder() { - return "/intern/customerOrders/index"; + return "intern/customerOrders/index"; } @GetMapping("/intern/customerOrders/{id}") public String internCustomerOrdersId() { - return "/intern/customerOrders/id"; + return "intern/customerOrders/id"; } @GetMapping("/intern/suppliers/") public String internSuppliers() { - return "/intern/suppliers/index"; + return "intern/suppliers/index"; } @GetMapping("/intern/suppliers/{id}") public String internSuppliersId() { - return "/intern/suppliers/id"; + return "intern/suppliers/id"; } @GetMapping("/intern/supplierOrders/") public String internSupplierOrders() { - return "/intern/supplierOrders/index"; + return "intern/supplierOrders/index"; } @GetMapping("/intern/supplierOrders/{id}") public String internSupplierOrdersId() { - return "/intern/supplierOrders/id"; + return "intern/supplierOrders/id"; } @GetMapping("/intern/accounting/") public String accounting() { - return "/intern/accounting/index"; + return "intern/accounting/index"; } @GetMapping("/intern/accounting/vat") public String accountingVat() { - return "/intern/accounting/vat"; + return "intern/accounting/vat"; } @GetMapping("/intern/accounting/main") public String accountingIntern() { - return "/intern/accounting/main"; + return "intern/accounting/main"; } @GetMapping("/intern/accounting/addManual") public String accountingAddManual() { - return "/intern/accounting/addManual"; + return "intern/accounting/addManual"; } @GetMapping("/intern/warehouse/") public String accountingWarehouse() { - return "/intern/warehouse/index"; + return "intern/warehouse/index"; } @GetMapping("/intern/warehouse/todo") public String accountingWarehouseTodo() { - return "/intern/warehouse/todo"; + return "intern/warehouse/todo"; } @GetMapping("/intern/warehouse/addManual") public String accountingWarehouseAddManual() { - return "/intern/warehouse/addManual"; + return "intern/warehouse/addManual"; } @PostMapping("/intern/warehouse/progress/{id}") @@ -230,17 +230,17 @@ public class RequestController { return "redirect:/intern/warehouse/progress/450"; } else { response.setStatus(409); - return "/intern/warehouse/error_progress_failed"; + return "intern/warehouse/error_progress_failed"; } } @GetMapping("/intern/warehouse/progress/{id}") public String accountingWarehouseProgressId() { - return "/intern/warehouse/id_progress"; + return "intern/warehouse/id_progress"; } @GetMapping("/intern/warehouse/slots/") public String accountingWarehouseSlots() { - return "/intern/warehouse/slots/index"; + return "intern/warehouse/slots/index"; } } diff --git a/prototype/src/main/resources/application-dev.properties b/prototype/src/main/resources/application-dev.properties new file mode 100644 index 0000000..5483fc8 --- /dev/null +++ b/prototype/src/main/resources/application-dev.properties @@ -0,0 +1,13 @@ +# LOGGING +logging.level.org.springframework.web=INFO + +# resources +spring.thymeleaf.prefix=file:src/main/resources/templates/ +spring.thymeleaf.cache=false + +spring.resources.static-locations=file:src/main/resources/static/ +spring.resources.cache = false + +spring.resources.cache.cachecontrol.maxAge=P0D + +server.port=8000 diff --git a/prototype/src/main/resources/application.properties b/prototype/src/main/resources/application.properties index b1d9dea..9723e46 100644 --- a/prototype/src/main/resources/application.properties +++ b/prototype/src/main/resources/application.properties @@ -1,10 +1,8 @@ -# ---------------------------------------- -# CORE PROPERTIES -# ---------------------------------------- -spring.resources.cache.cachecontrol.maxAge=P365D +#caching +spring.resources.cache.cachecontrol.maxAge=P10M # LOGGING -logging.level.org.springframework.web=INFO +logging.level.org.springframework.web=WARN # DATABASE spring.datasource.url = jdbc:sqlite:./test.db diff --git a/prototype/src/main/resources/application.yml b/prototype/src/main/resources/application.yml deleted file mode 100644 index 2a40c20..0000000 --- a/prototype/src/main/resources/application.yml +++ /dev/null @@ -1,10 +0,0 @@ -spring: - # Templates reloading during development - thymeleaf: - prefix: file:src/main/resources/templates/ - cache: false - - # Static resources reloading during development - resources: - static-locations: file:src/main/resources/static/ - cache: false diff --git a/prototype/src/main/resources/templates/about.html b/prototype/src/main/resources/templates/about.html index ee13b9b..541e078 100644 --- a/prototype/src/main/resources/templates/about.html +++ b/prototype/src/main/resources/templates/about.html @@ -8,13 +8,13 @@ - +

Über uns

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis, neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis, molestie eu, feugiat in, orci. In hac habitasse platea dictumst.

- + diff --git a/prototype/src/main/resources/templates/intern/accounting/addManual.html b/prototype/src/main/resources/templates/intern/accounting/addManual.html index a420d6a..d8fae74 100644 --- a/prototype/src/main/resources/templates/intern/accounting/addManual.html +++ b/prototype/src/main/resources/templates/intern/accounting/addManual.html @@ -10,7 +10,7 @@ - +
@@ -18,7 +18,7 @@
- +
@@ -109,7 +109,7 @@
- + diff --git a/prototype/src/main/resources/templates/intern/accounting/index.html b/prototype/src/main/resources/templates/intern/accounting/index.html index f9b37f3..fbf28e7 100644 --- a/prototype/src/main/resources/templates/intern/accounting/index.html +++ b/prototype/src/main/resources/templates/intern/accounting/index.html @@ -11,7 +11,7 @@ - +
@@ -19,7 +19,7 @@
- +

Manuelle Buchung

@@ -93,7 +93,7 @@

- + diff --git a/prototype/src/main/resources/templates/intern/accounting/main.html b/prototype/src/main/resources/templates/intern/accounting/main.html index bae2986..a50ce43 100644 --- a/prototype/src/main/resources/templates/intern/accounting/main.html +++ b/prototype/src/main/resources/templates/intern/accounting/main.html @@ -11,7 +11,7 @@ - +
@@ -19,7 +19,7 @@
- +

Kontostand

331,00 EUR

@@ -71,7 +71,7 @@

- + diff --git a/prototype/src/main/resources/templates/intern/accounting/vat.html b/prototype/src/main/resources/templates/intern/accounting/vat.html index fffc1d6..7a52ce2 100644 --- a/prototype/src/main/resources/templates/intern/accounting/vat.html +++ b/prototype/src/main/resources/templates/intern/accounting/vat.html @@ -11,7 +11,7 @@ - +
@@ -19,7 +19,7 @@
- +

Kontostand

1510.95 EUR

@@ -51,7 +51,7 @@

- + diff --git a/prototype/src/main/resources/templates/intern/articles/index.html b/prototype/src/main/resources/templates/intern/articles/index.html index 5063d69..f01a585 100644 --- a/prototype/src/main/resources/templates/intern/articles/index.html +++ b/prototype/src/main/resources/templates/intern/articles/index.html @@ -11,7 +11,7 @@ - +
@@ -19,7 +19,7 @@
- +

@@ -129,7 +129,7 @@

-
+
diff --git a/prototype/src/main/resources/templates/intern/customerOrders/id.html b/prototype/src/main/resources/templates/intern/customerOrders/id.html index 242431d..256de74 100644 --- a/prototype/src/main/resources/templates/intern/customerOrders/id.html +++ b/prototype/src/main/resources/templates/intern/customerOrders/id.html @@ -11,7 +11,7 @@ - +
@@ -19,7 +19,7 @@
- +

Bestellung vom 27.01.2020

@@ -109,7 +109,7 @@
-
+
diff --git a/prototype/src/main/resources/templates/intern/customerOrders/index.html b/prototype/src/main/resources/templates/intern/customerOrders/index.html index ffe071c..be5f093 100644 --- a/prototype/src/main/resources/templates/intern/customerOrders/index.html +++ b/prototype/src/main/resources/templates/intern/customerOrders/index.html @@ -11,7 +11,7 @@ - +
@@ -19,7 +19,7 @@
- +

@@ -72,7 +72,7 @@

-
+
diff --git a/prototype/src/main/resources/templates/intern/customers/id.html b/prototype/src/main/resources/templates/intern/customers/id.html index 3b26144..d96c9fa 100644 --- a/prototype/src/main/resources/templates/intern/customers/id.html +++ b/prototype/src/main/resources/templates/intern/customers/id.html @@ -18,7 +18,7 @@ - +
@@ -26,7 +26,7 @@
- +

Allgemein

@@ -171,7 +171,7 @@

-
+
diff --git a/prototype/src/main/resources/templates/intern/customers/index.html b/prototype/src/main/resources/templates/intern/customers/index.html index 0d44461..f9a3338 100644 --- a/prototype/src/main/resources/templates/intern/customers/index.html +++ b/prototype/src/main/resources/templates/intern/customers/index.html @@ -11,7 +11,7 @@ - +
@@ -19,7 +19,7 @@
- +

@@ -120,7 +120,7 @@

-
+
diff --git a/prototype/src/main/resources/templates/intern/index.html b/prototype/src/main/resources/templates/intern/index.html index ffc895d..7ac167c 100644 --- a/prototype/src/main/resources/templates/intern/index.html +++ b/prototype/src/main/resources/templates/intern/index.html @@ -69,7 +69,7 @@ - +
@@ -77,7 +77,7 @@
- +

Buchhaltung

@@ -151,7 +151,7 @@
-
+
diff --git a/prototype/src/main/resources/templates/intern/listedArticles/id.html b/prototype/src/main/resources/templates/intern/listedArticles/id.html index 6720578..0c33014 100644 --- a/prototype/src/main/resources/templates/intern/listedArticles/id.html +++ b/prototype/src/main/resources/templates/intern/listedArticles/id.html @@ -11,7 +11,7 @@ - +
@@ -19,7 +19,7 @@
- +

Gelisteter Artikel 8450

@@ -110,7 +110,7 @@ Indianerehrenwort!
-
+
diff --git a/prototype/src/main/resources/templates/intern/listedArticles/index.html b/prototype/src/main/resources/templates/intern/listedArticles/index.html index e933f0d..d838d79 100644 --- a/prototype/src/main/resources/templates/intern/listedArticles/index.html +++ b/prototype/src/main/resources/templates/intern/listedArticles/index.html @@ -11,7 +11,7 @@ - +
@@ -19,7 +19,7 @@
- +

Artikel Hinzufügen

@@ -99,7 +99,7 @@

-
+
diff --git a/prototype/src/main/resources/templates/intern/supplierOrders/index.html b/prototype/src/main/resources/templates/intern/supplierOrders/index.html index 691f93b..3df1274 100644 --- a/prototype/src/main/resources/templates/intern/supplierOrders/index.html +++ b/prototype/src/main/resources/templates/intern/supplierOrders/index.html @@ -11,7 +11,7 @@ - +
@@ -19,7 +19,7 @@
- +

@@ -92,7 +92,7 @@

-
+
diff --git a/prototype/src/main/resources/templates/intern/suppliers/id.html b/prototype/src/main/resources/templates/intern/suppliers/id.html index 1bd33d7..6b29ce4 100644 --- a/prototype/src/main/resources/templates/intern/suppliers/id.html +++ b/prototype/src/main/resources/templates/intern/suppliers/id.html @@ -11,7 +11,7 @@ - +
@@ -19,7 +19,7 @@
- +

Bestellungen

@@ -76,7 +76,7 @@

-
+
diff --git a/prototype/src/main/resources/templates/intern/suppliers/index.html b/prototype/src/main/resources/templates/intern/suppliers/index.html index 152546d..816b223 100644 --- a/prototype/src/main/resources/templates/intern/suppliers/index.html +++ b/prototype/src/main/resources/templates/intern/suppliers/index.html @@ -11,7 +11,7 @@ - +
@@ -19,7 +19,7 @@
- +

@@ -52,7 +52,7 @@

-
+
diff --git a/prototype/src/main/resources/templates/intern/warehouse/addManual.html b/prototype/src/main/resources/templates/intern/warehouse/addManual.html index 9880c34..764e944 100644 --- a/prototype/src/main/resources/templates/intern/warehouse/addManual.html +++ b/prototype/src/main/resources/templates/intern/warehouse/addManual.html @@ -10,7 +10,7 @@ - +
@@ -18,7 +18,7 @@
- +
@@ -80,7 +80,7 @@
-
+
diff --git a/prototype/src/main/resources/templates/intern/warehouse/error_progress_failed.html b/prototype/src/main/resources/templates/intern/warehouse/error_progress_failed.html index 6cc956f..db1c40e 100644 --- a/prototype/src/main/resources/templates/intern/warehouse/error_progress_failed.html +++ b/prototype/src/main/resources/templates/intern/warehouse/error_progress_failed.html @@ -24,6 +24,6 @@ Zurück -
+
diff --git a/prototype/src/main/resources/templates/intern/warehouse/id_progress.html b/prototype/src/main/resources/templates/intern/warehouse/id_progress.html index a8ce868..3c75756 100644 --- a/prototype/src/main/resources/templates/intern/warehouse/id_progress.html +++ b/prototype/src/main/resources/templates/intern/warehouse/id_progress.html @@ -52,7 +52,7 @@ Fertig -
+
diff --git a/prototype/src/main/resources/templates/intern/warehouse/index.html b/prototype/src/main/resources/templates/intern/warehouse/index.html index a7f4eda..d807797 100644 --- a/prototype/src/main/resources/templates/intern/warehouse/index.html +++ b/prototype/src/main/resources/templates/intern/warehouse/index.html @@ -11,7 +11,7 @@ - +
@@ -19,7 +19,7 @@
- +

Die Lagerbestände nach Artikel können Sie unter den gelisteten Artikeln einsehen. @@ -115,7 +115,7 @@

-
+
diff --git a/prototype/src/main/resources/templates/intern/warehouse/slots/index.html b/prototype/src/main/resources/templates/intern/warehouse/slots/index.html index 337b4a0..0521b72 100644 --- a/prototype/src/main/resources/templates/intern/warehouse/slots/index.html +++ b/prototype/src/main/resources/templates/intern/warehouse/slots/index.html @@ -11,7 +11,7 @@ - +
@@ -19,7 +19,7 @@
- +
@@ -94,7 +94,7 @@

-
+
diff --git a/prototype/src/main/resources/templates/intern/warehouse/todo.html b/prototype/src/main/resources/templates/intern/warehouse/todo.html index 7e4dd9e..213549f 100644 --- a/prototype/src/main/resources/templates/intern/warehouse/todo.html +++ b/prototype/src/main/resources/templates/intern/warehouse/todo.html @@ -11,7 +11,7 @@ - +
@@ -19,7 +19,7 @@
- +

@@ -95,7 +95,7 @@

-
+
diff --git a/prototype/src/main/resources/templates/login.html b/prototype/src/main/resources/templates/login.html index eef267f..81773ea 100644 --- a/prototype/src/main/resources/templates/login.html +++ b/prototype/src/main/resources/templates/login.html @@ -8,7 +8,7 @@ - +
@@ -29,6 +29,6 @@
-
+
diff --git a/prototype/src/main/resources/templates/privacy.html b/prototype/src/main/resources/templates/privacy.html index 9af1d33..dabc838 100644 --- a/prototype/src/main/resources/templates/privacy.html +++ b/prototype/src/main/resources/templates/privacy.html @@ -8,13 +8,13 @@ - +

Datenschutzerklärung

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis, neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis, molestie eu, feugiat in, orci. In hac habitasse platea dictumst.

-
+
diff --git a/prototype/src/main/resources/templates/register.html b/prototype/src/main/resources/templates/register.html index 3eaf326..cf3ab56 100644 --- a/prototype/src/main/resources/templates/register.html +++ b/prototype/src/main/resources/templates/register.html @@ -12,7 +12,7 @@ - +
@@ -89,7 +89,7 @@
-
+
diff --git a/prototype/src/main/resources/templates/shop/articles/id.html b/prototype/src/main/resources/templates/shop/articles/id.html index 37451be..4c97a53 100644 --- a/prototype/src/main/resources/templates/shop/articles/id.html +++ b/prototype/src/main/resources/templates/shop/articles/id.html @@ -11,10 +11,10 @@ - +
- +
@@ -73,7 +73,7 @@
-
+
diff --git a/prototype/src/main/resources/templates/shop/checkout.html b/prototype/src/main/resources/templates/shop/checkout.html index 000047d..ea65727 100644 --- a/prototype/src/main/resources/templates/shop/checkout.html +++ b/prototype/src/main/resources/templates/shop/checkout.html @@ -11,7 +11,7 @@ - +

Warenkorb

@@ -173,7 +173,7 @@ Musterstraße 42
-
+
diff --git a/prototype/src/main/resources/templates/shop/checkoutFinish.html b/prototype/src/main/resources/templates/shop/checkoutFinish.html index 36c5995..1f4e653 100644 --- a/prototype/src/main/resources/templates/shop/checkoutFinish.html +++ b/prototype/src/main/resources/templates/shop/checkoutFinish.html @@ -15,7 +15,7 @@ - +

Bestellung erfolgreich!

@@ -28,7 +28,7 @@ Weiter
-
+
diff --git a/prototype/src/main/resources/templates/shop/index.html b/prototype/src/main/resources/templates/shop/index.html index e8e120f..24874a1 100644 --- a/prototype/src/main/resources/templates/shop/index.html +++ b/prototype/src/main/resources/templates/shop/index.html @@ -10,7 +10,7 @@ - +
@@ -92,7 +92,7 @@
-
+
diff --git a/prototype/src/main/resources/templates/shop/search.html b/prototype/src/main/resources/templates/shop/search.html index 8c5d5c1..defdd3b 100644 --- a/prototype/src/main/resources/templates/shop/search.html +++ b/prototype/src/main/resources/templates/shop/search.html @@ -11,7 +11,7 @@ - +
@@ -19,7 +19,7 @@
- +
@@ -86,7 +86,7 @@
-
+
diff --git a/prototype/src/main/resources/templates/terms.html b/prototype/src/main/resources/templates/terms.html index 3893e2a..6ea45e1 100644 --- a/prototype/src/main/resources/templates/terms.html +++ b/prototype/src/main/resources/templates/terms.html @@ -8,13 +8,13 @@ - +

Allgemeine Geschäftsbedingungen

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis, neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis, molestie eu, feugiat in, orci. In hac habitasse platea dictumst.

-
+
diff --git a/prototype/src/main/resources/templates/user/bonuspoints.html b/prototype/src/main/resources/templates/user/bonuspoints.html index f332469..d960828 100644 --- a/prototype/src/main/resources/templates/user/bonuspoints.html +++ b/prototype/src/main/resources/templates/user/bonuspoints.html @@ -10,7 +10,7 @@ - +
@@ -19,7 +19,7 @@
- +
@@ -51,7 +51,7 @@
-
+
diff --git a/prototype/src/main/resources/templates/user/notifications/index.html b/prototype/src/main/resources/templates/user/notifications/index.html index 76f0a5e..a15f894 100644 --- a/prototype/src/main/resources/templates/user/notifications/index.html +++ b/prototype/src/main/resources/templates/user/notifications/index.html @@ -10,7 +10,7 @@ - +
@@ -19,7 +19,7 @@
- +
@@ -85,7 +85,7 @@
-
+
diff --git a/prototype/src/main/resources/templates/user/orders/index.html b/prototype/src/main/resources/templates/user/orders/index.html index 5723851..c2ecdee 100644 --- a/prototype/src/main/resources/templates/user/orders/index.html +++ b/prototype/src/main/resources/templates/user/orders/index.html @@ -10,7 +10,7 @@ - +
@@ -19,7 +19,7 @@
- +

Bestellung vom 27.01.2020

@@ -187,7 +187,7 @@
-
+
diff --git a/prototype/src/main/resources/templates/user/settings.html b/prototype/src/main/resources/templates/user/settings.html index 0cf4646..e34b91f 100644 --- a/prototype/src/main/resources/templates/user/settings.html +++ b/prototype/src/main/resources/templates/user/settings.html @@ -10,7 +10,7 @@ - +
@@ -19,7 +19,7 @@
- +
@@ -117,7 +117,7 @@ Deutschland
-
+
diff --git a/prototype/src/main/resources/templatesOld/about.html b/prototype/src/main/resources/templatesOld/about.html deleted file mode 100644 index 717b344..0000000 --- a/prototype/src/main/resources/templatesOld/about.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - e-commerce - - - - -
-
-

Über uns

-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis, neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis, molestie eu, feugiat in, orci. In hac habitasse platea dictumst. -
-
-
-
-
- - diff --git a/prototype/src/main/resources/templatesOld/articleDetail.html b/prototype/src/main/resources/templatesOld/articleDetail.html deleted file mode 100644 index 77e361e..0000000 --- a/prototype/src/main/resources/templatesOld/articleDetail.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - - e-commerce - - - - -
-
-
- -
-
-

Tolle Kamera

-

25.14 €

-

- Eine TOLLE Kamera
- Jaja du denkst jetzt bestimmt: "Bei dem Preis kann sie gar nich sooo TOLL sein".
- Aber glaub mir, sie is echt echt TOLL!
- Indianerehrenwort! -

-
-
-

50.28 €

-

Auf Lager

-
-
-
- - -
- -
-
- -
-
-
-
- - \ No newline at end of file diff --git a/prototype/src/main/resources/templatesOld/customer/accountSettings.html b/prototype/src/main/resources/templatesOld/customer/accountSettings.html deleted file mode 100644 index d891923..0000000 --- a/prototype/src/main/resources/templatesOld/customer/accountSettings.html +++ /dev/null @@ -1,78 +0,0 @@ - - - - - eCommerce - Account Settings - - - - - -
-
-

Account Einstellungen

- - -
- -
-

Einstellungen

-

- - -

-

- - -

-

- - -

-

- - -

-
- -
-

Versand

-

- - -

- -
-

- - -

-

- - -

-
- -

- - -

-
- -
-

Bezahlung

-

TODO

-
- -
- -
- - -
- -
-
-
- - \ No newline at end of file diff --git a/prototype/src/main/resources/templatesOld/customer/bonusProgram.html b/prototype/src/main/resources/templatesOld/customer/bonusProgram.html deleted file mode 100644 index 04acf85..0000000 --- a/prototype/src/main/resources/templatesOld/customer/bonusProgram.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - e-commerce - - - - -
- -
-
- - \ No newline at end of file diff --git a/prototype/src/main/resources/templatesOld/customer/orderHistory.html b/prototype/src/main/resources/templatesOld/customer/orderHistory.html deleted file mode 100644 index 90652e5..0000000 --- a/prototype/src/main/resources/templatesOld/customer/orderHistory.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - e-commerce - - - - - -
-
- -

Übersicht ihrer Bestellungen

-
-

Bestellungen

-
- - -
-

-

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
BestellnummerBestelldatumArtikelMengeGesamtpreisDetailsStatus
131-02-2020E-Shop Simulator1 Stk.60,00 EUR
131-02-2020Buran 11F35 K110 Stk.600.000.000,00 EUR
-

-
- -
-
-
- - \ No newline at end of file diff --git a/prototype/src/main/resources/templatesOld/home.html b/prototype/src/main/resources/templatesOld/home.html deleted file mode 100644 index 69cf445..0000000 --- a/prototype/src/main/resources/templatesOld/home.html +++ /dev/null @@ -1,82 +0,0 @@ - - - - - e-commerce - - - - - -
-
-
-

Angebote

-
-
- -

Lorem Ipsum

-

25.14 €

-

- Als Gregor Samsa eines Morgens aus unruhigen Träumen erwachte. -

-
-
- -

Lorem Ipsum

-

10.14 €

-

- Als Gregor Samsa eines Morgens aus unruhigen Träumen erwachte. -

-
-
- -

Lorem Ipsum

-

25.14 €

-

- Als Gregor Samsa eines Morgens aus unruhigen Träumen erwachte. -

-
-
- -

Lorem Ipsum

-

10.14 €

-

- Als Gregor Samsa eines Morgens aus unruhigen Träumen erwachte. -

-
-
- -

Lorem Ipsum

-

44.14 €

-

- Als Gregor Samsa eines Morgens aus unruhigen Träumen erwachte. -

-
-
-
-
-
-
-
-
-
-
-
-

Personalisierte Empfehlungen

-
- - -
-
-
-
-
- - - diff --git a/prototype/src/main/resources/templatesOld/intern/accounting.html b/prototype/src/main/resources/templatesOld/intern/accounting.html deleted file mode 100644 index 0201695..0000000 --- a/prototype/src/main/resources/templatesOld/intern/accounting.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - e-commerce - - - - - - - - -
- -
-

Alle Buchungen

- -

Manuelle Buchung

-

- Buchungen können manuell getätigt werden. - Jetzt Buchen -

- -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
ZeitpunktBetragVonKontostandNachKontostandGrundReferenz
10.09.2019 14:10119,00 EUR - - Kunde 50800 EURKunden-BezahlungBezahlung mit Kreditkarte 89404480
10.09.2019 13:4519,00 EURHauptkonto331,00 EURMehrwertsteuer1510,95 EURKunden-Bestellung2504
10.09.2019 13:45100,00 EURKunde 5080-100,00 EURHauptkonto350,00 EURKunden-Bestellung2504
19.08.2019 12:31250,00 EUR - - Hauptkonto250,00 EURStartkapital -
-

-

-
- - - - diff --git a/prototype/src/main/resources/templatesOld/intern/accountingmain.html b/prototype/src/main/resources/templatesOld/intern/accountingmain.html deleted file mode 100644 index 039bb45..0000000 --- a/prototype/src/main/resources/templatesOld/intern/accountingmain.html +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - e-commerce - - - - - - - - -
- -
-

Hauptkonto Buchungen

- -

Manuelle Buchung

-

- Buchungen können manuell getätigt werden. - Jetzt Buchen -

- -

Kontostand

-

331,00 EUR

- -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
ZeitpunktBetragVonKontostandNachKontostandGrundReferenz
10.09.2019 13:45-19,00 EURMehrwertsteuer1510,95 EURHauptkonto331,00 EURKunden-Bestellung2504
10.09.2019 13:45100,00 EURKunde 5080-100,00 EURHauptkonto350,00 EURKunden-Bestellung2504
19.08.2019 12:31250,00 EUR - - Hauptkonto250,00 EURStartkapital -
-

-

-
- - - - diff --git a/prototype/src/main/resources/templatesOld/intern/accountingmanual.html b/prototype/src/main/resources/templatesOld/intern/accountingmanual.html deleted file mode 100644 index 75a7c05..0000000 --- a/prototype/src/main/resources/templatesOld/intern/accountingmanual.html +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - e-commerce - - - - - - - - -
- -
-

Manuelle Buchung

- -
-
- - EUR -
-
- - -
-
- - Kein Konto
- Hauptkonto
- Mehrwertsteuerkonto
- Kunde
- Lieferant
-
-
- -
-
- - Kein Konto
- Hauptkonto
- Mehrwertsteuerkonto
- Kunde
- Lieferant
-
-
- -
-
- - Manuell
-
- Startbuchung -
-
- -
-

- Manuelle Buchungen können nicht rückgängig gemacht werden!
- Es können jedoch Gegenbuchungen erstellt werden. -

- - -
-
- -
-
- - - - diff --git a/prototype/src/main/resources/templatesOld/intern/accountingvat.html b/prototype/src/main/resources/templatesOld/intern/accountingvat.html deleted file mode 100644 index 266c471..0000000 --- a/prototype/src/main/resources/templatesOld/intern/accountingvat.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - e-commerce - - - - - - - - -
- -
-

Mehrwertsteuer Buchungen

- -

Manuelle Buchung

-

- Buchungen können manuell getätigt werden. - Jetzt Buchen -

- -

Kontostand

-

1510.95 EUR

- -

- - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
ZeitpunktBetragVonKontostandNachKontostandGrundReferenz
10.09.2019 13:4519,00 EURHauptkonto331,00 EURMehrwertsteuer1510,95 EURKunden-Bestellung2504
-

-

-
- - - - diff --git a/prototype/src/main/resources/templatesOld/intern/addarticle.html b/prototype/src/main/resources/templatesOld/intern/addarticle.html deleted file mode 100644 index a208726..0000000 --- a/prototype/src/main/resources/templatesOld/intern/addarticle.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - e-commerce - - - - - - - - -
- -
-

Gelistete Artikel

- -

Artikel ins Sortiment aufnehmen

-
-

- - -

-

- - -

-
-
-

- - -

-

- -

-
-
-

- - EUR - ( 19% Mwst. )
- = 105.98 EUR Brutto -

-

- - EUR -

-

-

- - Automatisch nachbestellen - Nicht mehr nachkaufen -
-

-
- -
- - -

- Bitte schreiben Sie jede Kategorie in eine eigene Zeile -

-
- -
-

- - -

-
- -

- - -

-
- -
-
-
-
- - - - diff --git a/prototype/src/main/resources/templatesOld/intern/articles.html b/prototype/src/main/resources/templatesOld/intern/articles.html deleted file mode 100644 index 3e01432..0000000 --- a/prototype/src/main/resources/templatesOld/intern/articles.html +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - e-commerce - - - - - - -
- -
-

Artikel

-

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
BildNameKaufpreis(Netto)KategorienHerstellernummerStatus
Kamera87,77 € (73,76 €) Úberwachung, ElektronikA-5051Im Sortiment
(bearbeiten)
Earbuds50,54 €(42,47 €)Kopfhörer, ElektronikA-840Im Sortiment
(bearbeiten)
USB-Magic Light10,17 €(8,54 €)Sonstiges, ElektronikA-8401Im Sortiment
(bearbeiten)
Ersatzfernbedinung7,08 €(5,95 €)Úberwachung, ElektronikA-4565Im Sortiment
(bearbeiten)
Netzwerkkamera50,85 €(42,73 €)Úberwachung, ElektronikA-7580Nicht im Sortiment
(aufnehmen)
USB 3.0 Festplattenkabel1,65 €(1,38 €)Kabel, ElektronikA-6107Nicht im Sortiment
(aufnehmen)
Ubiquiti Networks UAP-AC-PRO, weiß120,00 €(100,84 €)Netzwerk, ElektronikA-4933Nicht im Sortiment
(aufnehmen)
-

-

-
- - - - diff --git a/prototype/src/main/resources/templatesOld/intern/customers_allOrders_overview.html b/prototype/src/main/resources/templatesOld/intern/customers_allOrders_overview.html deleted file mode 100644 index d31d267..0000000 --- a/prototype/src/main/resources/templatesOld/intern/customers_allOrders_overview.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - Bestell -und Buchungsübersicht - - - - - - -
-
-

Übersicht aller Bestellungen

-
-

Bestellungen

-
- - -
-

- - - - - - - - - - - - - - - - - -
KundennummerBestellnummerBestelldatumBetragBonuspunkte
112019-11-1010,13 EUR10
-

-
-
-
- - - - diff --git a/prototype/src/main/resources/templatesOld/intern/customers_detailview_bookings_orders.html b/prototype/src/main/resources/templatesOld/intern/customers_detailview_bookings_orders.html deleted file mode 100644 index 676ba31..0000000 --- a/prototype/src/main/resources/templatesOld/intern/customers_detailview_bookings_orders.html +++ /dev/null @@ -1,74 +0,0 @@ - - - - - Bestell -und Buchungsübersicht - - - - - - - -
-
-

1 (Kundennummer)

-
-

Bestellungen

-
- - -
-

- - - - - - - - - - - - - - - -
BestellnummerBestelldatumBetragBonuspunkte
12019-11-1010,13 EUR10
-
-

Buchungen

-
- - -
-

- - - - - - - - - - - - - - - - - - - - - -
ZeitpunktBetragVonKontostandNachKontostandGrundReferenz
10.09.2019 14:10119,00 EURHauptkonto331,00 EURMehrwertsteuer1510,95 EURKunden-Bestellung2504
-

-
-
- - - - \ No newline at end of file diff --git a/prototype/src/main/resources/templatesOld/intern/customers_order_detailview.html b/prototype/src/main/resources/templatesOld/intern/customers_order_detailview.html deleted file mode 100644 index 5a19427..0000000 --- a/prototype/src/main/resources/templatesOld/intern/customers_order_detailview.html +++ /dev/null @@ -1,69 +0,0 @@ - - - - - Bestell -und Buchungsübersicht - - - - - - - -
-
-

Bestelldetails

-
-
-

Allgemeineinformationen

-

Die Bestellung wurde am 01.01.2020 bestellt

-

Bestellnummer: 614899499

-

Letzte Ziffern der Karte: 578

-
-
-

Versandinformationen

-

Name
Straße
Ort, plz
Deutschland

-
-
-

Preiszusammensetzung

-
-
-

Startwert
Versand
Bonuspunkte

-

Gesamtsumme

-
-
-

6,00 EUR
3,00 EUR
-1,00 EUR

-

9,52‬ EUR

-
-
-
-
-
-

Bestellte Artikel

-
- -
-

Lorem Ipsum

- -

Menge: 1

-

25.14 €

-

- Als Gregor Samsa eines Morgens aus unruhigen Träumen erwachte. -

-
- -
-

Lorem Ipsum

- -

Menge: 4

-

25.14 €

-

- Als Gregor Samsa eines Morgens aus unruhigen Träumen erwachte. -

-
-
-
-
- - - \ No newline at end of file diff --git a/prototype/src/main/resources/templatesOld/intern/customers_overview.html b/prototype/src/main/resources/templatesOld/intern/customers_overview.html deleted file mode 100644 index ac832ce..0000000 --- a/prototype/src/main/resources/templatesOld/intern/customers_overview.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - Kundenübersicht - - - - - - - -
-
-

Kunden

-
- - -
-

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
KundennummerBeitrittsdatumGeschäftskundeKartennummerAdresse
12019-11-10Ja51988516981HTMLgasse 10
12019-11-10Ja51988516981HTMLgasse 10
12019-11-10Ja51988516981HTMLgasse 10
12019-11-10Ja51988516981HTMLgasse 10
12019-11-10Ja51988516981HTMLgasse 10
12019-11-10Ja51988516981HTMLgasse 10
12019-11-10Ja51988516981HTMLgasse 10
12019-11-10nein51988516981HTMLgasse 10
-

-
-
- - - - \ No newline at end of file diff --git a/prototype/src/main/resources/templatesOld/intern/listedArticles.html b/prototype/src/main/resources/templatesOld/intern/listedArticles.html deleted file mode 100644 index a3682fe..0000000 --- a/prototype/src/main/resources/templatesOld/intern/listedArticles.html +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - e-commerce - - - - - - - - -
- -
-

Gelistete Artikel

- - -

Artikel Hinzufügen

-

- Weitere Artikel können über Artikelübersicht gelistet werden. - Jetzt Hinzufügen -

- -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
BildNamePreis(Netto)KategorienLagerbestand (Aktiv)ArtikelId (bearbeiten)
Kamera100,50 € (84.45 €) Úberwachung, Elektronik301 A-5051L-890
Earbuds63,95 €(53,73 €)Kopfhörer, Elektronik12 A-840L-13850
USB-Magic Light11,90 € (10,00 €) Sonstiges, Elektronik3A-8401L-5784
3D Magic Stativ15,99 € (13.44 €) Úberwachung, Elektronik4A-2135L-4564
Ersatzfernbedinung7,95 € (6.68 €) Úberwachung, Elektronik0A-4565L-4566
-

-

-
- - - - diff --git a/prototype/src/main/resources/templatesOld/intern/listedArticlesEdit.html b/prototype/src/main/resources/templatesOld/intern/listedArticlesEdit.html deleted file mode 100644 index 0b02434..0000000 --- a/prototype/src/main/resources/templatesOld/intern/listedArticlesEdit.html +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - e-commerce - - - - - - - - -
- -
-

Gelistete Artikel

- - -

Artikel bearbeiten

-
-

- - -

-

- - -

-
-
-

- - -

-

- -

-
-
-

- - EUR - ( 19% Mwst. ) -
- = 105.98 EUR Brutto -

-

- - EUR -

-

-

- - Automatisch nachbestellen - Nicht mehr nachkaufen -
-

-
- -
- - -

- Bitte jede Kategorien in eine eigene Zeile -

-
- -
-

- Lagerbestand: 12 -

-

- - -

-

- Der Wert wird nur für zukünftige Lagerbuchungen verwendet. - Bei Problemen kann können Einheiten aus- und wieder eingebucht werden. - - Lagerbuchung -

-
- -

- - -

-
- - -
-
-
-
- - - - diff --git a/prototype/src/main/resources/templatesOld/intern/suppliers_allOrders_overview.html b/prototype/src/main/resources/templatesOld/intern/suppliers_allOrders_overview.html deleted file mode 100644 index 53f71d3..0000000 --- a/prototype/src/main/resources/templatesOld/intern/suppliers_allOrders_overview.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - Bestell -und Buchungsübersicht - - - - - - - -
-
-

Übersicht aller Bestellungen

-
-

Bestellungen

-
- - -
-

- - - - - - - - - - - - - - - - - - - - - - - - - -
BestellnummerBestelldatumArtikelMengeGesamtpreis
12019-11-10Grafikkarte600,00 EUR
12019-11-10Grafikkarte600,00 EURAngekommen
-

-
-
-
- - - - \ No newline at end of file diff --git a/prototype/src/main/resources/templatesOld/intern/suppliers_detailview_bookings_orders.html b/prototype/src/main/resources/templatesOld/intern/suppliers_detailview_bookings_orders.html deleted file mode 100644 index 9eb7cb5..0000000 --- a/prototype/src/main/resources/templatesOld/intern/suppliers_detailview_bookings_orders.html +++ /dev/null @@ -1,79 +0,0 @@ - - - - - Bestell -und Buchungsübersicht - - - - - - - -
-
-

1 (Lieferranten)

-
-

Bestellungen

-
- - -
-

- - - - - - - - - - - - - - - - - - - -
BestellnummerBestelldatumArtikelMengeGesamtpreis
12019-11-10Grafikkarte2600,00 EUR
- -
-

Buchungen

-
- - -
-

- - - - - - - - - - - - - - - - - - - - - -
ZeitpunktBetragVonKontostandNachKontostandGrundReferenz
10.09.2019 14:10119,00 EURHauptkonto331,00 EURMehrwertsteuer1510,95 EURKunden-Bestellung2504
-

-
-
- - - - \ No newline at end of file diff --git a/prototype/src/main/resources/templatesOld/intern/suppliers_order_detailview.html b/prototype/src/main/resources/templatesOld/intern/suppliers_order_detailview.html deleted file mode 100644 index 2d31d30..0000000 --- a/prototype/src/main/resources/templatesOld/intern/suppliers_order_detailview.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - Bestell -und Buchungsübersicht - - - - - - - -
-
-

Bestelldetails

-
-
-

Allgemeineinformationen

-

Die Bestellung wurde am 01.01.2020 bestellt

-

Bestellnummer: 614899499

-

Ist angekommen

-
-
-

Versandinformationen

-

Name
Straße
Ort, plz
Deutschland

-
-
-

Preiszusammensetzung

-
-
-

Startwert
Versand
Summe ohne MwSt.
Anzurechnende MwSt.

-

Gesamtsumme

-
-
-

6,00 EUR
3,00 EUR
9,00 Eur
1,71 Eur

-

‭10,71‬ EUR

-
-
-
-
-
-

Bestellter Artikel

-
- -
-

Lorem Ipsum

- -

Menge: 1

-

25.14 €

-

- Als Gregor Samsa eines Morgens aus unruhigen Träumen erwachte. -

-
-
-
-
- - - \ No newline at end of file diff --git a/prototype/src/main/resources/templatesOld/intern/suppliers_overview.html b/prototype/src/main/resources/templatesOld/intern/suppliers_overview.html deleted file mode 100644 index 68c79f6..0000000 --- a/prototype/src/main/resources/templatesOld/intern/suppliers_overview.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - Kundenübersicht - - - - - - - -
-
-

Kunden

-
- - -
-

- - - - - - - - - - - - - - - - -
LieferrantennummerName
1Nike
1Adidas
-

-
-
- - - - \ No newline at end of file diff --git a/prototype/src/main/resources/templatesOld/login.html b/prototype/src/main/resources/templatesOld/login.html deleted file mode 100644 index b4cb8f5..0000000 --- a/prototype/src/main/resources/templatesOld/login.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - - e-commerce - - - - -
- -
-
- -
- -
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
- -
- - - Passwort vergessen? -
-
- -
- -
-
- -
- - - diff --git a/prototype/src/main/resources/templatesOld/notification.html b/prototype/src/main/resources/templatesOld/notification.html deleted file mode 100644 index 126e979..0000000 --- a/prototype/src/main/resources/templatesOld/notification.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - e-commerce - - - - -
-
-

Benachrichtigungen

-

Nachricht vom 17.08.2020, 14:38 Uhr

-

Ihre Bestellung kommt voraussichtlich am Donnerstag, den 20.08.2020

-

- Vielen Dank für Ihre Bestellung der folgenden Artikel:
-
- 2x tolle Kamera
- 1x Bluetooth Kopfhörer
- 3x USB-Magic Light
-
- Die Sendung wird Ihnen voraussichtlich am Donnerstag, den 20.08.2020 zugestellt. Den aktuellen Status des Pakets können Sie jederzeit unter der Paketverfolgungsnummer P-586776517 nachvollziehen. -

-
-
-
- - - diff --git a/prototype/src/main/resources/templatesOld/privacy.html b/prototype/src/main/resources/templatesOld/privacy.html deleted file mode 100644 index 91d620b..0000000 --- a/prototype/src/main/resources/templatesOld/privacy.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - e-commerce - - - - -
-
-

Datenschutzerklärung

-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis, neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis, molestie eu, feugiat in, orci. In hac habitasse platea dictumst. -
-
-
-
- - - diff --git a/prototype/src/main/resources/templatesOld/register.html b/prototype/src/main/resources/templatesOld/register.html deleted file mode 100644 index a72bdf9..0000000 --- a/prototype/src/main/resources/templatesOld/register.html +++ /dev/null @@ -1,60 +0,0 @@ - - - - - e-commerce - - - - - -
- -
-
- -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - - -
- -
- -
- -
- -
-
- -
- - - \ No newline at end of file diff --git a/prototype/src/main/resources/templatesOld/searchResults.html b/prototype/src/main/resources/templatesOld/searchResults.html deleted file mode 100644 index 230f81a..0000000 --- a/prototype/src/main/resources/templatesOld/searchResults.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - - e-commerce - - - - -
-
- - -
-
-

Suchergebnisse

-
- -
- -

Tolle Kamera

-

25.14 €

-

- Eine TOLLE Kamera
- Jaja du denkst jetzt bestimmt: "Bei dem Preis kann sie gar nich sooo TOLL sein".
- Aber glaub mir, sie is echt echt TOLL!
- Indianerehrenwort! -

-
- -
- -

Bluetooth Kopfhörer

-

10.14 €

-

- Sind halt Kopfhörer ohne Kabel, mehr gibts da nich zu sagen. -

-
- -
- -

???

-

25.14 €

-

- Ich weiß selbst nich was das genau sein soll.
- Wenn dus willst kannst es gern haben, musst nur das Geld überweisen. -

-
- -
-
-
-
-
-
-
-
- - -
-
- - - \ No newline at end of file diff --git a/prototype/src/main/resources/templatesOld/shoppingCart.html b/prototype/src/main/resources/templatesOld/shoppingCart.html deleted file mode 100644 index 199c57f..0000000 --- a/prototype/src/main/resources/templatesOld/shoppingCart.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - e-commerce - - - - -
-
-

Warenkorb

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
BildNamePreisMenge
Kamera100,50 € - - - -
Earbuds63,95 € - - - -
USB-Magic Light11,90 € - - - -
3D Magic Stativ15,99 € - - - -
Ersatzfernbedinung7,95 € - - - -
-

-
-
-

Checkout

-
-
-

Bestellübersicht

-

Artikel: 200,29 €

-

Lieferung: 5,00 €

-

Gesamt: 205,29 €

- -

Versandadresse:

-

Max Mustermann

-

Musterstraße 42

-

42424 Mustertal

- - -
-
-
-
- - - \ No newline at end of file diff --git a/prototype/src/main/resources/templatesOld/terms.html b/prototype/src/main/resources/templatesOld/terms.html deleted file mode 100644 index 4a8af5b..0000000 --- a/prototype/src/main/resources/templatesOld/terms.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - e-commerce - - - - -
-
-

Allgemeine Geschäftsbedingungen

-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis, neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis, molestie eu, feugiat in, orci. In hac habitasse platea dictumst. -
-
-
-
- - -