@iankibetsh/shframework 4.1.4 → 4.1.6

package/dist/dist/library.mjs.css

@@ -1,36 +1,4 @@
 
-.colored-toast.swal2-icon-success {
-  background-color: #a5dc86 !important;
-}
-
-.colored-toast.swal2-icon-error {
-  background-color: #f27474 !important;
-}
-
-.colored-toast.swal2-icon-warning {
-  background-color: #f8bb86 !important;
-}
-
-.colored-toast.swal2-icon-info {
-  background-color: #3fc3ee !important;
-}
-
-.colored-toast.swal2-icon-question {
-  background-color: #87adbd !important;
-}
-
-.colored-toast .swal2-title {
-  color: white;
-}
-
-.colored-toast .swal2-close {
-  color: white;
-}
-
-.colored-toast .swal2-html-container {
-  color: white;
-}
-
 .sh-phone{
   display: flex;
   width: 100%;
@@ -63,6 +31,38 @@
   opacity: 0.5;
 }
 
+.colored-toast.swal2-icon-success {
+  background-color: #a5dc86 !important;
+}
+
+.colored-toast.swal2-icon-error {
+  background-color: #f27474 !important;
+}
+
+.colored-toast.swal2-icon-warning {
+  background-color: #f8bb86 !important;
+}
+
+.colored-toast.swal2-icon-info {
+  background-color: #3fc3ee !important;
+}
+
+.colored-toast.swal2-icon-question {
+  background-color: #87adbd !important;
+}
+
+.colored-toast .swal2-title {
+  color: white;
+}
+
+.colored-toast .swal2-close {
+  color: white;
+}
+
+.colored-toast .swal2-html-container {
+  color: white;
+}
+
 .sh-selected-item{
   line-height: unset!important;
 }

package/dist/library.js

@@ -9,8 +9,8 @@ var bootstrap = require('bootstrap');
 var NProgress = require('nprogress');
 var vue = require('vue');
 var _ = require('lodash');
-var vueRouter = require('vue-router');
 var pinia = require('pinia');
+var vueRouter = require('vue-router');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -3754,6 +3754,102 @@ script$g.render = render$1;
 script$g.__scopeId = "data-v-55cf77fb";
 script$g.__file = "src/lib/components/others/NoRecords.vue";
 
