From c0845f835f4a77eb65a9bee4127099e026c6950d Mon Sep 17 00:00:00 2001 From: Timo Volkmann Date: Tue, 7 May 2019 12:56:04 +0200 Subject: [PATCH 01/12] bugfixes --- frontend/quasar.conf.js | 4 +- frontend/src/layouts/MyLayout.vue | 43 ++++++--- frontend/src/pages/Login.vue | 20 ++--- frontend/src/pages/Register.vue | 21 ++--- frontend/src/router/index.js | 67 +++++++++++++- frontend/src/router/routes.js | 119 +++++++++++++++++++++---- frontend/src/store/dialog/mutations.js | 3 + 7 files changed, 222 insertions(+), 55 deletions(-) diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js index 28e7ec3..dc84e20 100644 --- a/frontend/quasar.conf.js +++ b/frontend/quasar.conf.js @@ -109,8 +109,8 @@ module.exports = function (ctx) { }, env: ctx.dev ? { // Base URL for API-Calls: DEV - //API: JSON.stringify('http://localhost:8080') - API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19geocaching'), + API: JSON.stringify('http://localhost:8080'), + // API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19geocaching'), USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19usermanagement') } : { // Base URL for API-Calls: PRODUCTION (build) diff --git a/frontend/src/layouts/MyLayout.vue b/frontend/src/layouts/MyLayout.vue index 943c3f7..7d7815d 100644 --- a/frontend/src/layouts/MyLayout.vue +++ b/frontend/src/layouts/MyLayout.vue @@ -73,6 +73,7 @@ + + + + + Logout + + + - {{ loginText }} + Login @@ -177,22 +195,10 @@ name: "MyLayout", data() { return { - // dialog: { - // color: this, - // show: true, - // message: "Hallo Fehler! Dies ist ein Beispiel Fehler." - // }, leftDrawerOpen: this.$q.platform.is.desktop, - //menuButtonVisible: !this.$q.platform.is.desktop, - //leftDrawerOpen: true, - //miniState: true }; }, computed: { - loginText() { - let text = this.$store.state.auth.isAuthenticated ? "Logout" : "Login"; - return text; - }, dialogShow: { get() { // console.log("get dialogShow: "+this.$store.state.dialog.dialog.show) @@ -234,6 +240,17 @@ console.log("dialogClose(): ") this.$store.commit('dialog/RESET_MESSAGE_DIALOG'); }, + evalAuthentication: function () { + this.$store.commit('auth/SET_AUTHENTICATED'); + this.$store.commit('auth/SET_USER'); + }, + logout: function () { + console.log("logout()"); + console.log(JSON.parse(localStorage.getItem('userToken'))); + localStorage.removeItem('userToken'); + this.evalAuthentication(); + }, + } }; diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue index 56efa31..2159d3c 100644 --- a/frontend/src/pages/Login.vue +++ b/frontend/src/pages/Login.vue @@ -46,6 +46,16 @@ unelevated @click="logout" /> +
+ +
@@ -140,16 +150,6 @@ logout: function () { console.log("logout()"); console.log(JSON.parse(localStorage.getItem('userToken'))); - // this.$axios.get('/api/logout', { - // params: { - // token: JSON.parse(localStorage.getItem('userToken')) - // } - // }) - // .then((response) => { - // console.log("GET/POST /api/logout/ - response: " + response.data); - // }) - // .catch((error) => { - // }); localStorage.removeItem('userToken'); this.evalAuthentication(); }, diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue index a1d5b2c..33b487f 100644 --- a/frontend/src/pages/Register.vue +++ b/frontend/src/pages/Register.vue @@ -1,43 +1,43 @@ @@ -65,23 +61,21 @@ + + diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue index 814f108..ec2a41d 100644 --- a/frontend/src/pages/Login.vue +++ b/frontend/src/pages/Login.vue @@ -30,6 +30,7 @@ color="primary" class="full-width" @click="login" + @keyup.enter="login" unelevated > From 99499feb12fde11e50257d17877ff6f6ebd39164 Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Wed, 8 May 2019 13:13:31 +0200 Subject: [PATCH 11/12] Spring application fixed --- frontend/quasar.conf.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js index dc84e20..4df0238 100644 --- a/frontend/quasar.conf.js +++ b/frontend/quasar.conf.js @@ -114,9 +114,9 @@ module.exports = function (ctx) { USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19usermanagement') } : { // Base URL for API-Calls: PRODUCTION (build) - API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19geocaching'), + API: JSON.stringify('http://localhost:8080'), + //API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19geocaching'), USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19usermanagement') - //API: JSON.stringify('http://localhost:8080') } }, From 2c7d47e0f0df87f162edb5fa7dd3acec9158774f Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Wed, 8 May 2019 14:04:50 +0200 Subject: [PATCH 12/12] Fixed Delete Cache Method --- .../java/hhn/labsw/bugageocaching/controller/Controller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java index 928bef1..f80aea1 100644 --- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java +++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java @@ -378,7 +378,7 @@ public class Controller { @ApiResponse(code = 404, message = "Database error") }) @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose - @RequestMapping(value = "/api/deleteCache", method = RequestMethod.DELETE, produces = "application/json") + @RequestMapping(value = "/api/deleteCache", method = {RequestMethod.DELETE, RequestMethod.GET}, produces = "application/json") @ResponseBody public ResponseEntity deleteCache(@RequestParam String cacheID) { return deleteCacheUtil(cacheID);