+
diff --git a/resources/js/lib/floatingVue.js b/resources/js/lib/floatingVue.js
new file mode 100644
index 00000000..6d86b372
--- /dev/null
+++ b/resources/js/lib/floatingVue.js
@@ -0,0 +1,20 @@
+import Plugin from 'floating-vue';
+
+import 'floating-vue/dist/style.css';
+import '../../css/tooltip.css';
+
+var options = {
+ distance: 7,
+ themes: {
+ tooltip: {
+ delay: {
+ show: 50,
+ hide: 0,
+ },
+ handleResize: true,
+ html: true,
+ },
+ },
+};
+
+export {Plugin, options};
diff --git a/resources/js/lib/requireModules.js b/resources/js/lib/requireModules.js
index f8ebb6fd..1424accb 100644
--- a/resources/js/lib/requireModules.js
+++ b/resources/js/lib/requireModules.js
@@ -1,9 +1,10 @@
import {paramCase} from 'change-case';
+import {defineAsyncComponent} from 'vue';
-export default function (context, Vue, prefix) {
+export default function (context, app, prefix) {
for (const file in context) {
let componentName = paramCase(`${prefix}${file.replace(/^.*\/(.*?)\.vue$/g, '$1')}`);
- Vue.component(componentName, typeof context[file] === 'function' ? context[file] : context[file].default);
+ app.component(componentName, typeof context[file] === 'function' ? defineAsyncComponent(context[file]) : context[file].default);
}
}
diff --git a/resources/js/lib/toast.js b/resources/js/lib/toast.js
new file mode 100644
index 00000000..640363ae
--- /dev/null
+++ b/resources/js/lib/toast.js
@@ -0,0 +1,23 @@
+import Toast, {useToast} from 'vue-toastification';
+const toast = useToast();
+
+var interceptor = [
+ (config) => {
+ return config;
+ },
+ (err) => {
+ if (err.response.status === 422) {
+ var errors = err.response.data.errors;
+ for (const error in errors) {
+ errors[error].forEach((errorMessage) => toast.error(errorMessage));
+ }
+ }
+ return Promise.reject(err);
+ },
+];
+
+const options = {
+ position: 'bottom-right',
+};
+
+export {Toast, interceptor, options};
diff --git a/resources/js/mixins/hasFlash.js b/resources/js/mixins/hasFlash.js
index 39b3473a..d7450f23 100644
--- a/resources/js/mixins/hasFlash.js
+++ b/resources/js/mixins/hasFlash.js
@@ -1,18 +1,13 @@
+import { useToast } from 'vue-toastification'
+const toast = useToast()
+
export default {
methods: {
['$success'](message) {
- this.$toasted.show(message, {
- position: 'bottom-right',
- duration: 2000,
- type: 'success',
- });
+ toast.success(message);
},
['$error'](message) {
- this.$toasted.show(message, {
- position: 'bottom-right',
- duration: 2000,
- type: 'error',
- });
+ toast.error(message);
},
errorsFromException(e) {
if (e.response?.status !== 422 || !e.response?.data?.errors) {
@@ -23,7 +18,7 @@ export default {
Object.keys(errors).forEach((field) => {
errors[field].forEach((message) => {
- this.$error(message);
+ toast.error(message);
});
});
},
diff --git a/resources/js/stores/menuStore.js b/resources/js/stores/menuStore.js
index bd661bf3..523f534e 100644
--- a/resources/js/stores/menuStore.js
+++ b/resources/js/stores/menuStore.js
@@ -33,7 +33,7 @@ export const menuStore = defineStore('menu', {
window.addEventListener('resize', this.menuListener);
this.menuListener();
- window.addEventListener('inertiaStart', () => {
+ window.addEventListener('inertia:start', () => {
if (!window.matchMedia('(min-width: 1024px)').matches) {
_self.visible = false;
_self.overflowVisible = false;
diff --git a/resources/js/views/Initialize/VIndex.vue b/resources/js/views/Initialize/VIndex.vue
index 8a43399c..60d45966 100644
--- a/resources/js/views/Initialize/VIndex.vue
+++ b/resources/js/views/Initialize/VIndex.vue
@@ -27,7 +27,7 @@
id="gruppierung1Id"
size="sm"
:options="searchLayerOptions[0]"
- @input="loadSearchLayer(1, $event, search)"
+ @update:modelValue="loadSearchLayer(1, $event, search)"
hint="Gruppierungs-Nummer einer Diözese, auf die die Mitglieder passen sollen. I.d.R. ist das die Gruppierungsnummer deiner Diözese. Entspricht dem Feld '1. Ebene' in der NaMi Suche."
>
@@ -47,7 +47,7 @@
name="gruppierung3Id"
id="gruppierung3Id"
size="sm"
- @input="search"
+ @update:modelValue="search"
hint="Gruppierungs-Nummer deines Stammes, auf die die Mitglieder passen sollen. I.d.R. ist das die Gruppierungsnummer deines Stammes. Entspricht dem Feld '3. Ebene' in der NaMi Suche. Fülle dieses Feld aus, um Mitglieder auf einen bestimmten Stamm zu beschränken."
:disabled="!values.params.gruppierung1Id || !values.params.gruppierung2Id"
:options="searchLayerOptions[2]"
@@ -58,7 +58,7 @@
name="mglStatusId"
id="mglStatusId"
size="sm"
- @input="search"
+ @update:modelValue="search"
:options="states"
hint="Wähle hier etwas aus, um nur aktive oder nur inaktive Mitglieder zu synchronisieren. Wir empfehlen dir, dies so zu belassen und Mitglieder ohne 'Datenweiterverwendung' gänzlich zu löschen, um Karteileichen zu entfernen."
>
@@ -67,7 +67,7 @@
label="In Gruppierung suchen"
name="inGrp"
id="inGrp"
- @input="search"
+ @update:modelValue="search"
hint="Mitglieder finden, die direktes Mitglied in der kleinsten befüllten Gruppierung sind."
size="sm"
>
@@ -76,12 +76,12 @@
label="Unterhalb Gruppierung suchen"
name="unterhalbGrp"
id="unterhalbGrp"
- @input="search"
+ @update:modelValue="search"
hint="Mitglieder finden, die direktes Mitglied in einer Untergruppe der kleinsten befüllten Gruppierung sind."
size="sm"
>
- Weiter
+ Weiter
@@ -117,9 +117,10 @@
Dieser Gruppierung werden Mitglieder automatisch zugeordnet,
falls nichts anderes angegeben wurde.
I.d.R. ist das z.B. die Nummer deines Stammes, wenn du als StaVo mit Adrema Daten verwaltest.
-
@@ -171,12 +172,8 @@ export default {
},
methods: {
async submit() {
- try {
- await this.axios.post('/initialize', this.values);
- this.step = 3;
- } catch (e) {
- this.errorsFromException(e);
- }
+ await this.axios.post('/initialize', this.values);
+ this.step = 3;
},
async storeSearch() {
this.values.group_id = this.values.params.gruppierung3Id ? this.values.params.gruppierung3Id : this.values.params.gruppierung2Id;
@@ -189,11 +186,10 @@ export default {
this.loading = true;
try {
await this.axios.post('/nami/login-check', this.values);
+ this.$success('Login erfolgreich');
await this.loadSearchResult(1);
await this.loadSearchLayer(0, null, () => '');
this.step = 1;
- } catch (e) {
- this.errorsFromException(e);
} finally {
this.loading = false;
}
@@ -222,8 +218,6 @@ export default {
});
after();
- } catch (e) {
- this.errorsFromException(e);
} finally {
this.loading = false;
}
@@ -233,8 +227,6 @@ export default {
try {
var result = await this.axios.post('/nami/search', {...this.values, page: page});
this.preview = result.data;
- } catch (e) {
- this.errorsFromException(e);
} finally {
this.loading = false;
}
diff --git a/resources/js/views/VLogin.vue b/resources/js/views/VLogin.vue
index 8ad77868..e499c9e8 100644
--- a/resources/js/views/VLogin.vue
+++ b/resources/js/views/VLogin.vue
@@ -5,8 +5,8 @@
-
-
+
+
diff --git a/resources/js/views/activity/SubactivityForm.vue b/resources/js/views/activity/SubactivityForm.vue
index b9eafadc..c0974d88 100644
--- a/resources/js/views/activity/SubactivityForm.vue
+++ b/resources/js/views/activity/SubactivityForm.vue
@@ -24,16 +24,12 @@ export default {
methods: {
async store() {
- try {
- if (this.model.id) {
- var response = await this.axios.patch(this.model.links.update, this.model);
- this.$emit('updated', response.data);
- } else {
- var response = await this.axios.post('/subactivity', this.model);
- this.$emit('stored', response.data);
- }
- } catch (e) {
- this.errorsFromException(e);
+ if (this.model.id) {
+ var response = await this.axios.patch(this.model.links.update, this.model);
+ this.$emit('updated', response.data);
+ } else {
+ var response = await this.axios.post('/subactivity', this.model);
+ this.$emit('stored', response.data);
}
},
},
diff --git a/resources/js/views/activity/VForm.vue b/resources/js/views/activity/VForm.vue
index a8f446c6..220a7a10 100644
--- a/resources/js/views/activity/VForm.vue
+++ b/resources/js/views/activity/VForm.vue
@@ -3,6 +3,9 @@
zurück
+
+
+