fix base-path

relate to #46

Author: tchiotludo

.travis.yml

@@ -22,8 +22,6 @@ cache:
 
 script:
   - set -e
-  # Docker Login
-  - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
   # Gradle
   - ./gradlew --console=plain test
   - ./gradlew --console=plain shadowJar
@@ -32,14 +30,17 @@ script:
   - docker build . -t $TRAVIS_COMMIT
   # Docker Tag
   - if [ ! -z "$TRAVIS_TAG" ]; then
+      echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin;
       docker tag $TRAVIS_COMMIT tchiotludo/kafkahq:$TRAVIS_TAG;
       docker push tchiotludo/kafkahq:$TRAVIS_TAG;
     fi
   # Docker Branch
   - if [ "$TRAVIS_BRANCH" == "master" ]; then
+      echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin;
       docker tag $TRAVIS_COMMIT tchiotludo/kafkahq:latest;
       docker push tchiotludo/kafkahq:latest;
     elif [ "$TRAVIS_BRANCH" == "dev" ]; then
+      echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin;
       docker tag $TRAVIS_COMMIT tchiotludo/kafkahq:$TRAVIS_BRANCH;
       docker push tchiotludo/kafkahq:$TRAVIS_BRANCH;
     fi

src/main/java/org/kafkahq/App.java

@@ -3,21 +3,6 @@
 import io.micronaut.runtime.Micronaut;
 
 public class App {
-    // route
-    {
-        /*
-        use(new Whoops());
-
-        use("*", new RequestLogger()
-            .latency()
-            .extended()
-        );
-
-        assets("/favicon.ico");
-        });
-        */
-    }
-
     public static void main(String[] args) {
         Micronaut.run(App.class);
     }

src/main/java/org/kafkahq/controllers/SchemaController.java

@@ -79,9 +79,9 @@ public HttpResponse createSubmit(String cluster,
         URI redirect;
 
         if (toast.getType() != Toast.Type.error) {
-            redirect = new URI("/" + cluster + "/schema/" + subject);
+            redirect = this.uri("/" + cluster + "/schema/" + subject);
         } else {
-            redirect = new URI("/" + cluster + "/schema/create");
+            redirect = this.uri("/" + cluster + "/schema/create");
         }
 
         return response.status(HttpStatus.MOVED_PERMANENTLY)

src/main/resources/views/errors/notFound.ftl

@@ -20,7 +20,7 @@
     </p>
 
     <div class="text-right mt-5">
-        <a href="/" class="btn btn-primary btn-lg">Back to home</a>
+        <a href="${basePath}" class="btn btn-primary btn-lg">Back to home</a>
     </div>
 </div>
 

src/main/resources/views/includes/template.ftl

@@ -88,7 +88,7 @@
                                 ${username} (Logout)
                             </a>
                         <#else>
-                            <a href="${basePath}/login">
+                            <a href="${basePath}/login" data-turbolinks="false">
                                 <i class="fa fa-fw fa-sign-in" aria-hidden="true"></i>
                                 Login
                             </a>