From 5469482dd6ff9834dcfc28e780e0a3f9c2844ab4 Mon Sep 17 00:00:00 2001
From: Michael O'Brien <michael@obrienlabs.org>
Date: Mon, 1 Mar 2021 21:25:54 -0500
Subject: [PATCH] #1 - fix css

---
 README.md                                         |  4 ++++
 .../eventstream/field/controller/HealthApi.java   |  2 +-
 .../field/controller/HealthApiController.java     |  2 +-
 .../field/service/HealthApiDelegateService.java   |  2 +-
 .../field/swagger/OpenAPIDocumentationConfig.java |  2 +-
 src/main/resources/application.properties         |  3 ++-
 src/main/resources/static/css/main.css            | 15 +++++++++++++++
 src/main/resources/templates/welcome.html         |  4 ++--
 8 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 src/main/resources/static/css/main.css

diff --git a/README.md b/README.md
index 65f6f12..3ae323a 100644
--- a/README.md
+++ b/README.md
@@ -4,5 +4,9 @@ Event Stream
 launch
 http://127.0.0.1:8081/event/
 
+API
+http://127.0.0.1:8081/event/health/
+
 swagger
 http://127.0.0.1:8081/event/swagger-ui.html#/health-api-controller/health
+
diff --git a/src/main/java/systems/eventstream/field/controller/HealthApi.java b/src/main/java/systems/eventstream/field/controller/HealthApi.java
index aec010f..48999c9 100644
--- a/src/main/java/systems/eventstream/field/controller/HealthApi.java
+++ b/src/main/java/systems/eventstream/field/controller/HealthApi.java
@@ -30,7 +30,7 @@ default HealthApiDelegate getDelegate() {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "ok", response = Health.class),
         @ApiResponse(code = 200, message = "Unexpected error") })
-    @RequestMapping(value = "/health/",
+    @RequestMapping(value = "/health",
         produces = { "application/json" }, 
         method = RequestMethod.GET)
     default ResponseEntity<Health> health() {
diff --git a/src/main/java/systems/eventstream/field/controller/HealthApiController.java b/src/main/java/systems/eventstream/field/controller/HealthApiController.java
index 25edf6f..9e436c6 100644
--- a/src/main/java/systems/eventstream/field/controller/HealthApiController.java
+++ b/src/main/java/systems/eventstream/field/controller/HealthApiController.java
@@ -5,7 +5,7 @@
 import java.util.Optional;
 
 @Controller
-@RequestMapping("${openapi.backendATBStub.base-path:/v1}")
+@RequestMapping("/")
 public class HealthApiController implements HealthApi {
 
     private final HealthApiDelegate delegate;
diff --git a/src/main/java/systems/eventstream/field/service/HealthApiDelegateService.java b/src/main/java/systems/eventstream/field/service/HealthApiDelegateService.java
index 4be8874..b80c3b1 100644
--- a/src/main/java/systems/eventstream/field/service/HealthApiDelegateService.java
+++ b/src/main/java/systems/eventstream/field/service/HealthApiDelegateService.java
@@ -13,7 +13,7 @@ public class HealthApiDelegateService implements HealthApiDelegate {
 	public ResponseEntity<Health> health() {
 		Health health = new Health();
 		health.setKey("state");
-		health.setValue("ok");
+		health.setValue("OK");
 		return ResponseEntity.ok(health);
 	}
 }
diff --git a/src/main/java/systems/eventstream/field/swagger/OpenAPIDocumentationConfig.java b/src/main/java/systems/eventstream/field/swagger/OpenAPIDocumentationConfig.java
index bb7f295..78a5f9a 100644
--- a/src/main/java/systems/eventstream/field/swagger/OpenAPIDocumentationConfig.java
+++ b/src/main/java/systems/eventstream/field/swagger/OpenAPIDocumentationConfig.java
@@ -34,7 +34,7 @@ ApiInfo apiInfo() {
     }
 
     @Bean
-    public Docket customImplementation(ServletContext servletContext, @Value("${openapi.eventstream.base-path:/v1}") String basePath) {
+    public Docket customImplementation(ServletContext servletContext, @Value("") String basePath) {
         return new Docket(DocumentationType.SWAGGER_2)
                 .select()
                     .apis(RequestHandlerSelectors.basePackage("systems.eventstream.field"))
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index df6ec35..075e73f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -10,4 +10,5 @@ server.port=8081
 spring.jackson.date-format=systems.eventstream.field.swagger.RFC3339DateFormat
 spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false
 
-welcome.message=Event Stream
\ No newline at end of file
+welcome.message=Event Stream
+spring.thymeleaf.cache=false
\ No newline at end of file
diff --git a/src/main/resources/static/css/main.css b/src/main/resources/static/css/main.css
new file mode 100644
index 0000000..49aac82
--- /dev/null
+++ b/src/main/resources/static/css/main.css
@@ -0,0 +1,15 @@
+body {
+  padding-top: 5rem;
+}
+.starter-template {
+  padding: 3rem 1.5rem;
+  text-align: center;
+}
+
+h1{
+    color:#6060FF;
+}
+
+h2{
+    color:#FF6060;
+}
\ No newline at end of file
diff --git a/src/main/resources/templates/welcome.html b/src/main/resources/templates/welcome.html
index 78c43a1..4be7eab 100644
--- a/src/main/resources/templates/welcome.html
+++ b/src/main/resources/templates/welcome.html
@@ -13,9 +13,9 @@
 </nav>
 <main role="main" class="container">
     <div class="starter-template">
-        <h1>Event Stream</h1>
+        <h1>Report</h1>
         <h2>
-            <span th:text="'Hello, ' + ${message}"></span>
+            <span th:text="'Details for: ' + ${message}"></span>
         </h2>
     </div>
     <ol>