Configure website-service correctly serving angular website

website-service/.gitignore

@@ -4,4 +4,4 @@ target/
 !**/src/test/**/target/
 
 # That you can not accidentally commit this folder
-src/main/resources/angular
+src/main/resources/static

website-service/src/main/kotlin/com/michibaum/websiteservice/AngularConfig.java

@@ -0,0 +1,31 @@
+package com.michibaum.websiteservice;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.resource.PathResourceResolver;
+
+import java.io.IOException;
+
+@Configuration
+public class AngularConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+        registry.addResourceHandler("/**")
+                .addResourceLocations("classpath:/static/")
+                .resourceChain(true)
+                .addResolver(new PathResourceResolver() {
+                    @Override
+                    protected Resource getResource(String resourcePath, Resource location) throws IOException {
+                        Resource requestedResource = location.createRelative(resourcePath);
+                        return requestedResource.exists() && requestedResource.isReadable() ? requestedResource
+                                : new ClassPathResource("/static/index.html");
+                    }
+                });
+
+    }
+}

website-service/src/main/resources/application.yml

@@ -18,10 +18,6 @@ spring:
           include-description: true
   main:
     allow-bean-definition-overriding: true
-  web:
-    resources:
-      static-locations: classpath:/angular/browser
-
 
 eureka:
   instance:

website/angular.json

@@ -18,7 +18,10 @@
         "build": {
           "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "../website-service/src/main/resources/angular",
+            "outputPath": {
+              "base": "../website-service/src/main/resources/static",
+              "browser": ""
+            },
             "index": "src/index.html",
             "browser": "src/main.ts",
             "polyfills": [

website/src/app/core/services/auth.service.ts

@@ -5,11 +5,12 @@ import {ActivatedRouteSnapshot, Router} from "@angular/router";
 import {Authentication, AuthenticationResponse} from "../models/authentication.model";
 import {environment} from "../../../environments/environment";
 import {Sides} from "../config/sides";
+import {RouternavigationService} from "./router-navigation.service";
 
 @Injectable({providedIn: 'root'})
 export class AuthService {
 
-  constructor(private http: HttpClient, private router:Router) {
+  constructor(private http: HttpClient, private router:Router, private routernavigationService: RouternavigationService) {
   }
 
   login(username:string, password:string ) {
@@ -39,7 +40,7 @@ export class AuthService {
     let jwtIsPresent = this.jwtIsPresent();
 
     if (!jwtIsPresent) {
-      this.router.navigate(['/login']);
+      this.routernavigationService.login()
       return false;
     }
 

website/src/app/core/services/router-navigation.service.ts

@@ -11,26 +11,30 @@ export class RouternavigationService {
   }
 
   home() {
-    this.router.navigate(['/home'], {skipLocationChange: true});
+    this.router.navigate(['/home']);
   }
 
   github() {
     open('https://github.com/MichiBaum');
   }
 
   imprint() {
-    this.router.navigate(['/imprint'], { skipLocationChange: true });
+    this.router.navigate(['/imprint']);
   }
 
   chess() {
-    this.router.navigate(['/chess'], { skipLocationChange: true });
+    this.router.navigate(['/chess']);
   }
 
   open(url: string) {
     window.open(url, '_blank');
   }
 
   microservices() {
-    this.router.navigate(['/microservices'], { skipLocationChange: true })
+    this.router.navigate(['/microservices'])
+  }
+
+  login() {
+    this.router.navigate(['/login']);
   }
 }