@iankibetsh/shframework 1.1.7 → 1.1.9

package/dist/library.js

@@ -209,6 +209,15 @@ function formatDate(date, format) {
   }
   return moment__default["default"](date).format(format)
 }
+function formatNumber(amount,decimalPoints = 0){
+  return numberFormat(amount,decimalPoints)
+}
+function numberFormat(amount,decimalPoints = 0) {
+  let formatted = parseFloat(amount).toFixed(decimalPoints);
+  formatted =  new Intl.NumberFormat().format(formatted);
+  const formattedArr = formatted.split('.');
+  return decimalPoints === 0 ? formattedArr[0] : formattedArr[0] +'.' + (formattedArr[1] || '0').padEnd(decimalPoints,0)
+}
 
 var shRepo = {
   swalSuccess,
@@ -221,7 +230,9 @@ var shRepo = {
   runSilentRequest,
   swalHttpError,
   formatHttpCatchError,
-  formatDate
+  formatDate,
+  numberFormat,
+  formatNumber
 };
 
 startSession();
@@ -232,10 +243,16 @@ function logoutUser(){
     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');
@@ -248,18 +265,15 @@ const checkSession = function (isCheking) {
     const pastSeconds = moment__default["default"]().diff(last_activity, 'seconds');
     if(pastMinutes >= timeout) {
       const gracePeriod = pastSeconds - (timeout * 60);
-      if (gracePeriod >= 30 ) {
+      if (gracePeriod >= 60 ) {
         logoutUser();
       }
       else {
         if (!window.ShConfirmation)
         {
-          window.ShConfirmation = shSwalLogout();
+          window.ShConfirmation = shSwalLogout(30);
         }
       }
-    } else {
-      console.log(pastSeconds);
-      console.log(pastMinutes);
     }
   }else {
     if (window.shInterval) {
@@ -267,23 +281,35 @@ const checkSession = function (isCheking) {
     }
   }
 };
-
-async function shSwalLogout () {
+async function shSwalLogout (seconds = 30) {
+  let timerInterval;
   return Swal__default["default"].fire({
     title: 'Your session is about to Expire!',
-    html: 'You will be logout due to inactivity!',
+    html: 'You will be logged out in <strong></strong> seconds due to inactivity!',
     showCancelButton: true,
     cancelButtonColor: '#32c787',
     confirmButtonColor: '#000',
     cancelButtonText: 'Stay signed in',
     confirmButtonText: 'Sign out now!',
-    timer: 100000,
+    timer: seconds * 1000,
     allowOutsideClick: false,
     reverseButtons: true,
     showLoaderOnConfirm: true,
+    didOpen(popup) {
+      timerInterval = setInterval(() => {
+        Swal__default["default"].getHtmlContainer().querySelector('strong')
+            .textContent = (Swal__default["default"].getTimerLeft() / 1000)
+            .toFixed(0);
+      }, 100);
+    },
+    willClose: () => {
+      clearInterval(timerInterval);
+    }
   }).then((result) => {
     if (result.isConfirmed) {
       logoutUser();
+    } else if(result.dismiss === 'timer'){
+      logoutUser();
     } else {
       window.ShConfirmation = null;
       clearInterval(window.shInterval);

package/dist/library.mjs

@@ -197,6 +197,15 @@ function formatDate(date, format) {
   }
   return moment(date).format(format)
 }
+function formatNumber(amount,decimalPoints = 0){
+  return numberFormat(amount,decimalPoints)
+}
+function numberFormat(amount,decimalPoints = 0) {
+  let formatted = parseFloat(amount).toFixed(decimalPoints);
+  formatted =  new Intl.NumberFormat().format(formatted);
+  const formattedArr = formatted.split('.');
+  return decimalPoints === 0 ? formattedArr[0] : formattedArr[0] +'.' + (formattedArr[1] || '0').padEnd(decimalPoints,0)
+}
 
 var shRepo = {
   swalSuccess,
@@ -209,7 +218,9 @@ var shRepo = {
   runSilentRequest,
   swalHttpError,
   formatHttpCatchError,
-  formatDate
+  formatDate,
+  numberFormat,
+  formatNumber
 };
 
 startSession();
@@ -220,10 +231,16 @@ function logoutUser(){
     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');
@@ -236,18 +253,15 @@ const checkSession = function (isCheking) {
     const pastSeconds = moment().diff(last_activity, 'seconds');
     if(pastMinutes >= timeout) {
       const gracePeriod = pastSeconds - (timeout * 60);
-      if (gracePeriod >= 30 ) {
+      if (gracePeriod >= 60 ) {
         logoutUser();
       }
       else {
         if (!window.ShConfirmation)
         {
-          window.ShConfirmation = shSwalLogout();
+          window.ShConfirmation = shSwalLogout(30);
         }
       }
-    } else {
-      console.log(pastSeconds);
-      console.log(pastMinutes);
     }
   }else {
     if (window.shInterval) {
@@ -255,23 +269,35 @@ const checkSession = function (isCheking) {
     }
   }
 };
-
-async function shSwalLogout () {
+async function shSwalLogout (seconds = 30) {
+  let timerInterval;
   return Swal.fire({
     title: 'Your session is about to Expire!',
-    html: 'You will be logout due to inactivity!',
+    html: 'You will be logged out in <strong></strong> seconds due to inactivity!',
     showCancelButton: true,
     cancelButtonColor: '#32c787',
     confirmButtonColor: '#000',
     cancelButtonText: 'Stay signed in',
     confirmButtonText: 'Sign out now!',
-    timer: 100000,
+    timer: seconds * 1000,
     allowOutsideClick: false,
     reverseButtons: true,
     showLoaderOnConfirm: true,
+    didOpen(popup) {
+      timerInterval = setInterval(() => {
+        Swal.getHtmlContainer().querySelector('strong')
+            .textContent = (Swal.getTimerLeft() / 1000)
+            .toFixed(0);
+      }, 100);
+    },
+    willClose: () => {
+      clearInterval(timerInterval);
+    }
   }).then((result) => {
     if (result.isConfirmed) {
       logoutUser();
+    } else if(result.dismiss === 'timer'){
+      logoutUser();
     } else {
       window.ShConfirmation = null;
       clearInterval(window.shInterval);

package/package.json

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