Merge pull request #218 from integratedmodelling/IM-518-Error-in-k.hu…

…b-when-refreshing-a-page Fix 404 Error on Page Refresh
integratedmodelling · Jan 15, 2025 · 47dda2b · 47dda2b
2 parents 9718787 + cd5f445
commit 47dda2b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 14 deletions.
diff --git a/klab.hub/pom.xml b/klab.hub/pom.xml
@@ -260,12 +260,6 @@
 			<version>1.34.0</version>
 		</dependency>
 		<!-- ////////////////////////////////////////////////////////////////// -->
-		<dependency>
-		<groupId>org.keycloak</groupId>
-		<artifactId>keycloak-spring-boot-starter</artifactId>
-		<version>19.0.2</version>
-	</dependency>
-
 		<!--Dependencies for the unit tests -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>

diff --git a/klab.hub/src/main/java/org/integratedmodelling/klab/hub/controllers/FrontEndController.java b/klab.hub/src/main/java/org/integratedmodelling/klab/hub/controllers/FrontEndController.java
@@ -3,16 +3,13 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
 
 @Controller
 @RequestMapping("/")
 public class FrontEndController {
 
-    @GetMapping("/")
-    public ModelAndView home() {
-    	ModelAndView home = new ModelAndView();
-    	home.setViewName("/ui/index.html");
-    	return home;
+    @GetMapping({"/ui","/ui/{path:[^\\.]+}", "/ui/**/{path:[^\\.]+}"}) // Everything without point (something.smt is served as is)
+    public String forward() {
+        return "forward:/ui/index.html";
     }
 }
diff --git a/.../resources/static/ui/css/app.d2a88fe9.css → .../resources/static/ui/css/app.602cd4f9.css b/.../resources/static/ui/css/app.d2a88fe9.css → .../resources/static/ui/css/app.602cd4f9.css
diff --git a/klab.hub/src/main/resources/static/ui/index.html b/klab.hub/src/main/resources/static/ui/index.html
@@ -1,2 +1,2 @@
 <!DOCTYPE html><html><head><base href=/hub/ui/ ><title>k.Hub</title><meta charset=utf-8><meta name=description content=""><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png href=khub-logo.png><link rel=icon type=image/ico href=favicon.ico><link rel=apple-touch-icon sizes=57x57 href=icons/apple-icon-57x57.png><link rel=apple-touch-icon sizes=60x60 href=icons/apple-icon-60x60.png><link rel=apple-touch-icon sizes=72x72 href=icons/apple-icon-72x72.png><link rel=apple-touch-icon sizes=76x76 href=icons/apple-icon-76x76.png><link rel=apple-touch-icon sizes=114x114 href=icons/apple-icon-114x114.png><link rel=apple-touch-icon sizes=120x120 href=icons/apple-icon-120x120.png><link rel=apple-touch-icon sizes=144x144 href=icons/apple-icon-144x144.png><link rel=apple-touch-icon sizes=152x152 href=icons/apple-icon-152x152.png><link rel=apple-touch-icon sizes=180x180 href=icons/apple-icon-180x180.png><link rel=icon type=image/png sizes=192x192 href=icons/android-icon-192x192.png><link rel=icon type=image/png sizes=32x32 href=icons/favicon-32x32.png><link rel=icon type=image/png sizes=96x96 href=icons/favicon-96x96.png><link rel=icon type=image/png sizes=16x16 href=icons/favicon-16x16.png><link rel=manifest href=icons/manifest.json><meta name=msapplication-TileColor content=#ffffff><meta name=msapplication-TileImage content=icons/ms-icon-144x144.png><meta name=theme-color content=#ffffff><script>var environmentPath = "false" === "true" ? "/environments" : "./environments";
-    document.write("<script src='" + environmentPath + "' type='text/javascript'><\/script>");</script><script defer data-domain=integratedmodelling.org/hub src=https://plausible.integratedmodelling.org/js/script.js></script><link href=/hub/ui/css/vendor.d5f84891.css rel=stylesheet><link href=/hub/ui/css/app.d2a88fe9.css rel=stylesheet></head><body><div id=q-app></div><script src=/hub/ui/js/vendor.43e6402e.js></script><script src=/hub/ui/js/app.79b52333.js></script></body></html>
+    document.write("<script src='" + environmentPath + "' type='text/javascript'><\/script>");</script><script defer data-domain=integratedmodelling.org/hub src=https://plausible.integratedmodelling.org/js/script.js></script><link href=/hub/ui/css/vendor.d5f84891.css rel=stylesheet><link href=/hub/ui/css/app.602cd4f9.css rel=stylesheet></head><body><div id=q-app></div><script src=/hub/ui/js/vendor.43e6402e.js></script><script src=/hub/ui/js/app.7aa7cd8a.js></script></body></html>
diff --git a/klab.hub/src/main/resources/static/ui/js/app.7aa7cd8a.js b/klab.hub/src/main/resources/static/ui/js/app.7aa7cd8a.js