change modal

public/mix-manifest.json

@@ -1,6 +1,6 @@
 {
     "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=ada36e14123738cce4a1",
     "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=4389447314d810908e49",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=69a949dff23fe14cc621",
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=6730ba8c37b173dd3fa4",
     "/js/vue/User/app.js": "/js/vue/User/app.js?id=32e40e7920eba25a4bb2"
 }

resources/js/Global/services/url.service.js

@@ -1,25 +1,27 @@
-const urlGenerator = (urls) => {
-    return function(routeAddress, parameters) {
-        let urlPath = urls[routeAddress].split("/");
-        let newPath = [];
-        for (const iterator of urlPath) {
-            if (iterator.startsWith(":")) {
-                if (iterator.endsWith("?")) {
-                    if (parameters.hasOwnProperty(iterator.slice(1, -1))) {
-                        newPath.push(parameters[iterator.slice(1, -1)]);
-                    }
-                } else {
-                    console.assert(parameters.hasOwnProperty(iterator.slice(1)), 'parameter "' + iterator.slice(1) + '" not specified in parameters.')
-                    newPath.push(parameters[iterator.slice(1)]);
+const urlGenerator = (url, parameters = {}) => {
+    let urlPath = url.split("/");
+    let newPath = [];
+    for (const iterator of urlPath) {
+        if (iterator.startsWith(":")) {
+            if (iterator.endsWith("?")) {
+                if (parameters.hasOwnProperty(iterator.slice(1, -1))) {
+                    newPath.push(parameters[iterator.slice(1, -1)]);
                 }
             } else {
-                newPath.push(iterator);
+                console.assert(
+                    parameters.hasOwnProperty(iterator.slice(1)),
+                    'parameter "' +
+                        iterator.slice(1) +
+                        '" not specified in parameters.'
+                );
+                newPath.push(parameters[iterator.slice(1)]);
             }
+        } else {
+            newPath.push(iterator);
         }
-        return '/' + newPath.join("/");
     }
+    
+    return ("/" + newPath.join("/")).replace("//", "/");
 };
 
-export {
-    urlGenerator
-}
+export { urlGenerator };

resources/js/Global/store/modules/modal/actions.js

@@ -0,0 +1,29 @@
+export default {
+    openModal: ({rootState}, data) => {
+        if(data.nameSpace) {
+            rootState[data.nameSpace]['modal'][data.name].open = true;
+            rootState[data.nameSpace]['modal'][data.name].properties = data.properties;
+        } else {
+            rootState['modal'][data.name].open = true;
+            rootState['modal'][data.name].properties = data.properties;
+        }
+    },
+
+    setResultCurrentModal: ({rootState}, data) => {
+        if(data.nameSpace) {
+            rootState[data.nameSpace]['modal'][data.name].result = data.result;
+        } else {
+            rootState['modal'][data.name].result = data.result;
+        }
+    },
+
+    closeModal: ({rootState}, data) => {
+        if(data.nameSpace) {
+            rootState[data.nameSpace]['modal'][data.name].open = false;
+            rootState[data.nameSpace]['modal'][data.name].properties = {};
+        } else {
+            rootState['modal'][data.name].open = false;
+            rootState['modal'][data.name].properties = {};
+        }
+    }
+};

resources/js/Global/store/modules/modal/mutations.js

@@ -1,38 +1,3 @@
 export default {
-    changeCurrentModal: (state, data) => {
-        state.currentModal.slice(-1)[0].result = '';
-        state.currentModal.slice(-1)[0].name = data.modal;
-        if (data.properties) {
-            state.currentModal.slice(-1)[0].properties = data.properties;
-        }
-    },
-
-    addModal: (state, data) => {
-       let modal = {
-            name : data.modal,
-            result : '',
-        };
-        if (data.properties) {
-            modal['properties'] = data.properties;
-        }
-        state.currentModal.push(modal);
-    },
-
-    setResultCurrentModal: (state, data) => {
-        state.currentModal.slice(-1)[0].result = data;
-    },
-
-    closeModal: state => {
-        state.currentModal.pop();
-    },
-    
-    closeAllModals : state => {
-        state.currentModal = [
-            {
-                name: '',
-                properties: {},
-                result: {}
-            },
-        ];
-    }
+   //
 };

resources/js/Global/utils/api/request/apolloApi.js

@@ -7,7 +7,7 @@ export default class apolloApi {
 
 		this.method = urlObj.method;
 		this.gql = urlObj.gql;
-		this.variables = urlObj.variables;
+		this.variables = urlObj.data;
 	}
 
 	init() {

resources/js/Global/utils/api/request/axiosApi.js

@@ -1,4 +1,5 @@
 import axios from "axios";
+import { urlGenerator } from '@Global/services/url.service.js';
 
 export default class axiosApi {
     
@@ -7,7 +8,9 @@ export default class axiosApi {
 		this.baseURL = '/';
 		
 		this.method = urlObj.method;
-		this.url = urlObj.url;
+		this.url = urlGenerator(urlObj.url, urlObj.data);
+		console.log(this.url);
+		
 		this.data = urlObj.data;
 	}
 

webpack.mix.js

@@ -35,7 +35,7 @@ mix.js('resources/js/Authentication/app.js', 'public/js/vue/Authentication')
     .js('resources/js/User/app.js', 'public/js/vue/User');
 
     
-require('./modules/wm-core/webpack.mix');
+// require('./modules/wm-core/webpack.mix');
 require('./modules/wm-common/webpack.mix');
 
 require('./modules/wm-crm/webpack.mix');