diff --git a/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue b/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue
index 9a085ed2..b3df4b2c 100644
--- a/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue
+++ b/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue
@@ -9,13 +9,13 @@
diff --git a/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue b/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue
index 58487a4e..13579edc 100644
--- a/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue
+++ b/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue
@@ -61,7 +61,7 @@ const parameters = reactive({
const v$ = useVuelidate(rules, { parameters }) as any;
-const { submit, closeModal, error, errorHandler } = useModalFormHandler({ section: props.section });
+const { submit, closeModal, error, formHandler } = useModalFormHandler({ section: props.section });
const submitForm = async () => {
await submit(route('api.account.user.update', authStore.getUserId), 'put', props.section, true, true, parameters, {
@@ -71,11 +71,8 @@ const submitForm = async () => {
},
successHandler: (response: any) => {
closeModal();
- errorHandler('');
+ formHandler('');
authStore.updateProfile(response.payload.data.name);
- },
- errorHandler: (response: any) => {
- errorHandler(response.message);
}
});
};
diff --git a/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue b/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue
index f32b2a3d..88608e68 100644
--- a/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue
+++ b/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue
@@ -53,7 +53,7 @@ const parameters = reactive({
const v$ = useVuelidate(rules, { parameters }) as any;
-const { submit, closeModal, error, errorHandler } = useModalFormHandler({ section: props.section });
+const { submit, closeModal, error, formHandler } = useModalFormHandler({ section: props.section });
const submitForm = async () => {
await submit(route('api.account.authentication.password.forget'), 'post', props.section, true, true, parameters, {
@@ -63,10 +63,7 @@ const submitForm = async () => {
},
successHandler: () => {
closeModal();
- errorHandler('');
- },
- errorHandler: (response: any) => {
- errorHandler(response.message);
+ formHandler('');
}
});
};
diff --git a/resources/assets/vue/composables/useModalFormHandler.ts b/resources/assets/vue/composables/useModalFormHandler.ts
index 74e2b54f..bcad747c 100644
--- a/resources/assets/vue/composables/useModalFormHandler.ts
+++ b/resources/assets/vue/composables/useModalFormHandler.ts
@@ -80,8 +80,6 @@ export function useModalFormHandler(props: { section: string; }) {
isLoading,
error,
closeModal,
- errorHandler,
- successHandler,
formHandler,
submit,
};
diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php
index 1f502172..82f4cbeb 100644
--- a/resources/views/partials/menu.blade.php
+++ b/resources/views/partials/menu.blade.php
@@ -34,19 +34,11 @@
@@ -59,19 +51,13 @@
-
@@ -83,19 +69,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -107,19 +88,13 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -131,19 +106,13 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -155,19 +124,12 @@
@@ -178,19 +140,13 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -199,19 +155,11 @@
@@ -222,19 +170,11 @@
@@ -245,19 +185,11 @@
@@ -268,19 +200,11 @@
@@ -292,19 +216,11 @@
@@ -316,19 +232,11 @@
@@ -341,19 +249,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -365,19 +268,11 @@
@@ -389,19 +284,13 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -423,19 +312,10 @@
@@ -448,7 +328,7 @@
:class="[{'d-flex': authStore.isAdmin}]" v-if="authStore.isAdmin">