more fixes

Author: connorabbas

src/composables/useAxiosForm.js

@@ -1,5 +1,6 @@
 import { ref } from 'vue';
 import axios from '@/utils/axios';
+import progress from '@/utils/progress';
 import { useAxiosErrorHandling } from '@/composables/useAxiosErrorHandling';
 
 export function useAxiosForm(initialData = {}) {
@@ -24,9 +25,16 @@ export function useAxiosForm(initialData = {}) {
     };
 
     const makeRequest = async (method, url, options = {}) => {
+        options = {
+            showProgress: false,
+            ...options,
+        };
         try {
             clearErrors();
             processing.value = true;
+            if (options.showProgress) {
+                progress.start();
+            }
 
             if (options.onBefore) options.onBefore();
 
@@ -47,6 +55,9 @@ export function useAxiosForm(initialData = {}) {
             if (onFinishCallback) onFinishCallback();
             if (options.onFinish) options.onFinish();
             processing.value = false;
+            if (progress.isStarted()) {
+                progress.done();
+            }
         }
     };
 

src/stores/auth.js

@@ -45,6 +45,7 @@ export const useAuthStore = defineStore('auth', () => {
     const { post: submitLogoutForm } = useAxiosForm();
     function logout() {
         return submitLogoutForm('/logout', {
+            showProgress: true,
             onSuccess: (response) => {
                 user.value = null;
                 router.push({ name: 'welcome' });

src/views/profile/partials/UpdatePasswordForm.vue

@@ -26,14 +26,14 @@ const {
 const submit = () => {
     submitForm('/password', {
         onSuccess: async () => {
-            await authStore.fetchUser();
             toast.add({
                 severity: 'success',
                 summary: 'Saved',
                 detail: 'Your password has been updated',
                 life: 3000,
             });
             resetFormFields();
+            authStore.fetchUser();
         },
         onError: () => {
             if (validationErrors.value?.password) {

src/views/profile/partials/UpdateProfileInformationForm.vue

@@ -26,13 +26,13 @@ const {
 const submit = () => {
     submitForm('/profile', {
         onSuccess: async () => {
-            await authStore.fetchUser();
             toast.add({
                 severity: 'success',
                 summary: 'Saved',
                 detail: 'Profile information has been updated',
                 life: 3000,
             });
+            authStore.fetchUser();
         },
     });
 };