@iankibetsh/shframework 1.1.9 → 1.2.2

package/dist/dist/library.mjs.css

@@ -1,4 +1,36 @@
 
+.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%;
@@ -31,36 +63,19 @@
   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;
+.sh-selected-item{
+  line-height: unset!important;
 }
-
-.colored-toast .swal2-title {
-  color: white;
+.sh-suggestion-input{
+  padding: 0.375rem 0.75rem;
 }
-
-.colored-toast .swal2-close {
-  color: white;
+.sh-suggest{
+  margin-bottom: 1rem;
 }
-
-.colored-toast .swal2-html-container {
-  color: white;
+.sh-suggest-control::after{
+  margin-top: auto;
+  margin-bottom: auto;
+  margin-right: 0.255em;
 }
 
 :root {
@@ -84,21 +99,6 @@
   }
 }
 
-.sh-selected-item{
-  line-height: unset!important;
-}
-.sh-suggestion-input{
-  padding: 0.375rem 0.75rem;
-}
-.sh-suggest{
-  margin-bottom: 1rem;
-}
-.sh-suggest-control::after{
-  margin-top: auto;
-  margin-bottom: auto;
-  margin-right: 0.255em;
-}
-
 .sh-forgot-link, .sh-register-link{
   cursor: pointer;
 }

package/dist/library.js

@@ -9,6 +9,7 @@ var vue = require('vue');
 var NProgress = require('nprogress');
 var Editor = require('@tinymce/tinymce-vue');
 var pinia = require('pinia');
+var shRepo$1 = require('@/lib/repo/helpers/ShRepo.js');
 var vueRouter = require('vue-router');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -18,6 +19,7 @@ var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 var Swal__default = /*#__PURE__*/_interopDefaultLegacy(Swal);
 var NProgress__default = /*#__PURE__*/_interopDefaultLegacy(NProgress);
 var Editor__default = /*#__PURE__*/_interopDefaultLegacy(Editor);
+var shRepo__default = /*#__PURE__*/_interopDefaultLegacy(shRepo$1);
 
 function setItem (key, value) {
   let toStore = value;
@@ -135,6 +137,23 @@ function getMenuCount (url) {
   });
 }
 
+const signOutUser = ()=>{
+  const loginUrl = getShConfig('loginUrl','auth/login');
+  const logoutApiEndPoint = getShConfig('logoutApiEndpoint','auth/logout');
+  console.log(loginUrl,logoutApiEndPoint);
+  shApis.doPost(logoutApiEndPoint).then(res=>{
+    ShStorage.removeItem('access_token');
+    ShStorage.removeItem('user');
+    ShStorage.removeItem('last_activity');
+    window.location.href = loginUrl;
+  }).catch(ex=>{
+    ShStorage.removeItem('access_token');
+    ShStorage.removeItem('user');
+    ShStorage.removeItem('last_activity');
+    window.location.href = loginUrl;
+  });
+};
+
 
 const Toast = Swal__default["default"].mixin({
   toast: true,
@@ -151,9 +170,11 @@ const Toast = Swal__default["default"].mixin({
     toast.addEventListener('mouseleave', Swal__default["default"].resumeTimer);
   }
 });
-function getConfig() {
+function getShConfig(key = null,def = '') {
   const config = ShStorage.getItem('ShConfig');
-  console.log(config);
+  if(key) {
+    return config[key] ?? def
+  }
   return config
 }
 function showToast (message, toastType, position) {
@@ -225,37 +246,32 @@ var shRepo = {
   runPlainRequest,
   getMenuCount,
   setTabCounts,
-  getConfig,
+  getShConfig,
   showToast,
   runSilentRequest,
   swalHttpError,
   formatHttpCatchError,
   formatDate,
   numberFormat,
-  formatNumber
+  formatNumber,
+  signOutUser
 };
 
 startSession();
 function logoutUser(){
-  const loginUrl = shRepo.getConfig().loginUrl;
-  const logoutApiEndpoint = vue.inject('logoutApiEndpoint','auth/logout');
-  shApis.doPost(logoutApiEndpoint ?? 'auth/logout').then(res=>{
-    ShStorage.removeItem('access_token');
-    ShStorage.removeItem('user');
-    ShStorage.removeItem('last_activity');
-    if(window.shInterval){
-      clearInterval(window.shInterval);
-    }
-    window.location.href = loginUrl;
-  }).catch(ex=>{
-    ShStorage.removeItem('access_token');
-    ShStorage.removeItem('user');
-    if(window.shInterval){
-      clearInterval(window.shInterval);
-    }
-    window.location.href = loginUrl;
-  });
-  ShStorage.getItem('user');
+  if(!sessionRestored()){
+    shRepo.signOutUser();
+  } else {
+    console.log('session has been restored in another tab');
+  }
+}
+function sessionRestored(){
+  const timeout = ShStorage.getItem('sessionTimeout') * 60;
+  const last_activity = ShStorage.getItem('last_activity');
+  const pastSeconds = moment__default["default"]().diff(last_activity, 'seconds');
+  if(!ShStorage.getItem('access_token'))
+    return false
+  return pastSeconds < timeout
 }
 const checkSession = function (isCheking) {
   const timeout = ShStorage.getItem('sessionTimeout');
@@ -297,6 +313,10 @@ async function shSwalLogout (seconds = 30) {
     showLoaderOnConfirm: true,
     didOpen(popup) {
       timerInterval = setInterval(() => {
+        // if(sessionRestored() && ShStorage.getItem('access_token')){
+        //   console.log('swal closed by session restored')
+        //   Swal.close()
+        // }
         Swal__default["default"].getHtmlContainer().querySelector('strong')
             .textContent = (Swal__default["default"].getTimerLeft() / 1000)
             .toFixed(0);
@@ -4498,6 +4518,9 @@ const useUserStore = pinia.defineStore('user-store', {
            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
@@ -4534,9 +4557,7 @@ const useUserStore = pinia.defineStore('user-store', {
       ShStorage.setItem('session_start',timeNow);
     },
     signOut () {
-      ShStorage.setItem('user',null);
-      ShStorage.setItem('access_token',null);
-      this.user = null;
+      shRepo__default["default"].signOutUser();
     },
     logOut () {
       this.signOut();

package/dist/library.mjs

@@ -1,10 +1,11 @@
 import Axios from 'axios';
 import moment from 'moment';
 import Swal from 'sweetalert2';
-import { inject, openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createCommentVNode, withDirectives, Fragment, renderList, vModelSelect, vModelText, resolveComponent, withModifiers, createVNode, ref, onMounted, unref, normalizeClass, createBlock, resolveDynamicComponent, renderSlot, normalizeProps, guardReactiveProps, withCtx, mergeProps, createStaticVNode, shallowRef, computed, isRef, vModelCheckbox, watch, pushScopeId, popScopeId } from 'vue';
+import { openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createCommentVNode, withDirectives, Fragment, renderList, vModelSelect, vModelText, resolveComponent, withModifiers, createVNode, ref, onMounted, unref, normalizeClass, createBlock, resolveDynamicComponent, renderSlot, normalizeProps, guardReactiveProps, withCtx, mergeProps, createStaticVNode, shallowRef, computed, isRef, vModelCheckbox, inject, watch, pushScopeId, popScopeId } from 'vue';
 import NProgress from 'nprogress';
 import Editor from '@tinymce/tinymce-vue';
 import { defineStore, storeToRefs } from 'pinia';
+import shRepo$1 from '@/lib/repo/helpers/ShRepo.js';
 import { useRoute, useRouter } from 'vue-router';
 
 function setItem (key, value) {
@@ -123,6 +124,23 @@ function getMenuCount (url) {
   });
 }
 
+const signOutUser = ()=>{
+  const loginUrl = getShConfig('loginUrl','auth/login');
+  const logoutApiEndPoint = getShConfig('logoutApiEndpoint','auth/logout');
+  console.log(loginUrl,logoutApiEndPoint);
+  shApis.doPost(logoutApiEndPoint).then(res=>{
+    ShStorage.removeItem('access_token');
+    ShStorage.removeItem('user');
+    ShStorage.removeItem('last_activity');
+    window.location.href = loginUrl;
+  }).catch(ex=>{
+    ShStorage.removeItem('access_token');
+    ShStorage.removeItem('user');
+    ShStorage.removeItem('last_activity');
+    window.location.href = loginUrl;
+  });
+};
+
 
 const Toast = Swal.mixin({
   toast: true,
@@ -139,9 +157,11 @@ const Toast = Swal.mixin({
     toast.addEventListener('mouseleave', Swal.resumeTimer);
   }
 });
-function getConfig() {
+function getShConfig(key = null,def = '') {
   const config = ShStorage.getItem('ShConfig');
-  console.log(config);
+  if(key) {
+    return config[key] ?? def
+  }
   return config
 }
 function showToast (message, toastType, position) {
@@ -213,37 +233,32 @@ var shRepo = {
   runPlainRequest,
   getMenuCount,
   setTabCounts,
-  getConfig,
+  getShConfig,
   showToast,
   runSilentRequest,
   swalHttpError,
   formatHttpCatchError,
   formatDate,
   numberFormat,
-  formatNumber
+  formatNumber,
+  signOutUser
 };
 
 startSession();
 function logoutUser(){
-  const loginUrl = shRepo.getConfig().loginUrl;
-  const logoutApiEndpoint = inject('logoutApiEndpoint','auth/logout');
-  shApis.doPost(logoutApiEndpoint ?? 'auth/logout').then(res=>{
-    ShStorage.removeItem('access_token');
-    ShStorage.removeItem('user');
-    ShStorage.removeItem('last_activity');
-    if(window.shInterval){
-      clearInterval(window.shInterval);
-    }
-    window.location.href = loginUrl;
-  }).catch(ex=>{
-    ShStorage.removeItem('access_token');
-    ShStorage.removeItem('user');
-    if(window.shInterval){
-      clearInterval(window.shInterval);
-    }
-    window.location.href = loginUrl;
-  });
-  ShStorage.getItem('user');
+  if(!sessionRestored()){
+    shRepo.signOutUser();
+  } else {
+    console.log('session has been restored in another tab');
+  }
+}
+function sessionRestored(){
+  const timeout = ShStorage.getItem('sessionTimeout') * 60;
+  const last_activity = ShStorage.getItem('last_activity');
+  const pastSeconds = moment().diff(last_activity, 'seconds');
+  if(!ShStorage.getItem('access_token'))
+    return false
+  return pastSeconds < timeout
 }
 const checkSession = function (isCheking) {
   const timeout = ShStorage.getItem('sessionTimeout');
@@ -285,6 +300,10 @@ async function shSwalLogout (seconds = 30) {
     showLoaderOnConfirm: true,
     didOpen(popup) {
       timerInterval = setInterval(() => {
+        // if(sessionRestored() && ShStorage.getItem('access_token')){
+        //   console.log('swal closed by session restored')
+        //   Swal.close()
+        // }
         Swal.getHtmlContainer().querySelector('strong')
             .textContent = (Swal.getTimerLeft() / 1000)
             .toFixed(0);
@@ -4486,6 +4505,9 @@ const useUserStore = defineStore('user-store', {
            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
@@ -4522,9 +4544,7 @@ const useUserStore = defineStore('user-store', {
       ShStorage.setItem('session_start',timeNow);
     },
     signOut () {
-      ShStorage.setItem('user',null);
-      ShStorage.setItem('access_token',null);
-      this.user = null;
+      shRepo$1.signOutUser();
     },
     logOut () {
       this.signOut();

package/package.json

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