From a9680e7ed3d545a36ac1f4485dca19cade3798c3 Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Tue, 20 Aug 2019 11:22:32 +0200
Subject: [PATCH] Exposed Vue resources from Spring app
---
gms-ui/.env.production | 2 +-
.../inaf/ia2/gms/authn/LoginController.java | 24 -------------------
.../gms/controller/HomePageController.java | 5 ++++
3 files changed, 6 insertions(+), 25 deletions(-)
delete mode 100644 gms/src/main/java/it/inaf/ia2/gms/authn/LoginController.java
diff --git a/gms-ui/.env.production b/gms-ui/.env.production
index 384270e..64c8364 100644
--- a/gms-ui/.env.production
+++ b/gms-ui/.env.production
@@ -1,2 +1,2 @@
VUE_APP_API_CLIENT = 'server'
-VUE_APP_API_BASE_URL = 'http://localhost:8081/'
+VUE_APP_API_BASE_URL = '/'
diff --git a/gms/src/main/java/it/inaf/ia2/gms/authn/LoginController.java b/gms/src/main/java/it/inaf/ia2/gms/authn/LoginController.java
deleted file mode 100644
index 190aaf0..0000000
--- a/gms/src/main/java/it/inaf/ia2/gms/authn/LoginController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package it.inaf.ia2.gms.authn;
-
-import java.security.Principal;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class LoginController {
-
- @Autowired
- private SessionData sessionData;
-
- @GetMapping("/login")
- public Principal start(Principal principal) {
- return principal;
- }
-
- @GetMapping(value = "/", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
- public Principal root(Principal principal) {
- return principal;
- }
-}
diff --git a/gms/src/main/java/it/inaf/ia2/gms/controller/HomePageController.java b/gms/src/main/java/it/inaf/ia2/gms/controller/HomePageController.java
index 294ed8c..d452076 100644
--- a/gms/src/main/java/it/inaf/ia2/gms/controller/HomePageController.java
+++ b/gms/src/main/java/it/inaf/ia2/gms/controller/HomePageController.java
@@ -36,4 +36,9 @@ public class HomePageController {
return ResponseEntity.ok(response);
}
+
+ @GetMapping(value = "/", produces = MediaType.TEXT_HTML_VALUE)
+ public String index() {
+ return "index.html";
+ }
}
--
GitLab