@iankibetsh/shframework 4.2.1 → 4.2.4

package/dist/library.js

@@ -186,7 +186,16 @@ function showToast(message, toastType, config){
         toastType = 'success';
     }
     if (config) {
-        Object.keys(config).map(key => mixinConfig[key] = config[key]);
+        Object.keys(config).map(key =>{
+            let newKey = key;
+            if(key === 'duration'){
+                newKey = 'timer';
+            }
+            if(key === 'timeout'){
+                newKey = 'timer';
+            }
+            mixinConfig[newKey] = config[key];
+        });
     }
     console.log(mixinConfig);
     const Toast = Swal__default["default"].mixin(mixinConfig);
@@ -395,26 +404,34 @@ const axios = Axios__default["default"].create({
   baseURL: apiUrl
 });
 window.shAxionInstance = axios;
-function doGet (endPoint, data) {
+function doGet (endPoint, data,extraConfig) {
   updateSession();
-  return axios.get(endPoint, {
-    params: data,
-    crossOrigin: true,
+  const config = {
     headers: {
       Authorization: 'Bearer ' + ShStorage.getItem('access_token')
-      // 'X-CSRF-TOKEN': 'INVALID'
     }
+  };
+    if (extraConfig) {
+        Object.assign(config, extraConfig);
+    }
+  return axios.get(endPoint, {
+    params: data,
+    crossOrigin: true
   })
 }
-function doPost (endPoint, data) {
+function doPost (endPoint, data, extraConfig) {
   updateSession();
+  const config = {
+    headers: {
+      Authorization: 'Bearer ' + ShStorage.getItem('access_token')
+    }
+  };
+    if (extraConfig) {
+        Object.assign(config, extraConfig);
+    }
   return axios.post(endPoint,
     data,
-    {
-      headers: {
-        Authorization: 'Bearer ' + ShStorage.getItem('access_token')
-      }
-    }
+    config
   )
 }
 function graphQlQuery(query) {

package/dist/library.mjs

@@ -174,7 +174,16 @@ function showToast(message, toastType, config){
         toastType = 'success';
     }
     if (config) {
-        Object.keys(config).map(key => mixinConfig[key] = config[key]);
+        Object.keys(config).map(key =>{
+            let newKey = key;
+            if(key === 'duration'){
+                newKey = 'timer';
+            }
+            if(key === 'timeout'){
+                newKey = 'timer';
+            }
+            mixinConfig[newKey] = config[key];
+        });
     }
     console.log(mixinConfig);
     const Toast = Swal.mixin(mixinConfig);
@@ -383,26 +392,34 @@ const axios = Axios.create({
   baseURL: apiUrl
 });
 window.shAxionInstance = axios;
-function doGet (endPoint, data) {
+function doGet (endPoint, data,extraConfig) {
   updateSession();
-  return axios.get(endPoint, {
-    params: data,
-    crossOrigin: true,
+  const config = {
     headers: {
       Authorization: 'Bearer ' + ShStorage.getItem('access_token')
-      // 'X-CSRF-TOKEN': 'INVALID'
     }
+  };
+    if (extraConfig) {
+        Object.assign(config, extraConfig);
+    }
+  return axios.get(endPoint, {
+    params: data,
+    crossOrigin: true
   })
 }
-function doPost (endPoint, data) {
+function doPost (endPoint, data, extraConfig) {
   updateSession();
+  const config = {
+    headers: {
+      Authorization: 'Bearer ' + ShStorage.getItem('access_token')
+    }
+  };
+    if (extraConfig) {
+        Object.assign(config, extraConfig);
+    }
   return axios.post(endPoint,
     data,
-    {
-      headers: {
-        Authorization: 'Bearer ' + ShStorage.getItem('access_token')
-      }
-    }
+    config
   )
 }
 function graphQlQuery(query) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iankibetsh/shframework",
-  "version": "4.2.1",
+  "version": "4.2.4",
   "description": "Vue library for handling laravel backend",
   "main": "dist/library.js",
   "module": "dist/library.mjs",