diff --git a/pom.xml b/pom.xml
index b0bf92e..1081eee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
com.codingchili
excelastic
- 1.3.4
+ 1.3.5
@@ -57,25 +57,25 @@
io.vertx
vertx-core
- 3.5.4
+ 3.6.3
io.vertx
vertx-unit
- 3.5.4
+ 3.6.3
io.vertx
vertx-web
- 3.5.4
+ 3.6.3
io.vertx
vertx-web-templ-jade
- 3.5.4
+ 3.6.3
@@ -87,13 +87,13 @@
org.apache.poi
poi
- 3.17
+ 4.0.1
org.apache.poi
poi-ooxml
- 3.17
+ 4.0.1
diff --git a/src/main/java/com/codingchili/ApplicationLauncher.java b/src/main/java/com/codingchili/ApplicationLauncher.java
index 3ad82af..9cc506b 100644
--- 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
index 918790f..f2f9840 100644
--- 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 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
index 9bf3fb7..3285f2c 100644
--- 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
index d4e7ceb..0489cb5 100644
--- 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;
}
\ No newline at end of file