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.
-