upgrade vertx + poi (support J9/J10) + change theme.

codingchili · Feb 11, 2019 · 665defb · 665defb
1 parent e256550
commit 665defb
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>com.codingchili</groupId>
     <artifactId>excelastic</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <build>
         <plugins>
             <plugin>
@@ -57,25 +57,25 @@
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-core</artifactId>
-            <version>3.5.4</version>
+            <version>3.6.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-unit</artifactId>
-            <version>3.5.4</version>
+            <version>3.6.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-web</artifactId>
-            <version>3.5.4</version>
+            <version>3.6.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-web-templ-jade</artifactId>
-            <version>3.5.4</version>
+            <version>3.6.3</version>
         </dependency>
 
         <dependency>
@@ -87,13 +87,13 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.17</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>3.17</version>
+            <version>4.0.1</version>
         </dependency>
 
     </dependencies>

diff --git a/src/main/java/com/codingchili/ApplicationLauncher.java b/src/main/java/com/codingchili/ApplicationLauncher.java
@@ -21,7 +21,7 @@
  */
 public class ApplicationLauncher {
     private final ApplicationLogger logger = new ApplicationLogger(getClass());
-    public static String VERSION = "1.3.4";
+    public static String VERSION = "1.3.5";
     private Vertx vertx;
 
     public static void main(String[] args) {

diff --git a/src/main/java/com/codingchili/Controller/Website.java b/src/main/java/com/codingchili/Controller/Website.java
@@ -10,7 +10,7 @@
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.*;
 import io.vertx.ext.web.handler.*;
-import io.vertx.ext.web.templ.JadeTemplateEngine;
+import io.vertx.ext.web.templ.jade.JadeTemplateEngine;
 
 import java.io.FileNotFoundException;
 import java.util.Iterator;
@@ -68,7 +68,7 @@ public void start(Future<Void> start) {
             context.next();
         });
 
-        router.route("/*").handler(TemplateHandler.create(JadeTemplateEngine.create()));
+        router.route("/*").handler(TemplateHandler.create(JadeTemplateEngine.create(vertx)));
         startWebsite(start, router);
     }
 

diff --git a/src/main/resources/templates/index.jade b/src/main/resources/templates/index.jade
@@ -12,9 +12,9 @@ html(lang='en')
                         span.badge.badge-pill.badge-primary(style="margin-top:-22px;")
                             | TLS ENABLED
                 else
-                    p.text-danger Not connected, #[a(href=".") refresh?]
+                    p Not connected, #[a(href=".") refresh?]
         div.col-xs-10.col-xs-offset-1.col-lg-4.col-lg-offset-4
-            .panel.panel-info
+            .panel.panel-primary
                 .panel-heading#panelheader Supported file types: #{context.supportedFiles}!
                 .panel-body
                     div#progress
@@ -42,13 +42,13 @@ html(lang='en')
                                 label.col-lg-2.control-label(for='clear')
                                 .col-xs-12
                                     .btn-group(data-toggle='buttons', style='display: flex; justify-content: space-evenly;')
-                                        label.btn.btn-info.active
+                                        label.btn.btn-primary.active
                                             input(type='radio', value='add', name='options', checked='')
                                             | Add values
-                                        label.btn.btn-info
+                                        label.btn.btn-primary
                                             input(type='radio', value='clear', name='options')
                                             | Clear existing
-                            label.btn.btn-block.btn-info.btn-file
+                            label.btn.btn-block.btn-primary.btn-file
                                 | UPLOAD
                                 input#file(type='file', name='file', style='display: none;')
         include scripts
diff --git a/src/main/resources/webroot/css/style.css b/src/main/resources/webroot/css/style.css
@@ -41,7 +41,7 @@ span.glyphicon {
 }
 
 body {
-    background-image: linear-gradient(to right, #fff, #9954bb);
+    background-image: linear-gradient(to right, #ff7b7b, #7a0098);
     height: 100%;
     margin: 0;
 }
@@ -51,19 +51,19 @@ html {
 }
 
 a:link {
-    color: #15569f;
+    color: #00004a;
 }
 
 a:visited {
-    color: #15569f;
+    color: #00004a;
 }
 
 a:hover {
-    color: #9954bb;
+    color: #00bbab;
     text-decoration: none;
 }
 
 a:active {
-    color: #9954bb;
+    color: #004236;
     text-decoration: none;
 }