From c379656f3eff4eadc7f524ff50c5421ea477ea8a Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Tue, 25 Aug 2020 04:27:27 +0200 Subject: [PATCH] Sidewards compatibility with pluginify --- src/App.vue | 12 +++++------ src/plugins/routes.js | 8 ++++---- src/store/modules/barUsers.js | 26 ++++++++++++------------ src/store/modules/finanzerUsers.js | 18 ++++++++-------- src/store/modules/jobInvites.js | 10 ++++----- src/store/modules/jobRequests.js | 6 +++--- src/store/modules/jobkindManager.js | 8 ++++---- src/store/modules/jobs.js | 8 ++++---- src/store/modules/login.js | 26 ++++++++++++------------ src/store/modules/pricelist.js | 16 +++++++-------- src/store/modules/serviceManagement.js | 10 ++++----- src/store/modules/user.js | 16 +++++++-------- src/store/modules/userManager.js | 12 +++++------ src/store/modules/workgroupManagement.js | 8 ++++---- 14 files changed, 92 insertions(+), 92 deletions(-) diff --git a/src/App.vue b/src/App.vue index 10e70c6..f1720e7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -65,7 +65,7 @@ :items="lifeTimes" item-text="text" item-value="value" - v-model="selectLifeTime" + v-model="selectLifetime" return-object /> @@ -90,7 +90,7 @@ export default { render: 0, timer: null, change: false, - selectLifeTime: { text: '30 Minuten', value: 1800 }, + selectLifetime: { text: '30 Minuten', value: 1800 }, lifeTimes: [ { text: '5 Minuten', @@ -140,20 +140,20 @@ export default { }), created() { if (this.isLoggedIn) { - this.getLifeTime() + this.getLifetime() } this.timer = setInterval(this.test, 1000) }, methods: { - ...mapActions(['setLifeTime', 'saveLifeTime', 'logout', 'getLifeTime']), + ...mapActions(['setLifetime', 'saveLifetime', 'logout', 'getLifetime']), test() { if (this.isLoggedIn) { if (this.lifeTime == 0) this.logout() - this.setLifeTime(this.lifeTime - 1) + this.setLifetime(this.lifeTime - 1) } }, save() { - this.saveLifeTime(this.selectLifeTime.value) + this.saveLifetime(this.selectLifetime.value) this.change = false } }, diff --git a/src/plugins/routes.js b/src/plugins/routes.js index 9fbb4d4..6282c3d 100644 --- a/src/plugins/routes.js +++ b/src/plugins/routes.js @@ -1,8 +1,8 @@ //const main = 'https://192.168.5.128:5000/' //const main = 'http://localhost:5000/' //const main = 'http://192.168.5.118:5000/' -const main = 'https://groeger-clan.duckdns.org:5000/' -//const main = 'https://flaschengeist.wu5.de:5000/' +//const main = 'https://groeger-clan.duckdns.org:5000/' +const main = 'https://flaschengeist.wu5.de:5000/' const url = { login: main + 'login', @@ -25,8 +25,8 @@ const url = { finanzerSendOneMail: main + 'finanzerSendOneMail', userMain: main + 'user/main', userAddAmount: main + 'user/addAmount', - saveLifeTime: main + 'saveLifeTime', - getLifeTime: main + 'getLifeTime', + saveLifetime: main + 'setLifetime', + getLifetime: main + 'getLifetime', resetPassword: main + 'passwordReset', freeDrinkListConfig: main + 'freeDrinkListConfig', freeDrinkListHistory: main + 'freeDrinkListHistory', diff --git a/src/store/modules/barUsers.js b/src/store/modules/barUsers.js index e6c1eda..1971017 100644 --- a/src/store/modules/barUsers.js +++ b/src/store/modules/barUsers.js @@ -160,14 +160,14 @@ const actions = { timeout }) commit('setUsers', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) } if (e.response) if (e.response.status === 401) { - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) location.reload() } } @@ -191,7 +191,7 @@ const actions = { amount: data.amount, error: false }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { console.log(typeof e) for (const [key, value] of Object.entries(e)) { @@ -207,7 +207,7 @@ const actions = { }) if (e.response) if (e.response.status === 401) { - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) location.reload() } } @@ -230,14 +230,14 @@ const actions = { { headers: { Token: rootState.login.user.accessToken }, timeout } ) commit('setUsers', { [response.data.username]: response.data }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) } if (e.response) if (e.response.status === 401) { - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) location.reload() } } @@ -259,14 +259,14 @@ const actions = { timeout }) commit('setAllUsers', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) } if (e.response) if (e.response.data === 401) { - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) location.reload() } } @@ -285,14 +285,14 @@ const actions = { ) commit('setUsers', { [response.data.username]: response.data }) commit('updateMessage', { date: data.date, storno: true }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) } if (e.response) if (e.response.status === 401) { - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) location.reload() } } @@ -311,7 +311,7 @@ const actions = { } if (e.response) if (e.response.status === 401) { - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) location.reload() } } @@ -330,7 +330,7 @@ const actions = { } if (e.response) if (e.response.status === 401) { - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) location.reload() } } @@ -356,7 +356,7 @@ const actions = { } if (e.response) if (e.response.status === 401) { - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) location.reload() } } diff --git a/src/store/modules/finanzerUsers.js b/src/store/modules/finanzerUsers.js index ec9b33a..51d0289 100644 --- a/src/store/modules/finanzerUsers.js +++ b/src/store/modules/finanzerUsers.js @@ -257,7 +257,7 @@ const actions = { timeout }) commit('setAllUsers', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (err) { if (err.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -276,7 +276,7 @@ const actions = { timeout }) commit('setUsers', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (err) { if (err.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -310,7 +310,7 @@ const actions = { locked: response.data.locked, username: data.user.username }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (err) { if (err.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -341,7 +341,7 @@ const actions = { locked: response.data.locked, username: data.user.username }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (err) { if (err.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -361,7 +361,7 @@ const actions = { { headers: { Token: rootState.login.user.accessToken }, timeout } ) commit('updateUsers', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -384,7 +384,7 @@ const actions = { { headers: { Token: rootState.login.user.accessToken }, timeout } ) commit('updateUsers', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -403,7 +403,7 @@ const actions = { { headers: { Token: rootState.login.user.accessToken }, timeout } ) commit('setUsers', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -421,7 +421,7 @@ const actions = { timeout: 60000 }) commit('setMails', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -440,7 +440,7 @@ const actions = { { headers: { Token: rootState.login.user.accessToken }, timeout } ) commit('setMail', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) diff --git a/src/store/modules/jobInvites.js b/src/store/modules/jobInvites.js index 8ba94ee..d3de850 100644 --- a/src/store/modules/jobInvites.js +++ b/src/store/modules/jobInvites.js @@ -265,7 +265,7 @@ const actions = { }) }) commit('setJobInvitesLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -283,7 +283,7 @@ const actions = { }) commit('setJobInvitesFromMe', response.data) commit('setJobInvitesLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -312,7 +312,7 @@ const actions = { from_me: false }) commit('setDayLoading', { date, getters, value: false }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) commit('setJobInvitesLoading', false) } catch (e) { if (e.message == 'Network Error') { @@ -342,7 +342,7 @@ const actions = { getters }) commit('setDayLoading', { date, getters, value: false }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) commit('setJobInvitesLoading', false) } catch (e) { if (e.message == 'Network Error') { @@ -360,7 +360,7 @@ const actions = { timeout }) commit('updateJobInviteToMe', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) commit('setJobInvitesLoading', false) } catch (e) { if (e.message == 'Network Error') { diff --git a/src/store/modules/jobRequests.js b/src/store/modules/jobRequests.js index a6f4c27..65b0ffa 100644 --- a/src/store/modules/jobRequests.js +++ b/src/store/modules/jobRequests.js @@ -265,7 +265,7 @@ const actions = { }) }) commit('setJobRequestsLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -283,7 +283,7 @@ const actions = { }) commit('setJobRequestsFromMe', response.data) commit('setJobRequestsLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -311,7 +311,7 @@ const actions = { ) commit('updateJobRequestToMe', response.data) commit('setJobRequestsLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) diff --git a/src/store/modules/jobkindManager.js b/src/store/modules/jobkindManager.js index 4e03d07..3ec1ebf 100644 --- a/src/store/modules/jobkindManager.js +++ b/src/store/modules/jobkindManager.js @@ -46,7 +46,7 @@ const actions = { }) commit('setJobkinds', response.data) commit('setJobkindsLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -65,7 +65,7 @@ const actions = { ) commit('updateJobKind', response.data) commit('setJobkindsLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -84,7 +84,7 @@ const actions = { ) commit('updateJobKind', response.data) commit('setJobkindsLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -103,7 +103,7 @@ const actions = { ) commit('deleteJobKind', data) commit('setJobkindsLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) diff --git a/src/store/modules/jobs.js b/src/store/modules/jobs.js index 1aec212..85ae0e9 100644 --- a/src/store/modules/jobs.js +++ b/src/store/modules/jobs.js @@ -306,7 +306,7 @@ const actions = { users: response.data, username: rootState.login.user.username }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -383,7 +383,7 @@ const actions = { getters }) commit('setDayNotLoading', { date, getters }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -412,7 +412,7 @@ const actions = { getters }) commit('setDayNotLoading', { date, getters }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -429,7 +429,7 @@ const actions = { { ...data }, { headers: { Token: rootState.login.user.accessToken }, timeout } ) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) diff --git a/src/store/modules/login.js b/src/store/modules/login.js index 910e03c..fa78076 100644 --- a/src/store/modules/login.js +++ b/src/store/modules/login.js @@ -34,7 +34,7 @@ const mutations = { } else { state.user.username = data.username state.user.accessToken = data.accessToken - state.user.group = data.group + state.user.group = data.groups state.user.firstname = data.firstname state.user.lastname = data.lastname } @@ -52,7 +52,7 @@ const mutations = { setCookieAccepted(state, value) { state.cookieAccepted = value }, - setLifeTime(state, value) { + setLifetime(state, value) { state.lifeTime = value } } @@ -73,8 +73,8 @@ const actions = { 'user', JSON.stringify({ username: response.data.username, - accessToken: response.data.token, - group: response.data.group, + accessToken: response.data.accessToken, + group: response.data.groups, firstname: response.data.firstname, lastname: response.data.lastname }) @@ -132,17 +132,17 @@ const actions = { var cookie = localStorage.getItem('cookie:accepted') commit('setCookieAccepted', cookie) }, - setLifeTime({ commit }, value) { - commit('setLifeTime', value) + setLifetime({ commit }, value) { + commit('setLifetime', value) }, - async saveLifeTime({ commit, rootState, dispatch }, value) { + async saveLifetime({ commit, rootState, dispatch }, value) { try { const response = await axios.post( - url.saveLifeTime, + url.saveLifetime, { value: value }, { headers: { Token: rootState.login.user.accessToken }, timeout } ) - commit('setLifeTime', response.data.value) + commit('setLifetime', response.data.value) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -151,18 +151,18 @@ const actions = { if (e.response.status === 401) dispatch('logout', null, { root: true }) } }, - async getLifeTime({ commit, rootState, dispatch }) { + async getLifetime({ commit, rootState, dispatch }) { try { if (!rootState.login.user.accessToken) { return } - const response = await axios.get(url.getLifeTime, { + const response = await axios.get(url.getLifetime, { headers: { Token: rootState.login.user.accessToken }, timeout }) - commit('setLifeTime', response.data.value) + commit('setLifetime', response.data.value) var user = JSON.parse(localStorage.getItem('user')) - user.group = response.data.group + user.group = response.data.groups localStorage.setItem('user', JSON.stringify(user)) commit('updateAccessToken', user) dispatch('barUsers/setLockStatus', response.data.lock_bar, { diff --git a/src/store/modules/pricelist.js b/src/store/modules/pricelist.js index 77ddcba..b87a8e4 100644 --- a/src/store/modules/pricelist.js +++ b/src/store/modules/pricelist.js @@ -101,7 +101,7 @@ const actions = { const response = await axios.get(url.pricelist, { timeout }) commit('setPriceList', response.data) commit('setPriceListLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -115,7 +115,7 @@ const actions = { const response = await axios.get(url.getTypes, { timeout }) commit('setTypes', response.data) commit('setTypesLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -133,7 +133,7 @@ const actions = { ) commit('updatePriceList', response.data) commit('setPriceListLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -153,7 +153,7 @@ const actions = { ) commit('updatePriceList', response.data) commit('setPriceListLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -173,7 +173,7 @@ const actions = { ) commit('deleteDrinkPrice', data) commit('setPriceListLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -193,7 +193,7 @@ const actions = { ) commit('updateDrinkType', response.data) commit('setTypesLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -213,7 +213,7 @@ const actions = { ) commit('updateDrinkType', response.data) commit('setTypesLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -233,7 +233,7 @@ const actions = { ) commit('deleteDrinkType', data) commit('setTypesLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) diff --git a/src/store/modules/serviceManagement.js b/src/store/modules/serviceManagement.js index c2a32db..d9cef29 100644 --- a/src/store/modules/serviceManagement.js +++ b/src/store/modules/serviceManagement.js @@ -274,7 +274,7 @@ const actions = { timeout }) commit('setAllUsers', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -296,7 +296,7 @@ const actions = { } ) //commit('updateMonth', { ...response.data[0], com: 'add' }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -355,7 +355,7 @@ const actions = { { headers: { Token: rootState.login.user.accessToken }, timeout } ) //commit('updateMonth', { ...data, com: 'delete' }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -382,7 +382,7 @@ const actions = { date, getters }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -404,7 +404,7 @@ const actions = { ) commit('updateMonthJobkind', { data: response.data, date, getters }) commit('setDayNotLoading', { date, getters }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 2f91407..7e4d467 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -223,7 +223,7 @@ const actions = { }) commit('setUser', response.data) commit('setError', '') - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -248,7 +248,7 @@ const actions = { error: false }) commit('setError', '') - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -274,7 +274,7 @@ const actions = { console.log(response.data) commit('setUser', response.data) commit('setError', { value: 'Daten gespeichert', error: false }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -300,7 +300,7 @@ const actions = { { headers: { Token: rootState.login.user.accessToken }, timeout } ) commit('updateDay', { ...response.data, date: data.date }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -326,7 +326,7 @@ const actions = { ) commit('setUser', response.data) commit('updateMessage', { date: data.date, storno: true }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -343,7 +343,7 @@ const actions = { timeout }) commit('setStatus', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -359,7 +359,7 @@ const actions = { timeout }) commit('setTokens', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -375,7 +375,7 @@ const actions = { timeout }) commit('setTokens', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) diff --git a/src/store/modules/userManager.js b/src/store/modules/userManager.js index 3ab8f0b..60c11d0 100644 --- a/src/store/modules/userManager.js +++ b/src/store/modules/userManager.js @@ -82,7 +82,7 @@ const actions = { }) commit('setUsers', response.data) commit('setUsersLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -101,7 +101,7 @@ const actions = { }) commit('setUsers', response.data) commit('setUsersLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -120,7 +120,7 @@ const actions = { }) commit('setStatus', response.data) commit('setStatusLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -140,7 +140,7 @@ const actions = { ) commit('updateUser', response.data) commit('setUsersLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -160,7 +160,7 @@ const actions = { ) commit('updateUser', response.data) commit('setUsersLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -180,7 +180,7 @@ const actions = { ) commit('updateWorkgroups', { id: data.id, workgroups: response.data }) commit('setUsersLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) diff --git a/src/store/modules/workgroupManagement.js b/src/store/modules/workgroupManagement.js index c43f41e..7fa0a79 100644 --- a/src/store/modules/workgroupManagement.js +++ b/src/store/modules/workgroupManagement.js @@ -46,7 +46,7 @@ const actions = { }) commit('setWorkgroups', response.data) commit('setWorkgroupLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -66,7 +66,7 @@ const actions = { ) commit('updateWorkgroup', response.data) commit('setWorkgroupLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -85,7 +85,7 @@ const actions = { ) commit('updateWorkgroup', repsonse.data) commit('setWorkgroupLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -104,7 +104,7 @@ const actions = { ) commit('deleteWorkgroup', data) commit('setWorkgroupLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true })