From c105c12f7d4d59da46edce4fd7990b6db6c6256d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <mail@bjo3rn.com>
Date: Thu, 1 Nov 2018 16:48:35 +0100
Subject: [PATCH] Move alerts to stores

---
 .../Private/Assets/js/myep/_router.js         |  1 -
 .../Private/Assets/js/myep/_store.js          |  6 +++++-
 .../Assets/js/myep/components/Address.vue     | 16 ---------------
 .../Private/Assets/js/myep/components/App.vue |  3 ---
 .../Assets/js/myep/components/CrmData.vue     | 20 +------------------
 .../Assets/js/myep/components/Events.vue      |  8 +-------
 .../Assets/js/myep/components/Login.vue       | 12 +++--------
 .../Assets/js/myep/components/Teamer.vue      | 19 ++++--------------
 .../Private/Assets/js/myep/stores/address.js  | 12 +++++++++++
 .../Private/Assets/js/myep/stores/crmdata.js  | 12 +++++++++++
 .../Private/Assets/js/myep/stores/events.js   |  4 ++++
 .../Private/Assets/js/myep/stores/teamer.js   | 12 +++++++++++
 12 files changed, 54 insertions(+), 71 deletions(-)

diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_router.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_router.js
index 67d52469..f4e659e6 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_router.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_router.js
@@ -21,7 +21,6 @@ const guard = (to, from, next) => {
 import Address from './components/Address.vue'
 import Events from './components/Events.vue'
 import Login from './components/Login.vue'
-import CrmData from './components/CrmData.vue'
 import Teamer from './components/Teamer.vue'
 
 export default new VueRouter({
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_store.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_store.js
index c00af1dc..a1edcb17 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_store.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_store.js
@@ -46,7 +46,7 @@ export default new Vuex.Store({
             state.loggedIn = false;
             state.teamer = false;
         },
-        setMessage (state, payload) {
+        alert (state, payload) {
             state.message.text = payload.message;
             state.message.class = payload.class;
         },
@@ -94,6 +94,10 @@ export default new Vuex.Store({
                 commit('loadingFinish');
             }).catch((error) => {
                 commit('loginFailure');
+                commit('alert', {
+                    message: 'Der Login ist fehlgeschlagen :(',
+                    class: 'alert-danger'
+                });
                 commit('loadingFinish');
                 throw error;
             });
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Address.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Address.vue
index 3dfc2fa0..a693186d 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Address.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Address.vue
@@ -132,28 +132,12 @@
                     .then((data) => {
                         this.address = data;
                         this.picker.setDate(new Date(this.address.dateOfBirth), true);
-                    }).catch(() => {
-                        EventBus.$emit('alert', {
-                            message: 'Es ist ein Fehler aufgetreten :(',
-                            class: 'alert-danger'
-                        });
-                    }).then(() => {
                         EventBus.$emit('scrollTo', '#myep-main');
                     });
             },
             saveAddress () {
                 this.$store.dispatch('address/save', this.address)
                     .then(() => {
-                        EventBus.$emit('alert', {
-                            message: 'Die Änderungen wurden gespeichert',
-                            class: 'alert-success'
-                        });
-                    }).catch(() => {
-                        EventBus.$emit('alert', {
-                            message: 'Es ist ein Fehler aufgetreten :(',
-                            class: 'alert-danger'
-                        });
-                    }).then(() => {
                         EventBus.$emit('scrollTo', '#myep-main');
                     });
             }
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/App.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/App.vue
index 2798ab5e..190c8693 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/App.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/App.vue
@@ -60,9 +60,6 @@
             EventBus.$on('forcedLogout', () => {
                 this.$router.push({ name: 'login' })
             });
-            EventBus.$on('alert', (payload) => {
-                this.$store.commit('setMessage', payload);
-            })
         }
     }
 </script>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/CrmData.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/CrmData.vue
index 8d4bad91..f516d7d4 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/CrmData.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/CrmData.vue
@@ -1,5 +1,5 @@
 <template>
-    <div id="myep-main" v-if="loaded">
+    <div id="myep-main" v-show="!loading">
         <h1>Mein Profil</h1>
         <div class="row">
             <div class="col-xs-12 col-md-6">
@@ -39,7 +39,6 @@
     export default {
         data () {
             return {
-                loaded: false,
                 crmData: [],
                 hiddenSelectionGroups: [ 10 ]
             }
@@ -52,29 +51,12 @@
                 this.$store.dispatch('crmdata/load')
                     .then((data) => {
                         this.crmData = data;
-                    }).catch(() => {
-                        EventBus.$emit('alert', {
-                            message: 'Es ist ein Fehler aufgetreten :(',
-                            class: 'alert-danger'
-                        });
-                    }).then(() => {
-                        this.loaded = true;
                         EventBus.$emit('scrollTo', '#myep-main');
                     });
             },
             saveSelections () {
                 this.$store.dispatch('crmdata/save', this.crmData)
                     .then(() => {
-                        EventBus.$emit('alert', {
-                            message: 'Die Änderungen wurden gespeichert',
-                            class: 'alert-success'
-                        });
-                    }).catch(() => {
-                        EventBus.$emit('alert', {
-                            message: 'Es ist ein Fehler aufgetreten :(',
-                            class: 'alert-danger'
-                        });
-                    }).then(() => {
                         EventBus.$emit('scrollTo', '#myep-main');
                     });
             },
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Events.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Events.vue
index 59070d48..60aa2813 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Events.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Events.vue
@@ -1,5 +1,5 @@
 <template>
-    <div id="myep-main" v-if="!loading">
+    <div id="myep-main" v-show="!loading">
         <h1>Reise-Historie</h1>
         <div class="table-responsive">
             <table class="table table-striped table-condensed">
@@ -60,12 +60,6 @@
                 this.$store.dispatch('events/load')
                     .then((events) => {
                         this.events = events;
-                    }).catch(() => {
-                        EventBus.$emit('alert', {
-                            message: 'Es ist ein Fehler aufgetreten :(',
-                            class: 'alert-danger'
-                        });
-                    }).then(() => {
                         EventBus.$emit('scrollTo', '#myep-main');
                     });
             },
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Login.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Login.vue
index df93d158..5a4a4991 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Login.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Login.vue
@@ -53,7 +53,7 @@
             },
             login () {
                 if (!this.email || !this.password) {
-                    EventBus.$emit('alert', {
+                    this.$store.commit('alert', {
                         message: 'Bitte E-Mail und Passwort eingeben',
                         class: 'alert-danger'
                     });
@@ -64,18 +64,12 @@
                     password: this.password
                 }).then(() => {
                     this.$router.push({ name: 'address' });
-                }).catch(() => {
-                    EventBus.$emit('alert', {
-                        message: 'Der Login ist fehlgeschlagen :(',
-                        class: 'alert-danger'
-                    });
-                }).then(() => {
                     EventBus.$emit('scrollTo', '#myep-main');
                 });
             },
             resetPassword () {
 	            if (!this.email) {
-                    EventBus.$emit('alert', {
+                    this.$store.commit('alert', {
                         message: 'Bitte die E-Mail Adresse angeben',
                         class: 'alert-danger'
                     });
@@ -85,7 +79,7 @@
                     this.email
                 ).then(() => {
                     this.email = '';
-                    EventBus.$emit('alert', {
+                    this.$store.commit('alert', {
                         message: 'Du erhältst in Kürze eine E-Mail mit einem Link zum (Zurück)setzen deines Passworts.',
                         class: 'alert-success'
                     });
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Teamer.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Teamer.vue
index 41ae029c..ace53e5c 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Teamer.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/Teamer.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="form-wrapper form--border" id="myep-main" v-if="loaded">
+    <div class="form-wrapper form--border" id="myep-main" v-show="!loading">
         <h1>Teamer</h1>
         <form @submit="saveTeamerData()">
             <div class="row">
@@ -99,7 +99,6 @@
     export default {
         data () {
             return {
-                loaded: false,
                 sizes: [ 'S', 'M', 'L', 'XL', 'XXL' ],
                 status: [
                     { value: 'jr', label: 'Neuteamer' },
@@ -115,24 +114,14 @@
                 this.$store.dispatch('teamer/load')
                     .then((data) => {
                         this.teamerData = data;
-                        this.loaded = true;
+                        EventBus.$emit('scrollTo', '#myep-main');
                     })
             },
             saveTeamerData () {
                 this.$store.dispatch('teamer/save', this.teamerData)
                     .then(() => {
-                        EventBus.$emit('alert', {
-                            message: 'Die Änderungen wurden gespeichert',
-                            class: 'alert-success'
-                        });
-                    }).catch(() => {
-                        EventBus.$emit('alert', {
-                            message: 'Es ist ein Fehler aufgetreten :(',
-                            class: 'alert-danger'
-                        });
-                }).then(() => {
-                    EventBus.$emit('scrollTo', '#myep-main');
-                });
+                        EventBus.$emit('scrollTo', '#myep-main');
+                    });
             }
         },
         created () {
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/stores/address.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/stores/address.js
index 9356f457..af3a58b9 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/stores/address.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/stores/address.js
@@ -20,6 +20,10 @@ export default {
                     return response.data['hydra:member'][0];
                 }).catch((error) => {
                     commit('loadingFinish', null, { root: true });
+                    commit('alert', {
+                        message: 'Es ist ein Fehler aufgetreten :(',
+                        class: 'alert-danger'
+                    }, { root: true });
                     commit('logout', null, { root: true });
                     EventBus.$emit('forcedLogout');
                     throw error;
@@ -37,9 +41,17 @@ export default {
             return client.put('/api/addresses/' + data.id, data)
                 .then(() => {
                     commit('loadingFinish', null, { root: true });
+                    commit('alert', {
+                        message: 'Die Änderungen wurden gespeichert',
+                        class: 'alert-success'
+                    }, { root: true });
                 })
                 .catch((error) => {
                     commit('loadingFinish', null, { root: true });
+                    commit('alert', {
+                        message: 'Es ist ein Fehler aufgetreten :(',
+                        class: 'alert-danger'
+                    }, { root: true });
                     commit('logout', null, { root: true });
                     EventBus.$emit('forcedLogout');
                     throw error;
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/stores/crmdata.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/stores/crmdata.js
index 78ecaa50..e7ea1cea 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/stores/crmdata.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/stores/crmdata.js
@@ -20,6 +20,10 @@ export default {
                     return response.data['hydra:member'][0];
                 }).catch((error) => {
                     commit('loadingFinish', null, { root: true });
+                    commit('alert', {
+                        message: 'Es ist ein Fehler aufgetreten :(',
+                        class: 'alert-danger'
+                    }, { root: true });
                     commit('logout', null, { root: true });
                     EventBus.$emit('forcedLogout');
                     throw error;
@@ -37,8 +41,16 @@ export default {
             return client.put('/api/crm-selections/' + data.id, data)
                 .then(() => {
                     commit('loadingFinish', null, { root: true });
+                    commit('alert', {
+                        message: 'Die Änderungen wurden gespeichert',
+                        class: 'alert-success'
+                    }, { root: true });
                 }).catch((error) => {
                     commit('loadingFinish', null, { root: true });
+                    commit('alert', {
+                        message: 'Es ist ein Fehler aufgetreten :(',
+                        class: 'alert-danger'
+                    }, { root: true });
                     commit('logout', null, { root: true });
                     EventBus.$emit('forcedLogout');
                     throw error;
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/stores/events.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/stores/events.js
index eadf7b4b..0e8f5642 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/stores/events.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/stores/events.js
@@ -20,6 +20,10 @@ export default {
                     return response.data['hydra:member'];
                 }).catch((error) => {
                     commit('loadingFinish', null, { root: true });
+                    commit('alert', {
+                        message: 'Es ist ein Fehler aufgetreten :(',
+                        class: 'alert-danger'
+                    }, { root: true });
                     commit('logout', null, { root: true });
                     EventBus.$emit('forcedLogout');
                     throw error;
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/stores/teamer.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/stores/teamer.js
index 66318ced..ec8e34cd 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/stores/teamer.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/stores/teamer.js
@@ -20,6 +20,10 @@ export default {
                     return response.data;
                 }).catch((error) => {
                     commit('loadingFinish', null, { root: true });
+                    commit('alert', {
+                        message: 'Es ist ein Fehler aufgetreten :(',
+                        class: 'alert-danger'
+                    }, { root: true });
                     commit('logout', null, { root: true });
                     EventBus.$emit('forcedLogout');
                     throw error;
@@ -37,8 +41,16 @@ export default {
             return client.put('/api/teamers/' + sessionStorage.getItem('teamerId'), data)
                 .then(() => {
                     commit('loadingFinish', null, { root: true });
+                    commit('alert', {
+                        message: 'Die Änderungen wurden gespeichert',
+                        class: 'alert-success'
+                    }, { root: true });
                 }).catch((error) => {
                     commit('loadingFinish', null, { root: true });
+                    commit('alert', {
+                        message: 'Es ist ein Fehler aufgetreten :(',
+                        class: 'alert-danger'
+                    }, { root: true });
                     commit('logout', null, { root: true });
                     EventBus.$emit('forcedLogout');
                     throw error;