diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js index 1ceac6e..13253ee 100644 --- a/frontend/quasar.conf.js +++ b/frontend/quasar.conf.js @@ -109,7 +109,7 @@ module.exports = function (ctx) { API: JSON.stringify('http://localhost:8080') } : { // Base URL for API-Calls: PRODUCTION (build) - //API: JSON.stringify('http://seserver.se.hs-heilbronn.de:8090/buga19geocaching') + //API: JSON.stringify('http://seserver.se.hs-heilbronn.de:9080/buga19geocaching') API: JSON.stringify('http://localhost:8080') } }, diff --git a/frontend/src/pages/CacheStart.vue b/frontend/src/pages/CacheStart.vue index fadcfb1..5880e30 100644 --- a/frontend/src/pages/CacheStart.vue +++ b/frontend/src/pages/CacheStart.vue @@ -97,7 +97,8 @@ params.cacheID = this.result.split('/')[0]; params.stationID = this.result.split('/')[1]; params.durchgefuehrterCacheID = this.cacheID; - console.log(params.cacheID + " und " + params.stationID); + console.log("CacheID: " + params.cacheID + " und StationID: " + params.stationID); + console.log(params.durchgefuehrterCacheID); if (localStorage.getItem('userToken')) { params.token = JSON.parse(localStorage.getItem('userToken')).token; } diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue index 6a80aa9..318552a 100644 --- a/frontend/src/pages/Register.vue +++ b/frontend/src/pages/Register.vue @@ -110,7 +110,7 @@ console.log("POST /api/register/ - json: " + JSON.stringify(data)); const token = JSON.parse(localStorage.getItem('registerToken')).token; - this.$axios.post('http://www.se.hs-heilbronn.de:8090/buga19usermanagement/account/register', data,{ + this.$axios.post('http://www.se.hs-heilbronn.de:9080/buga19usermanagement/account/register', data,{ headers: { 'Authorization': 'Bearer ' + token, } @@ -167,7 +167,7 @@ console.log("GET /api/login/ - json: " + JSON.stringify(logindata)); - this.$axios.post('http://www.se.hs-heilbronn.de:8090/buga19usermanagement/account/login', logindata) + this.$axios.post('http://www.se.hs-heilbronn.de:9080/buga19usermanagement/account/login', logindata) .then((response) => { localStorage.setItem('registerToken', JSON.stringify(response.data)); }) diff --git a/frontend/src/pages/StationView.vue b/frontend/src/pages/StationView.vue index 450e925..e55a014 100644 --- a/frontend/src/pages/StationView.vue +++ b/frontend/src/pages/StationView.vue @@ -122,7 +122,8 @@ let params = {}; params.cacheID = this.result.split('/')[0]; params.stationID = this.result.split('/')[1]; - params.durchgefuehrterCacheID = this.cacheID; + params.durchgefuehrterCacheID = params.cacheID; + console.log(params.durchgefuehrterCacheID); console.log(params.cacheID + " und " + params.stationID); if (localStorage.getItem('userToken')) { params.token = JSON.parse(localStorage.getItem('userToken')).token; diff --git a/frontend/src/store/currentCache/actions.js b/frontend/src/store/currentCache/actions.js new file mode 100644 index 0000000..4787a5f --- /dev/null +++ b/frontend/src/store/currentCache/actions.js @@ -0,0 +1,4 @@ +/* +export function someAction (context) { +} +*/ diff --git a/frontend/src/store/currentCache/getters.js b/frontend/src/store/currentCache/getters.js new file mode 100644 index 0000000..cc054a3 --- /dev/null +++ b/frontend/src/store/currentCache/getters.js @@ -0,0 +1,4 @@ +/* +export function someGetter (state) { +} +*/ diff --git a/frontend/src/store/currentCache/index.js b/frontend/src/store/currentCache/index.js new file mode 100644 index 0000000..b41a219 --- /dev/null +++ b/frontend/src/store/currentCache/index.js @@ -0,0 +1,12 @@ +import state from './state' +import * as getters from './getters' +import * as mutations from './mutations' +import * as actions from './actions' + +export default { + namespaced: true, + state, + getters, + mutations, + actions +} diff --git a/frontend/src/store/currentCache/mutations.js b/frontend/src/store/currentCache/mutations.js new file mode 100644 index 0000000..63131e2 --- /dev/null +++ b/frontend/src/store/currentCache/mutations.js @@ -0,0 +1,4 @@ +/* +export function someMutation (state) { +} +*/ diff --git a/frontend/src/store/currentCache/state.js b/frontend/src/store/currentCache/state.js new file mode 100644 index 0000000..dbc1d63 --- /dev/null +++ b/frontend/src/store/currentCache/state.js @@ -0,0 +1,5 @@ +export default { + cache: {}, + currentCacheID: null, + currentStationID: null, +}