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 b172507..d8df899 100644
--- a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java
@@ -35,6 +35,11 @@ public class RequestController {
return "/login";
}
+ @PostMapping("/login")
+ public String loginPost() {
+ return "redirect:/";
+ }
+
@GetMapping("/register")
public String register() {
return "/register";
@@ -50,11 +55,30 @@ public class RequestController {
return "/shop/search";
}
+ @GetMapping("/shop/checkout")
+ public String shopCheckout() {
+ return "/shop/checkout";
+ }
+
+ @PostMapping("/shop/checkoutFinish")
+ public String shopCheckoutFinish() {
+ return "/shop/checkoutFinish";
+ }
+ @GetMapping("/shop/checkoutFinish")
+ public String shopCheckoutFinishGET() {
+ return "/shop/checkoutFinish";
+ }
+
@GetMapping("/shop/articles/{id}")
public String shopArticlesById() {
return "/shop/articles/id";
}
+ @PostMapping("/shop/articles/{id}")
+ public String shopArticlesByIdBuy() {
+ return "redirect:/shop/checkout";
+ }
+
@GetMapping("/user/")
public String user() {
return "/user/index";
@@ -68,12 +92,7 @@ public class RequestController {
@GetMapping("/user/orders/")
public String userOrdeers() {
- return "/user/orders/";
- }
-
- @GetMapping("/user/orders/{id}")
- public String userOrdersId() {
- return "/user/orders/id";
+ return "/user/orders/index";
}
@GetMapping("/user/bonuspoints")
@@ -83,12 +102,7 @@ public class RequestController {
@GetMapping("/user/notifications/")
public String userNotifications() {
- return "/user/notifications/";
- }
-
- @GetMapping("/user/notifications/{id}")
- public String userNotificationsId() {
- return "/user/notifications/id";
+ return "/user/notifications/index";
}
@GetMapping("/about")
diff --git a/prototype/src/main/resources/static/css/ecom.css b/prototype/src/main/resources/static/css/ecom.css
index ace315a..4ab9632 100644
--- a/prototype/src/main/resources/static/css/ecom.css
+++ b/prototype/src/main/resources/static/css/ecom.css
@@ -252,6 +252,28 @@ table tr:nth-child(2n+1) {
background-color: var(--c-base-highlight);
}
+table.key-value {
+ width: inherit;
+ border-collapse: collapse;
+}
+
+table.key-value th {
+ text-align: right;
+ font-family: "Fira Mono";
+ text-transform: uppercase;
+ background-color: var(--c-base);
+ color: var(--c-black);
+}
+
+table.key-value tr {
+ background-color: var(--c-base);
+}
+
+table.key-value td {
+ text-align: left;
+}
+
+
img.xs {
width: var(--u2);
@@ -462,6 +484,22 @@ fieldset label {
width: 100%;
}
+.flowflex {
+ display: flex;
+ flex-direction: row;
+ justify-content: stretch;
+ flex-wrap: wrap;
+}
+.flowflex > * {
+ padding: var(--u0);
+ flex: 1;
+}
+.flowflex > *.spacer {
+ padding-top: 0px;
+ padding-bottom: 0px;
+}
+
+
.detailflex {
display: flex;
flex-direction: row;
@@ -776,6 +814,28 @@ fieldset label {
* CONTENT
*/
+.notification {
+
+}
+
+.notification:hover {
+ background-color: var(--c-base-highlight);
+}
+
+.notification.unread {
+ background-color: var(--c-primary);
+}
+
+.notification.unread > * {
+ --c-primary: var(--root-c-primary-highlight);
+ --c-primary-highlight: var(--root-c-primary);
+}
+
+
+.notification.unread:hover {
+ background-color: var(--c-primary);
+}
+
.card {
padding: var(--u0);
background-color: var(--c-primary);
diff --git a/prototype/src/main/resources/templates/user/notifications/id.html b/prototype/src/main/resources/templates/user/notifications/id.html
deleted file mode 100644
index e69de29..0000000
diff --git a/prototype/src/main/resources/templates/user/notifications/index.html b/prototype/src/main/resources/templates/user/notifications/index.html
index e69de29..57f2957 100644
--- a/prototype/src/main/resources/templates/user/notifications/index.html
+++ b/prototype/src/main/resources/templates/user/notifications/index.html
@@ -0,0 +1,91 @@
+
+
+
+
+ Meine Benachrichtigungen
+ Header
+
+
+