EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Björn Fromme
2022-08-17 18:34:16 +02:00
parent 78a351c620 22bb7d686b
commit c14efabf54
11 changed files with 32 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/Address.vue
+1 -1
View File
@@ -117,7 +117,7 @@
.catch(error => {
this.alert({
message: 'Bitte überprüfe deine Eingaben.',
class: 'alert-danger'
success: false,
});
const violations = error.response.data.violations;
if (typeof violations !== 'undefined') {
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/App.vue
+1 -9
View File
@@ -17,14 +17,7 @@
<svg class="w-8 h-8" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16"></path></svg>
</a>
</nav>
<div class="py-2" v-if="alert.message">
<div class="alert alert-dismissable" :class="alert.class">
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
{{ alert.message }}
</div>
</div>
<div class="p-4 mb-8 text-white" :class="{'bg-emerald-600': alert.success, 'bg-red-600': !alert.success}" v-if="alert.message" v-html="alert.message"></div>
<div class="relative">
<router-view></router-view>
<div class="absolute top-0 left-0 inset-0 bg-overlay-white" v-show="loading">
@@ -71,4 +64,3 @@
},
}
</script>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/BookingEdit.vue
+9 -4
View File
@@ -92,11 +92,16 @@
:mutable="mutableFields.services.mutable"
v-on:updated="onServiceUpdated($event, index)"
/>
<participant-sizes-form :services="services.other"
:participant="participant"
:mutable="mutableFields.services.mutable"
v-on:updated="onParticipantDataUpdated($event, index)"/>
<pickup-select
:pickups="services.pickups"
:participant="participant"
:mutable="mutableFields.transportation.mutable"
v-on:selected="onPickupSelected($event, index)"
v-if="services.pickups"
v-show="showPickups"
/>
</div>
@@ -413,7 +418,7 @@
if (false === this.dataValid) {
this.alert({
message: messages.join('<br>'),
class: 'alert-danger'
success: false,
});
return;
}
@@ -429,13 +434,13 @@
}).then(response => {
this.alert({
message: response.data.message,
class: 'alert-info'
success: true,
});
this.dirty = false;
}).catch(error => {
this.alert({
message: error.response.data.message,
class: 'alert-danger'
success: false,
})
}).finally(() => {
this.endLoading()
@@ -507,7 +512,7 @@
.catch(error => {
this.alert({
message: error.message,
class: 'alert-danger'
success: false,
});
})
.finally(() => {
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/CrmData.vue
+3 -3
View File
@@ -71,7 +71,7 @@
}).catch(error => {
this.alert({
message: 'Es ist ein Fehler aufgetreten :(',
class: 'alert-danger'
success: false,
})
}).finally(() => {
this.endLoading()
@@ -89,12 +89,12 @@
}).then(() => {
this.alert({
message: 'Die Änderungen wurden gespeichert',
class: 'alert-success'
success: true,
});
}).catch(error => {
this.alert({
message: 'Es ist ein Fehler aufgetreten :(',
class: 'alert-danger'
success: false,
});
}).finally(() => {
this.endLoading();
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/Events.vue
+1 -1
View File
@@ -103,7 +103,7 @@ import {mapState, mapMutations, mapGetters} from 'vuex'
}).catch(error => {
this.alert({
message: 'Es ist ein Fehler aufgetreten :(',
class: 'alert-danger'
success: false,
});
}).finally(() => {
this.endLoading();
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/Login.vue
+5 -5
View File
@@ -83,7 +83,7 @@
if (!this.email || !this.password) {
this.alert({
message: 'Bitte E-Mail und Passwort eingeben',
class: 'alert-danger'
success: false,
});
return
}
@@ -100,7 +100,7 @@
if (!this.email) {
this.alert({
message: 'Bitte die E-Mail Adresse angeben',
class: 'alert-danger'
success: false,
});
return;
}
@@ -111,18 +111,18 @@
if (response.data.success) {
this.alert({
message: 'Du erhältst in Kürze eine E-Mail mit einem Link zum (Zurück)setzen deines Passworts.',
class: 'alert-success'
success: true,
})
} else {
this.alert({
message: 'Diese E-Mail Adresse konnte nicht gefunden werden.',
class: 'alert-danger'
success: false,
})
}
}).catch(error => {
this.alert({
message: 'Bitte überprüfe deine Eingaben.',
class: 'alert-danger'
success: false,
});
const violations = error.response.data.violations;
if (typeof violations !== 'undefined') {
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/Newsletter.vue
+2 -2
View File
@@ -35,12 +35,12 @@
}).then(() => {
this.alert({
message: 'Die Änderungen wurden gespeichert',
class: 'alert-success'
success: true,
});
}).catch(error => {
this.alert({
message: 'Es ist ein Fehler aufgetreten :(',
class: 'alert-danger'
success: false,
});
}).finally(() => {
this.endLoading();
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/Registration.vue
+2 -2
View File
@@ -63,7 +63,7 @@
if (response.data.success) {
this.alert({
message: 'Du erhältst in Kürze eine E-Mail mit einem Link zum (Zurück)setzen deines Passworts.',
class: 'alert-success'
success: true,
});
this.userData = {
lastName: '',
@@ -75,7 +75,7 @@
} else {
this.alert({
message: 'Du bist bereits registriert. Bitte nutze die Passwort vergessen Funktion.',
class: 'alert-danger'
success: false,
});
}
}).catch(error => {
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/Teamer.vue
+2 -2
View File
@@ -129,12 +129,12 @@
.then(() => {
this.alert({
message: 'Die Änderungen wurden gespeichert',
class: 'alert-success'
success: true,
});
}).catch(error => {
this.alert({
message: 'Es ist ein Fehler aufgetreten :(',
class: 'alert-danger'
success: false,
});
}).finally(() => {
this.endLoading();
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ParticipantSizesForm.vue
-9
View File
@@ -63,12 +63,3 @@
}
}
</script>
<style scoped>
.dropdown {
margin: 0 2px 2px 0;
}
.dropdown-menu {
padding: 5px;
}
</style>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/store/index.js
+6 -6
View File
@@ -35,7 +35,7 @@ export default new Vuex.Store({
userData: defaultUserData,
alert: {
message: '',
class: ''
success: true,
}
},
mutations: {
@@ -61,7 +61,7 @@ export default new Vuex.Store({
beginLoading(state, statusMessage) {
state.loading = true
state.statusMessage = statusMessage
state.alert = {message: '', class: ''}
state.alert = {message: '', success: true}
},
endLoading(state) {
state.loading = false
@@ -102,7 +102,7 @@ export default new Vuex.Store({
commit('logout');
commit('alert', {
message: 'Der Login ist fehlgeschlagen :(',
class: 'alert-danger'
success: false,
});
throw error;
}).finally(() => {
@@ -160,7 +160,7 @@ export default new Vuex.Store({
}).catch(() => {
commit('alert', {
message: 'Es ist ein Fehler aufgetreten :(',
class: 'alert-danger'
success: false,
});
}).finally(() => {
commit('endLoading');
@@ -176,14 +176,14 @@ export default new Vuex.Store({
}).then(() => {
commit('alert', {
message: 'Die Änderungen wurden gespeichert',
class: 'alert-success'
success: true,
});
})
.catch(error => {
if (error.config.status >= 500) {
commit('alert', {
message: 'Es ist ein Fehler aufgetreten :(',
class: 'alert-danger'
success: false,
});
} else {
throw error;