From 6985b22e82b6fedf2a010f647ba9a5e15bcaf781 Mon Sep 17 00:00:00 2001 From: Hannes Date: Sun, 12 Jan 2020 16:14:01 +0100 Subject: [PATCH] update color and use fragments --- .../hso/ecommerce/app/RequestController.java | 8 +- .../resources/static/css/articleDetail.css | 8 +- .../resources/static/css/searchResults.css | 8 +- .../resources/templates/articleDetail.html | 109 ++++++------------ .../resources/templates/searchResults.html | 49 +------- 5 files changed, 56 insertions(+), 126 deletions(-) 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 d5c4527..8171c04 100644 --- a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java +++ b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java @@ -37,11 +37,11 @@ public class RequestController { return "greeting"; } - @GetMapping("/articledetail") - public String articledetail() { return "articledetail";} + @GetMapping("/articleDetail") + public String articleDetail() { return "articleDetail";} - @GetMapping("/searchresults") - public String searchresults() { return "searchresults";} + @GetMapping("/searchResults") + public String searchResults() { return "searchResults";} @GetMapping("/login") public String login(@CookieValue(value = "loginToken", defaultValue = "") String loginToken, Model model) { diff --git a/prototype/src/main/resources/static/css/articleDetail.css b/prototype/src/main/resources/static/css/articleDetail.css index ad62913..6eadefd 100644 --- a/prototype/src/main/resources/static/css/articleDetail.css +++ b/prototype/src/main/resources/static/css/articleDetail.css @@ -1,11 +1,11 @@ .articledetail { max-width: 100%; padding: 2em; - background-color: var(--root-c-secondary); + background-color: var(--c-primary); } .availability { - color: var(--c-primary); + color: var(--root-c-secondary); } .checkout { @@ -23,4 +23,8 @@ min-width: 5em; margin-bottom: 0px; padding-left: 15px; +} + +.checkout button { + background-color: var(--root-c-secondary); } \ No newline at end of file diff --git a/prototype/src/main/resources/static/css/searchResults.css b/prototype/src/main/resources/static/css/searchResults.css index b36808d..ae78c28 100644 --- a/prototype/src/main/resources/static/css/searchResults.css +++ b/prototype/src/main/resources/static/css/searchResults.css @@ -5,7 +5,7 @@ .searchresults { max-width: 100%; padding: 2em; - background-color: var(--root-c-secondary); + background-color: var(--c-white); border: 0px; } @@ -17,7 +17,7 @@ } .articlelist { - background-color: var(--root-c-secondary); + background-color: var(--c-white); } .article { @@ -34,12 +34,12 @@ h2 { .articlelink { color: var(--c-white); - background-color: var(--root-c-secondary); + background-color: var(--c-white); border: 0px; } .articlelink:hover { - color: var(--c-primary) + color: var(--root-c-secondary) } h1 { diff --git a/prototype/src/main/resources/templates/articleDetail.html b/prototype/src/main/resources/templates/articleDetail.html index 74cfa30..684fca6 100644 --- a/prototype/src/main/resources/templates/articleDetail.html +++ b/prototype/src/main/resources/templates/articleDetail.html @@ -1,5 +1,5 @@ - + e-commerce @@ -8,81 +8,44 @@ - -
+
-
-
-
- -
-
-

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

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

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/templates/searchResults.html b/prototype/src/main/resources/templates/searchResults.html index cf69e77..a24d3bc 100644 --- a/prototype/src/main/resources/templates/searchResults.html +++ b/prototype/src/main/resources/templates/searchResults.html @@ -1,5 +1,5 @@ - + e-commerce @@ -8,22 +8,7 @@ - +
@@ -46,7 +31,7 @@

-
+

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

-
+

@@ -83,7 +68,7 @@

-
+

@@ -99,28 +84,6 @@
- + \ No newline at end of file