diff --git a/cert/server.crt b/cert/server.crt new file mode 100644 index 0000000..e804409 --- /dev/null +++ b/cert/server.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDazCCAlOgAwIBAgIJAJGH2ozWvd1RMA0GCSqGSIb3DQEBCwUAMFMxCzAJBgNV +BAYTAkRFMQ8wDQYDVQQIDAZTYXhvbnkxEDAOBgNVBAcMB0RyZXNkZW4xITAfBgNV +BAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDAxMTcwOTA0MDFaFw0z +MDAxMDQwOTA0MDFaMEQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZTYXhvbnkxEDAO +BgNVBAcMB0RyZXNkZW4xEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBALlkr1UOQypLKicESRnse52d5mAX9MjZQpH0/Y5u +V5WxpPSasmOpt4MRj5MWTfTK2ukj/jLtPAMsggUh7wMXb1uytHj7T5mtiahXBM0H +1sUi2nScXR6doQZlmqKWDGrVS7WHULM01WhirsnxI8S8e6Evpk4F5/RafKA8FgYI +Ongg6S1B16+7T0e/FnILoMjKr1jpgzXnVkPFIneu/qVevSNco5/aw+bc6sjeS/ZA +65dXFGpDlw0lPRHLT5/CgNyMyiLYov7KwMycZw7uxa1ynO+73tqe5tvO/DiMpAPJ +EkrSz/StYBsGJxDhwq5RT31tHVtHhTf0rk1BmaoQJ0Aq7iECAwEAAaNRME8wHwYD +VR0jBBgwFoAUt8P5gBfN9hCUAiWhtPH5fTWnctAwCQYDVR0TBAIwADALBgNVHQ8E +BAMCBPAwFAYDVR0RBA0wC4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBCwUAA4IBAQCD +fBByVq8AbV1DMrY+MElb/nZA5/cuGnUpBpjSlk5OnYHWtywuQk6veiiJ0S2fNfqf +RzwOFuZDHKmIcH0574VssLfUynMKP3w3xb2ZNic3AxAdhzZ6LXLx6+qF5tYcL7oC +UWmj5Mo9SkX5HZLEGamQlVyGOGKNatxep4liyoSeKXr0AOHYfB4AkDhVZn7yQc/v +But42fLBg4mE+rk4UBYOHA4XdoFwqgTCNZq2RxKzvG9LIcok6lOc6gDnfTsH8GqE +byGpfIIQAXF8aftCm4dGXxtzMh8C5d0t2Ell9g+Rr8i/enebT2nJ9B9ptldDjhcZ +7I0ywGsXwrh0EwFsX74/ +-----END CERTIFICATE----- diff --git a/cert/server.key b/cert/server.key new file mode 100644 index 0000000..153fd6b --- /dev/null +++ b/cert/server.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5ZK9VDkMqSyon +BEkZ7HudneZgF/TI2UKR9P2ObleVsaT0mrJjqbeDEY+TFk30ytrpI/4y7TwDLIIF +Ie8DF29bsrR4+0+ZrYmoVwTNB9bFItp0nF0enaEGZZqilgxq1Uu1h1CzNNVoYq7J +8SPEvHuhL6ZOBef0WnygPBYGCDp4IOktQdevu09HvxZyC6DIyq9Y6YM151ZDxSJ3 +rv6lXr0jXKOf2sPm3OrI3kv2QOuXVxRqQ5cNJT0Ry0+fwoDcjMoi2KL+ysDMnGcO +7sWtcpzvu97anubbzvw4jKQDyRJK0s/0rWAbBicQ4cKuUU99bR1bR4U39K5NQZmq +ECdAKu4hAgMBAAECggEABoMQ3Y34sf2d52zxHGYAGZM4SlvND1kCS5otZdleXjW1 +M5pTdci6V3JAdswrxNNzSQkonqVSnFHt5zw/5v3lvXTTfgRl0WIVGcKkuobx9k65 +Gat8YdzrkQv0mI1otj/zvtaX8ROEA3yj4xgDR5/PP+QqlUcD1MNw6TfzFhcn5pxB +/RDPmvarMhzMdDW60Uub6Z7e/kVPuXWrW4bDyULd1d1NoSibnFZi+vGY0Lc1ctDW +2Vl7A8RFTcQi6Cjx/FwgPGJTBE4UMjIBO3wnoPQBMrsSxeGhcarerqIlEafgT4XN +p9BMtRyaXE7TTb1BXc35ZYNJLDLJKQxABhrEHtFreQKBgQDpiGwuKAFK8BLPlbAx +zkShhKd9fhlwm2bfRv3cojPQZsxn0BjefmtrISbKCD79Ivyn7TnOyYAoKAxdp2q9 +wtz94aAXV2lfhUw2lhcb/aw4sXuY/s1XnVyoglOO8pYRCUN0o80pKuWFsaDyy/uL +LhINff1oMNCa7vmMdu8Ccz0o/wKBgQDLOqdTQhSFs4f1yhlDDH3pqT6eKvtFNeRJ +usxYDnAyRXHRqwhQ86z1nBZIgwXqq7PfO9V5Y/l6/2HmmA2ufjS8aBTNpCUMuvJk +y98Z4hTjKRdnVlMUjHq9ahCixJVQ8pcCnWRFdeAwSKhHQiJEFLYeYOIrUeCIYJI4 +FiCshSPI3wKBgGU0ErWZ7p18FprRIs8itYlNhIwUxo+POPCPwloIDO5GblSa0Pwy +yvhdIIMzOaDXtahMXN3pYtmEKX+4msBrnvuC+K7E2cxkZtfNCWy+7RCQkaCG45QR +hOMdv3pWVIRDgHEevz0U8uySQs6VaYgySe6A5/1sEiriX1DpBcEJEbsfAoGAKUCb +rGvSbJ1XsM24OQL1IBQJsON6o77fuxOe3RT5M0sjYnL8OipsZmKrp0ZpUgxOc7ba +i0x+3LewMLWWuV/G5qOd7WwvVRkxkMJNZByfLskthf1g2d/2HjLEc7XBtW+4tYAr +VWoq+sIU3noPKJCnsxzpa++vyx8HLzlWoo5YCDMCgYBJvGH2zMgInlQNO/2XY5nl +E53EZMex+RDq8Wzr4tRM3IrCGc2t8WKEQ/9teKNH0tg9xib0vhqqmiGl1xNfqJVo +ePJyfgFabeUx9goG3mgTdV9woSRlBJso62dM0DAC/jsJoHnVzgokysR4/BfW9Da+ +AYTxRZSNbfmsTHawXqG8Fw== +-----END PRIVATE KEY----- diff --git a/src/components/baruser/BarNavigation.vue b/src/components/baruser/BarNavigation.vue new file mode 100644 index 0000000..2542cc7 --- /dev/null +++ b/src/components/baruser/BarNavigation.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/components/finanzer/FinanzerNavigation.vue b/src/components/finanzer/FinanzerNavigation.vue new file mode 100644 index 0000000..065e4f1 --- /dev/null +++ b/src/components/finanzer/FinanzerNavigation.vue @@ -0,0 +1,49 @@ + + + + + diff --git a/src/components/finanzer/Overview.vue b/src/components/finanzer/Overview.vue index ec0c0ae..edfcd5a 100644 --- a/src/components/finanzer/Overview.vue +++ b/src/components/finanzer/Overview.vue @@ -1,5 +1,5 @@ - + diff --git a/src/components/user/UserNavigation.vue b/src/components/user/UserNavigation.vue new file mode 100644 index 0000000..69a68db --- /dev/null +++ b/src/components/user/UserNavigation.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/src/plugins/routes.js b/src/plugins/routes.js index b4862fe..3861d98 100644 --- a/src/plugins/routes.js +++ b/src/plugins/routes.js @@ -1,5 +1,5 @@ //const main = 'http://192.168.5.118:5000/' -const main = 'http://localhost:5000/' +const main = 'https://localhost:5000/' const url = { login: main + 'login', diff --git a/src/router/index.js b/src/router/index.js index 013404d..a816fab 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,6 +9,11 @@ import CreditOverview from '../components/user/CreditOverview' import MainView from '../views/MainView' import UserView from '../views/UserView' import BarView from '../views/BarView' +import UserNavigation from '../components/user/UserNavigation' +import BarNavigation from '../components/baruser/BarNavigation' +import FinanzerNavigation from '../components/finanzer/FinanzerNavigation' +import Overview from '../components/finanzer/Overview' +import User from '../components/finanzer/User' Vue.use(VueRouter) @@ -18,11 +23,6 @@ const routes = [ name: 'login', component: Login }, - { - path: '/finanzer', - name: 'finanzer', - component: FinanzerView - }, { path: '/main', name: 'main', @@ -31,7 +31,7 @@ const routes = [ { path: 'user', name: 'user', - component: UserView, + components: { userNav: UserNavigation, default: UserView }, children: [ { path: 'add', @@ -48,7 +48,7 @@ const routes = [ { path: 'bar', name: 'bar', - component: BarView, + components: { userNav: BarNavigation, default: BarView }, children: [ { path: 'geruecht', @@ -60,7 +60,19 @@ const routes = [ { path: 'finanzer', name: 'finanzer', - component: FinanzerView + components: { default: FinanzerView, finanzerNav: FinanzerNavigation }, + children: [ + { + path: 'overview', + component: Overview + }, + { + path: 'user/:id', + name: 'activeUser', + props: true, + component: User + } + ] } ] }, diff --git a/src/store/modules/finanzerUsers.js b/src/store/modules/finanzerUsers.js index 766f0f6..2f3984a 100644 --- a/src/store/modules/finanzerUsers.js +++ b/src/store/modules/finanzerUsers.js @@ -4,9 +4,7 @@ import url from '@/plugins/routes' const state = { users: [], - activeUser: { - username: null - }, + activeUser: '', allUsers: [], user: null, errorMails: null, @@ -38,13 +36,8 @@ const mutations = { state.allUsers[i].firstname + ' ' + state.allUsers[i].lastname } }, - setActiveUser: (state, user) => { - if (state.activeUser.username === user.username) { - state.activeUser = { username: null } - } else { - state.activeUser = user - } - state.errorMail = null + setActiveUser: (state, username) => { + state.activeUser = username }, setUsers: (state, users) => { for (let user in users) { @@ -256,8 +249,8 @@ const actions = { dispatch('logout', null, { root: true }) } }, - setActiveUser({ commit }, user) { - commit('setActiveUser', user) + setActiveUser({ commit }, username) { + commit('setActiveUser', username) }, async addAmount({ commit, rootState, dispatch }, data) { try { @@ -390,7 +383,9 @@ const getters = { return state.users }, activeUser: state => { - return state.activeUser + return state.users.find(user => { + return user.username === state.activeUser + }) }, allUsers: state => { return state.allUsers diff --git a/src/store/modules/login.js b/src/store/modules/login.js index 7abbb6d..5617825 100644 --- a/src/store/modules/login.js +++ b/src/store/modules/login.js @@ -55,7 +55,7 @@ const actions = { commit('loginStop', null) commit('updateAccessToken', response.data) if (state.user.group.includes('moneymaster')) { - router.push('/main/finanzer') + router.push('/main/finanzer/overview') } else if (state.user.group.includes('bar')) { router.push('/main/bar/geruecht') } else if (state.user.group.includes('user')) { diff --git a/src/views/FinanzerView.vue b/src/views/FinanzerView.vue index 302413a..2341ee9 100644 --- a/src/views/FinanzerView.vue +++ b/src/views/FinanzerView.vue @@ -9,32 +9,6 @@ overflow right > - - - - home - - Gesamtübersicht - - - - - - {{ user.lastname }}, {{ user.firstname }} - - - - - - - - +