+const useUserStore = pinia.defineStore('user-store', {
+  state: () => ({
+    user: null,
+    role: null,
+    permissions: null,
+    menus: [],
+    loggedOut: false
+  }),
+  actions: {
+    setUser (){
+      let user = null;
+      try {
+         user = ShStorage.getItem('user') ? ShStorage.getItem('user') : null;
+      } catch (error) {
+        user= null;
+      }
+      if (user) {
+        user.isAllowedTo = function (slug) {
+          if (this.permissions) {
+            let permissions = [];
+            if (typeof this.permissions === 'string') {
+              permissions = this.permissions;
+            } else {
+              permissions = this.permissions;
+            }
+            return permissions.includes(slug)
+          }
+          return false
+        };
+      }
+      this.user = user;
+      shApis.doGet('auth/user').then(res => {
+        let user = res.data.user;
+        if (typeof(user) === 'undefined') {
+           user = res.data;
+        }
+        ShStorage.setItem('user',user);
+        user.signOut = this.signOut;
+        user.logout = this.signOut;
+        user.logOut = this.signOut;
+        user.isAllowedTo = function (slug) {
+          if(!slug){
+            return true
+          }
+          if (this.permissions) {
+            let permissions = [];
+            if (typeof this.permissions === 'string') {
+              permissions = this.permissions;
+            } else {
+              permissions = this.permissions;
+            }
+            return permissions.includes(slug)
+          }
+          return false
+        };
+        this.user = user;
+      }).catch((reason) => {
+        if (reason.response && reason.response.status) {
+          if(reason.response.status === 401) {
+            ShStorage.setItem('user',null);
+            this.user = null;
+          }
+          this.loggedOut = true;
+        }
+      });
+      if (this.user) {
+        if (typeof this.user.permissions === 'string') {
+          this.permissions = this.user.permissions;
+        } else {
+          this.permissions = this.user.permissions;
+        }
+      }
+      const timeNow = moment__default["default"]().toISOString();
+      ShStorage.setItem('session_start',timeNow);
+    },
+    signOut () {
+      shRepo.signOutUser();
+    },
+    logOut () {
+      this.signOut();
+    },
+    getUser () {
+      this.setUser();
+    },
+    setAccessToken (accessToken) {
+      ShStorage.setItem('access_token', accessToken);
+      this.setUser();
+    }
+  },
+  getters: {
+    userId (state) {
+      return state.user === null ? null:state.user.id
+    }
+  }
+});
+
 var script$f = {
   name: 'Pagination',
   props: ['pagination_data', 'loadMore', 'hideCount', 'hideLoadMore', 'paginationStyle'],
@@ -4403,7 +4499,7 @@ const _hoisted_19 = [
 ];
 const _hoisted_20 = {
   key: 1,
-  class: "alert alert-danger"
+  class: "alert alert-danger error-loading"
 };
 const _hoisted_21 = /*#__PURE__*/vue.createElementVNode("i", { class: "bi-info-circle" }, null, -1 /* HOISTED */);
 const _hoisted_22 = { class: "sh-thead" };
@@ -4815,6 +4911,8 @@ var script$b = /*#__PURE__*/Object.assign(__default__, {
 
 const noRecordsComponent = vue.inject('noRecordsComponent', script$g);
 
+const {user} = pinia.storeToRefs(useUserStore());
+
 return (_ctx, _cache) => {
   const _component_router_link = vue.resolveComponent("router-link");
 
@@ -4897,14 +4995,14 @@ return (_ctx, _cache) => {
         ], 64 /* STABLE_FRAGMENT */))
       : (_ctx.hasRecordsSlot)
         ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 3 }, [
-            (_ctx.loading === 'loading')
+            (_ctx.loading === 'loading' && !__props.cacheKey)
               ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_17$1, _hoisted_19))
-              : (_ctx.loading === 'error')
+              : (_ctx.loading === 'error' && !__props.cacheKey)
                 ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_20, [
                     vue.createElementVNode("span", null, vue.toDisplayString(_ctx.loading_error), 1 /* TEXT */)
                   ]))
                 : vue.createCommentVNode("v-if", true),
