Merge branch 'develop' into frontend/robin

This commit is contained in:
rchrist 2019-04-19 18:03:31 +02:00
commit 0173cb28c6
2 changed files with 2 additions and 2 deletions

View File

@ -108,7 +108,7 @@ module.exports = function (ctx) {
}
: { // Base URL for API-Calls: PRODUCTION (build)
//API: JSON.stringify('http://se.hs-heilbronn.de:8090')
API: JSON.stringify('http://localhost:8080')
API: JSON.stringify('http://seserver.se.hs-heilbronn.de:8090/buga19geocaching')
}
},

View File

@ -123,7 +123,7 @@
},
methods: {
fetchUserCaches: function() {
const token = JSON.parse(localStorage.getItem('userToken'));
const token = JSON.parse(localStorage.getItem('userToken')).token;
this.$axios.get('/api/getMyCaches', { params: {token}} )
.then((response) => {
this.startedCaches = response.data;