Merge branch 'hotfix/v2.0.2'

Author: alexusmai

package.json

@@ -1,6 +1,6 @@
 {
   "name": "laravel-file-manager",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "File manager for Laravel",
   "keywords": [
     "laravel",

src/FileManager.vue

@@ -31,10 +31,11 @@
 </template>
 
 <script>
-/* eslint-disable import/no-duplicates */
+/* eslint-disable import/no-duplicates, no-param-reassign */
 import { mapState } from 'vuex';
-// Axios interceptors
-import { requestInterceptor, responseInterceptor } from './http/interceptors';
+// Axios
+import HTTP from './http/init-axios';
+import EventBus from './eventBus';
 // Components
 import Navbar from './components/blocks/Navbar.vue';
 import FolderTree from './components/tree/FolderTree.vue';
@@ -70,10 +71,10 @@ export default {
     this.$store.commit('fm/settings/initBaseUrl');
 
     // add axios request interceptor
-    requestInterceptor();
+    this.requestInterceptor();
 
     // add axios response interceptor
-    responseInterceptor();
+    this.responseInterceptor();
 
     // initialize app settings
     this.$store.dispatch('fm/initializeApp');
@@ -91,6 +92,84 @@ export default {
     */
   },
   methods: {
+    /**
+     * Add axios request interceptor
+     */
+    requestInterceptor() {
+      HTTP.interceptors.request.use((config) => {
+        // overwrite base url
+        if (this.$store.getters['fm/settings/baseUrl'] !== config.baseURL) {
+          config.baseURL = this.$store.getters['fm/settings/baseUrl'];
+        }
+
+        // overwrite headers
+        const newHeaders = this.$store.state.fm.settings.headers;
+
+        if (newHeaders) {
+          Object.keys(newHeaders)
+            .forEach((key) => { config.headers[key] = newHeaders[key]; });
+        }
+
+        // loading spinner +
+        this.$store.commit('fm/messages/addLoading');
+
+        return config;
+      }, (error) => {
+        // loading spinner -
+        this.$store.commit('fm/messages/subtractLoading');
+        // Do something with request error
+        return Promise.reject(error);
+      });
+    },
+
+    /**
+     * Add axios response interceptor
+     */
+    responseInterceptor() {
+      HTTP.interceptors.response.use((response) => {
+        // loading spinner -
+        this.$store.commit('fm/messages/subtractLoading');
+
+        // create notification, if find message text
+        if (Object.prototype.hasOwnProperty.call(response.data, 'result')) {
+          if (response.data.result.message) {
+            // show notification
+            EventBus.$emit('addNotification', response.data.result);
+
+            // set action result
+            this.$store.commit('fm/messages/setActionResult', response.data.result);
+          }
+        }
+
+        return response;
+      }, (error) => {
+        // loading spinner -
+        this.$store.commit('fm/messages/subtractLoading');
+
+        // set error message
+        this.$store.commit('fm/messages/setError', error);
+
+        const errorMessage = {
+          status: 'error',
+          message: '',
+        };
+
+        // add message
+        if (error.response) {
+          errorMessage.message = error.response.data.message || error.response.statusText;
+        } else if (error.request) {
+          errorMessage.message = error.request.statusText || 'Network error';
+        } else {
+          errorMessage.message = error.message;
+        }
+
+        // show notification
+        EventBus.$emit('addNotification', errorMessage);
+
+        return Promise.reject(error);
+      });
+    },
+
     /**
      * Select manager (when shown 2 file manager windows)
      * @param managerName

src/assets/laravel-file-manager.gif

@@ -1,9 +1,20 @@
 /* eslint-disable-next-line */
 import '@babel/polyfill';
 import Vue from 'vue';
-import store from './store';
+import Vuex from 'vuex';
+// store
+import fm from './store';
+// App
 import App from './FileManager.vue';
 
+Vue.use(Vuex);
+
+// create new store
+const store = new Vuex.Store({
+  strict: process.env.NODE_ENV !== 'production',
+  modules: { fm },
+});
+
 Vue.config.productionTip = process.env.NODE_ENV === 'production';
 
 window.fm = new Vue({

src/http/interceptors.js

@@ -1,5 +1,3 @@
-import Vue from 'vue';
-import Vuex from 'vuex';
 // store modules
 import tree from './store/tree/store';
 import modal from './store/modal/store';
@@ -12,25 +10,18 @@ import mutations from './store/mutations';
 import getters from './store/getters';
 import actions from './store/actions';
 
-Vue.use(Vuex);
-
-export default new Vuex.Store({
-  strict: process.env.NODE_ENV !== 'production',
+export default {
+  namespaced: true,
   modules: {
-    fm: {
-      namespaced: true,
-      modules: {
-        settings,
-        left: manager,
-        right: manager,
-        tree,
-        modal,
-        messages,
-      },
-      state,
-      mutations,
-      actions,
-      getters,
-    },
+    settings,
+    left: manager,
+    right: manager,
+    tree,
+    modal,
+    messages,
   },
-});
+  state,
+  mutations,
+  actions,
+  getters,
+};

src/main.js

@@ -11,7 +11,7 @@ export default {
   state() {
     return {
       // App version
-      version: '2.0.1',
+      version: '2.0.2',
 
       // this headers will be merged with default headers
       headers: {},