-            (_ctx.loading === 'done')
+            (_ctx.loading === 'done' || __props.cacheKey)
               ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 2 }, [
                   (_ctx.records.length === 0)
                     ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(noRecordsComponent)), { key: 0 }, {
@@ -5021,7 +5119,7 @@ return (_ctx, _cache) => {
                                       return (vue.openBlock(), vue.createElementBlock(vue.Fragment, {
                                         key: act.path
                                       }, [
-                                        (!act.permission || _ctx.user.isAllowedTo(act.permission))
+                                        (!act.permission || vue.unref(user).isAllowedTo(act.permission))
                                           ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
                                               (!act.validator || act.validator(record))
                                                 ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
@@ -5191,7 +5289,7 @@ return (_ctx, _cache) => {
                                     return (vue.openBlock(), vue.createElementBlock(vue.Fragment, {
                                       key: act.path
                                     }, [
-                                      (!act.permission || _ctx.user.isAllowedTo(act.permission))
+                                      (!act.permission || vue.unref(user).isAllowedTo(act.permission))
                                         ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
                                             (!act.validator || act.validator(record))
                                               ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
@@ -5576,102 +5674,6 @@ return (_ctx, _cache) => {
 
 script$7.__file = "src/lib/components/ShCanvasBtn.vue";
 
-const useUserStore = pinia.defineStore('user-store', {
-  state: () => ({
-    user: null,
-    role: null,
-    permissions: null,
-    menus: [],
-    loggedOut: false
-  }),
-  actions: {
-    setUser (){
-      let user = null;
-      try {
-         user = ShStorage.getItem('user') ? ShStorage.getItem('user') : null;
-      } catch (error) {
-        user= null;
-      }
-      if (user) {
-        user.isAllowedTo = function (slug) {
-          if (this.permissions) {
-            let permissions = [];
-            if (typeof this.permissions === 'string') {
-              permissions = this.permissions;
-            } else {
-              permissions = this.permissions;
-            }
-            return permissions.includes(slug)
-          }
-          return false
-        };
-      }
-      this.user = user;
-      shApis.doGet('auth/user').then(res => {
-        let user = res.data.user;
-        if (typeof(user) === 'undefined') {
-           user = res.data;
-        }
-        ShStorage.setItem('user',user);
-        user.signOut = this.signOut;
-        user.logout = this.signOut;
-        user.logOut = this.signOut;
-        user.isAllowedTo = function (slug) {
-          if(!slug){
-            return true
-          }
-          if (this.permissions) {
-            let permissions = [];
-            if (typeof this.permissions === 'string') {
-              permissions = this.permissions;
-            } else {
-              permissions = this.permissions;
-            }
-            return permissions.includes(slug)
-          }
-          return false
-        };
-        this.user = user;
-      }).catch((reason) => {
-        if (reason.response && reason.response.status) {
-          if(reason.response.status === 401) {
-            ShStorage.setItem('user',null);
-            this.user = null;
-          }
-          this.loggedOut = true;
-        }
-      });
-      if (this.user) {
-        if (typeof this.user.permissions === 'string') {
-          this.permissions = this.user.permissions;
-        } else {
-          this.permissions = this.user.permissions;
-        }
-      }
-      const timeNow = moment__default["default"]().toISOString();
-      ShStorage.setItem('session_start',timeNow);
-    },
-    signOut () {
-      shRepo.signOutUser();
-    },
-    logOut () {
-      this.signOut();
-    },
-    getUser () {
-      this.setUser();
-    },
-    setAccessToken (accessToken) {
-      ShStorage.setItem('access_token', accessToken);
-      this.setUser();
-    }
-  },
-  getters: {
-    userId (state) {
-      return state.user === null ? null:state.user.id
-    }
-  }
-});
-
 const _withScopeId$1 = n => (vue.pushScopeId("data-v-0d4fa0ac"),n=n(),vue.popScopeId(),n);
 const _hoisted_1$4 = { class: "row permissions-main d-flex" };
 const _hoisted_2$3 = {

package/dist/library.mjs

@@ -5,8 +5,8 @@ import { Modal, Offcanvas } from 'bootstrap';
 import NProgress from 'nprogress';
 import { openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createCommentVNode, withDirectives, Fragment, renderList, vModelSelect, vModelText, ref, onMounted, unref, normalizeClass, resolveComponent, createBlock, resolveDynamicComponent, watch, inject, mergeProps, normalizeStyle, renderSlot, createVNode, normalizeProps, guardReactiveProps, withCtx, createStaticVNode, vModelCheckbox, shallowRef, pushScopeId, popScopeId, markRaw, computed, isRef } from 'vue';
 import _ from 'lodash';
-import { useRoute, useRouter } from 'vue-router';
 import { defineStore, storeToRefs } from 'pinia';
+import { useRoute, useRouter } from 'vue-router';
 
 function setItem (key, value) {
   let toStore = value;
@@ -3742,6 +3742,102 @@ script$g.render = render$1;
 script$g.__scopeId = "data-v-55cf77fb";
 script$g.__file = "src/lib/components/others/NoRecords.vue";
 
+const useUserStore = defineStore('user-store', {
+  state: () => ({
+    user: null,
+    role: null,
+    permissions: null,
+    menus: [],
+    loggedOut: false
+  }),
+  actions: {
+    setUser (){
+      let user = null;
+      try {
+         user = ShStorage.getItem('user') ? ShStorage.getItem('user') : null;
+      } catch (error) {
+        user= null;
+      }
+      if (user) {
+        user.isAllowedTo = function (slug) {
+          if (this.permissions) {
+            let permissions = [];
+            if (typeof this.permissions === 'string') {
+              permissions = this.permissions;
+            } else {
+              permissions = this.permissions;
+            }
+            return permissions.includes(slug)
+          }
+          return false
+        };
+      }
+      this.user = user;
+      shApis.doGet('auth/user').then(res => {
+        let user = res.data.user;
+        if (typeof(user) === 'undefined') {
+           user = res.data;
+        }
+        ShStorage.setItem('user',user);
+        user.signOut = this.signOut;
+        user.logout = this.signOut;
+        user.logOut = this.signOut;
+        user.isAllowedTo = function (slug) {
+          if(!slug){
+            return true
+          }
+          if (this.permissions) {
+            let permissions = [];
+            if (typeof this.permissions === 'string') {
+              permissions = this.permissions;
+            } else {
+              permissions = this.permissions;
+            }
+            return permissions.includes(slug)
+          }
+          return false
+        };
+        this.user = user;
+      }).catch((reason) => {
+        if (reason.response && reason.response.status) {
+          if(reason.response.status === 401) {
+            ShStorage.setItem('user',null);
+            this.user = null;
+          }
+          this.loggedOut = true;
+        }
+      });
+      if (this.user) {
+        if (typeof this.user.permissions === 'string') {
+          this.permissions = this.user.permissions;
+        } else {
+          this.permissions = this.user.permissions;
+        }
+      }
+      const timeNow = moment().toISOString();
+      ShStorage.setItem('session_start',timeNow);
+    },
+    signOut () {
+      shRepo.signOutUser();
+    },
+    logOut () {
+      this.signOut();
+    },
+    getUser () {
+      this.setUser();
+    },
+    setAccessToken (accessToken) {
+      ShStorage.setItem('access_token', accessToken);
+      this.setUser();
+    }
+  },
+  getters: {
+    userId (state) {
+      return state.user === null ? null:state.user.id
+    }
+  }
+});
+
 var script$f = {
   name: 'Pagination',
   props: ['pagination_data', 'loadMore', 'hideCount', 'hideLoadMore', 'paginationStyle'],
@@ -4391,7 +4487,7 @@ const _hoisted_19 = [
 ];
 const _hoisted_20 = {
   key: 1,
-  class: "alert alert-danger"
+  class: "alert alert-danger error-loading"
 };
 const _hoisted_21 = /*#__PURE__*/createElementVNode("i", { class: "bi-info-circle" }, null, -1 /* HOISTED */);
 const _hoisted_22 = { class: "sh-thead" };
@@ -4803,6 +4899,8 @@ var script$b = /*#__PURE__*/Object.assign(__default__, {
 
 const noRecordsComponent = inject('noRecordsComponent', script$g);
 
+const {user} = storeToRefs(useUserStore());
+
 return (_ctx, _cache) => {
   const _component_router_link = resolveComponent("router-link");
 
@@ -4885,14 +4983,14 @@ return (_ctx, _cache) => {
         ], 64 /* STABLE_FRAGMENT */))
       : (_ctx.hasRecordsSlot)
         ? (openBlock(), createElementBlock(Fragment, { key: 3 }, [
-            (_ctx.loading === 'loading')
+            (_ctx.loading === 'loading' && !__props.cacheKey)
               ? (openBlock(), createElementBlock("div", _hoisted_17$1, _hoisted_19))
-              : (_ctx.loading === 'error')
+              : (_ctx.loading === 'error' && !__props.cacheKey)
                 ? (openBlock(), createElementBlock("div", _hoisted_20, [
                     createElementVNode("span", null, toDisplayString(_ctx.loading_error), 1 /* TEXT */)
                   ]))
                 : createCommentVNode("v-if", true),
-            (_ctx.loading === 'done')
+            (_ctx.loading === 'done' || __props.cacheKey)
               ? (openBlock(), createElementBlock(Fragment, { key: 2 }, [
                   (_ctx.records.length === 0)
                     ? (openBlock(), createBlock(resolveDynamicComponent(unref(noRecordsComponent)), { key: 0 }, {
@@ -5009,7 +5107,7 @@ return (_ctx, _cache) => {
                                       return (openBlock(), createElementBlock(Fragment, {
                                         key: act.path
                                       }, [
-                                        (!act.permission || _ctx.user.isAllowedTo(act.permission))
+                                        (!act.permission || unref(user).isAllowedTo(act.permission))
                                           ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                                               (!act.validator || act.validator(record))
                                                 ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
@@ -5179,7 +5277,7 @@ return (_ctx, _cache) => {
                                     return (openBlock(), createElementBlock(Fragment, {
                                       key: act.path
                                     }, [
-                                      (!act.permission || _ctx.user.isAllowedTo(act.permission))
+                                      (!act.permission || unref(user).isAllowedTo(act.permission))
                                         ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                                             (!act.validator || act.validator(record))
                                               ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
@@ -5564,102 +5662,6 @@ return (_ctx, _cache) => {
 
 script$7.__file = "src/lib/components/ShCanvasBtn.vue";
 
-const useUserStore = defineStore('user-store', {
-  state: () => ({
-    user: null,
-    role: null,
-    permissions: null,
-    menus: [],
-    loggedOut: false
-  }),
-  actions: {
-    setUser (){
-      let user = null;
-      try {
-         user = ShStorage.getItem('user') ? ShStorage.getItem('user') : null;
-      } catch (error) {
-        user= null;
-      }
-      if (user) {
-        user.isAllowedTo = function (slug) {
-          if (this.permissions) {
-            let permissions = [];
-            if (typeof this.permissions === 'string') {
-              permissions = this.permissions;
-            } else {
-              permissions = this.permissions;
-            }
-            return permissions.includes(slug)
-          }
-          return false
-        };
-      }
-      this.user = user;
-      shApis.doGet('auth/user').then(res => {
-        let user = res.data.user;
-        if (typeof(user) === 'undefined') {
-           user = res.data;
-        }
-        ShStorage.setItem('user',user);
-        user.signOut = this.signOut;
-        user.logout = this.signOut;
-        user.logOut = this.signOut;
-        user.isAllowedTo = function (slug) {
-          if(!slug){
-            return true
-          }
-          if (this.permissions) {
-            let permissions = [];
-            if (typeof this.permissions === 'string') {
-              permissions = this.permissions;
-            } else {
-              permissions = this.permissions;
-            }
-            return permissions.includes(slug)
-          }
-          return false
-        };
-        this.user = user;
-      }).catch((reason) => {
-        if (reason.response && reason.response.status) {
-          if(reason.response.status === 401) {
-            ShStorage.setItem('user',null);
-            this.user = null;
-          }
-          this.loggedOut = true;
-        }
-      });
-      if (this.user) {
-        if (typeof this.user.permissions === 'string') {
-          this.permissions = this.user.permissions;
-        } else {
-          this.permissions = this.user.permissions;
-        }
-      }
-      const timeNow = moment().toISOString();
-      ShStorage.setItem('session_start',timeNow);
-    },
-    signOut () {
-      shRepo.signOutUser();
-    },
-    logOut () {
-      this.signOut();
-    },
-    getUser () {
-      this.setUser();
-    },
-    setAccessToken (accessToken) {
-      ShStorage.setItem('access_token', accessToken);
-      this.setUser();
-    }
-  },
-  getters: {
-    userId (state) {
-      return state.user === null ? null:state.user.id
-    }
-  }
-});
-
 const _withScopeId$1 = n => (pushScopeId("data-v-0d4fa0ac"),n=n(),popScopeId(),n);
 const _hoisted_1$4 = { class: "row permissions-main d-flex" };
 const _hoisted_2$3 = {

package/package.json

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