From d19f5c4847bbde87cba699b93cef3b2dd75cb10d Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Thu, 23 Jan 2020 12:08:19 -0500
Subject: [PATCH] WIP1

---
 backend/build.gradle                                         | 5 +++++
 .../shibboleth/admin/ui/controller/RootUiViewController.java | 2 +-
 ui/src/index.html                                            | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/build.gradle b/backend/build.gradle
index 3c3cacec0..b800d20ef 100644
--- a/backend/build.gradle
+++ b/backend/build.gradle
@@ -89,8 +89,13 @@ bootWar {
                 "Implementation-Version" : "${project.version}"
         )
     }
+    from(tasks.findByPath(':ui:npm_run_buildProd').outputs) {
+        into 'WEB-INF/classes/templates'
+        include 'index.html'
+    }
     from(tasks.findByPath(':ui:npm_run_buildProd').outputs) {
         into 'WEB-INF/classes/resources'
+        //include 'index.html'
     }
     archiveName = "${baseName}-${version}.war"
 }
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java
index b0ef4984c..b5968a7e5 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java
@@ -8,6 +8,6 @@ public class RootUiViewController {
 
     @RequestMapping("/")
     public String index() {
-        return "redirect:/index.html";
+        return "index";
     }
 }
diff --git a/ui/src/index.html b/ui/src/index.html
index d1bacd083..4a7de4520 100644
--- a/ui/src/index.html
+++ b/ui/src/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <title>Shibboleth IDP UI</title>
   <!--<base th:href="#{app.baseHref}" href="/"> -->
-    <base href="./">
+    <base href="/">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">