fixed git problems
This commit is contained in:
parent
33ed2e32b9
commit
2b691fa6f3
@ -109,7 +109,7 @@ module.exports = function (ctx) {
|
|||||||
API: JSON.stringify('http://localhost:8080')
|
API: JSON.stringify('http://localhost:8080')
|
||||||
}
|
}
|
||||||
: { // Base URL for API-Calls: PRODUCTION (build)
|
: { // 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')
|
API: JSON.stringify('http://localhost:8080')
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@ -97,7 +97,8 @@
|
|||||||
params.cacheID = this.result.split('/')[0];
|
params.cacheID = this.result.split('/')[0];
|
||||||
params.stationID = this.result.split('/')[1];
|
params.stationID = this.result.split('/')[1];
|
||||||
params.durchgefuehrterCacheID = this.cacheID;
|
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')) {
|
if (localStorage.getItem('userToken')) {
|
||||||
params.token = JSON.parse(localStorage.getItem('userToken')).token;
|
params.token = JSON.parse(localStorage.getItem('userToken')).token;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -110,7 +110,7 @@
|
|||||||
|
|
||||||
console.log("POST /api/register/ - json: " + JSON.stringify(data));
|
console.log("POST /api/register/ - json: " + JSON.stringify(data));
|
||||||
const token = JSON.parse(localStorage.getItem('registerToken')).token;
|
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: {
|
headers: {
|
||||||
'Authorization': 'Bearer ' + token,
|
'Authorization': 'Bearer ' + token,
|
||||||
}
|
}
|
||||||
@ -167,7 +167,7 @@
|
|||||||
|
|
||||||
console.log("GET /api/login/ - json: " + JSON.stringify(logindata));
|
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) => {
|
.then((response) => {
|
||||||
localStorage.setItem('registerToken', JSON.stringify(response.data));
|
localStorage.setItem('registerToken', JSON.stringify(response.data));
|
||||||
})
|
})
|
||||||
|
|||||||
@ -122,7 +122,8 @@
|
|||||||
let params = {};
|
let params = {};
|
||||||
params.cacheID = this.result.split('/')[0];
|
params.cacheID = this.result.split('/')[0];
|
||||||
params.stationID = this.result.split('/')[1];
|
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);
|
console.log(params.cacheID + " und " + params.stationID);
|
||||||
if (localStorage.getItem('userToken')) {
|
if (localStorage.getItem('userToken')) {
|
||||||
params.token = JSON.parse(localStorage.getItem('userToken')).token;
|
params.token = JSON.parse(localStorage.getItem('userToken')).token;
|
||||||
|
|||||||
4
frontend/src/store/currentCache/actions.js
Normal file
4
frontend/src/store/currentCache/actions.js
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
/*
|
||||||
|
export function someAction (context) {
|
||||||
|
}
|
||||||
|
*/
|
||||||
4
frontend/src/store/currentCache/getters.js
Normal file
4
frontend/src/store/currentCache/getters.js
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
/*
|
||||||
|
export function someGetter (state) {
|
||||||
|
}
|
||||||
|
*/
|
||||||
12
frontend/src/store/currentCache/index.js
Normal file
12
frontend/src/store/currentCache/index.js
Normal file
@ -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
|
||||||
|
}
|
||||||
4
frontend/src/store/currentCache/mutations.js
Normal file
4
frontend/src/store/currentCache/mutations.js
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
/*
|
||||||
|
export function someMutation (state) {
|
||||||
|
}
|
||||||
|
*/
|
||||||
5
frontend/src/store/currentCache/state.js
Normal file
5
frontend/src/store/currentCache/state.js
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
export default {
|
||||||
|
cache: {},
|
||||||
|
currentCacheID: null,
|
||||||
|
currentStationID: null,
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user