@iankibetsh/shframework 1.6.8 → 1.7.0

package/dist/library.js

@@ -5048,7 +5048,6 @@ return (_ctx, _cache) => {
   const _component_router_view = vue.resolveComponent("router-view");
 
   return (vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
-    vue.createElementVNode("h3", null, vue.toDisplayString(path.value), 1 /* TEXT */),
     vue.createElementVNode("ul", {
       class: vue.normalizeClass(["nav nav-tabs sh-tabs", __props.classes])
     }, [
@@ -5539,6 +5538,7 @@ script$4.__file = "src/lib/components/core/Departments/department/ManagePermissi
 
 const _hoisted_1$3 = ["href"];
 
+
 var script$3 = {
   __name: 'ShPopups',
   setup(__props) {
@@ -5553,58 +5553,65 @@ const router = vueRouter.useRouter();
 const position = vue.ref(null);
 const size = vue.ref(null);
 const popups = [];
-const popupPaths =[];
-vue.watch(()=>route.meta, meta=>{
+const popupPaths = [];
+vue.watch(() => route.meta, meta => {
   popUp.value = meta.popUp ?? meta.popup;
-  if(popUp.value){
+  if (popUp.value) {
     // popups.push(meta)
     !popupPaths.includes(route.path) && popupPaths.push(route.path) && popups.push(meta);
     position.value = meta.position ?? meta.side;
     size.value = meta.size;
-    componentView.value = vue.markRaw(route.matched[route.matched.length-1].components.default);
-    setTimeout(()=>{
+    componentView.value = vue.markRaw(route.matched[route.matched.length - 1].components.default);
+    setTimeout(() => {
       initPopup();
-    },100);
+    }, 100);
   } else {
     //no pop up, check if we have any unclosed backdrop
-    setTimeout(()=>{
+    setTimeout(() => {
       closeOrphanedBackdrops();
-    },100);
+    }, 100);
   }
 });
-const closeOrphanedBackdrops = ()=>{
+const closeOrphanedBackdrops = () => {
   const offCanvasBackdrop = document.querySelector('.offcanvas-backdrop');
-  if(offCanvasBackdrop) {
-    if(!document.querySelector('.offcanvas.show')){
+  if (offCanvasBackdrop) {
+    if (!document.querySelector('.offcanvas.show')) {
       offCanvasBackdrop.remove();
     }
   }
   const modalBackdrop = document.querySelector('.modal-backdrop');
-  if(modalBackdrop) {
-    if(!document.querySelector('.modal.show')){
+  if (modalBackdrop) {
+    if (!document.querySelector('.modal.show')) {
       modalBackdrop.remove();
     }
   }
 };
-const initPopup = ()=>{
-  if(popUp.value === 'modal') {
+const initPopup = () => {
+  if (popUp.value === 'modal') {
     // modalButton.value.click()
     const modal = document.getElementById(modalId);
-    const bsModal = new bootstrap.Modal(modal,{});
+    const bsModal = new bootstrap.Modal(modal, {});
     bsModal.show();
     modal.addEventListener('hidden.bs.modal', event => {
       event.target.id === modalId && goBack();
     });
-  } else if (['offcanvas','canvas','offCanvas'].includes(popUp.value)){
+  } else if (['offcanvas', 'canvas', 'offCanvas'].includes(popUp.value)) {
     const offCanvas = document.getElementById(canvasId);
-    const bsOffCanvas = new bootstrap.Offcanvas(offCanvas,{});
+    const bsOffCanvas = new bootstrap.Offcanvas(offCanvas, {});
     bsOffCanvas.show();
     offCanvas.addEventListener('hidden.bs.offcanvas', event => {
       event.target.id === canvasId && goBack();
     });
   }
 };
-const goBack = ()=> route.matched.length > 1 && router.push(route.matched[route.matched.length-2].path);
+const goBack = () => {
+  if (route.matched.length) {
+    let backUrl = route.matched[route.matched.length - 2].path;
+    const params = route.params;
+    Object.keys(params).map(key => backUrl = backUrl.replace(`:${key}`,params[key]));
+    router.push(backUrl);
+  }
+};
 
 return (_ctx, _cache) => {
   return (vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [

package/dist/library.mjs

@@ -5035,7 +5035,6 @@ return (_ctx, _cache) => {
   const _component_router_view = resolveComponent("router-view");
 
   return (openBlock(), createElementBlock(Fragment, null, [
-    createElementVNode("h3", null, toDisplayString(path.value), 1 /* TEXT */),
     createElementVNode("ul", {
       class: normalizeClass(["nav nav-tabs sh-tabs", __props.classes])
     }, [
@@ -5526,6 +5525,7 @@ script$4.__file = "src/lib/components/core/Departments/department/ManagePermissi
 
 const _hoisted_1$3 = ["href"];
 
+
 var script$3 = {
   __name: 'ShPopups',
   setup(__props) {
@@ -5540,58 +5540,65 @@ const router = useRouter();
 const position = ref(null);
 const size = ref(null);
 const popups = [];
-const popupPaths =[];
-watch(()=>route.meta, meta=>{
+const popupPaths = [];
+watch(() => route.meta, meta => {
   popUp.value = meta.popUp ?? meta.popup;
-  if(popUp.value){
+  if (popUp.value) {
     // popups.push(meta)
     !popupPaths.includes(route.path) && popupPaths.push(route.path) && popups.push(meta);
     position.value = meta.position ?? meta.side;
     size.value = meta.size;
-    componentView.value = markRaw(route.matched[route.matched.length-1].components.default);
-    setTimeout(()=>{
+    componentView.value = markRaw(route.matched[route.matched.length - 1].components.default);
+    setTimeout(() => {
       initPopup();
-    },100);
+    }, 100);
   } else {
     //no pop up, check if we have any unclosed backdrop
-    setTimeout(()=>{
+    setTimeout(() => {
       closeOrphanedBackdrops();
-    },100);
+    }, 100);
   }
 });
-const closeOrphanedBackdrops = ()=>{
+const closeOrphanedBackdrops = () => {
   const offCanvasBackdrop = document.querySelector('.offcanvas-backdrop');
-  if(offCanvasBackdrop) {
-    if(!document.querySelector('.offcanvas.show')){
+  if (offCanvasBackdrop) {
+    if (!document.querySelector('.offcanvas.show')) {
       offCanvasBackdrop.remove();
     }
   }
   const modalBackdrop = document.querySelector('.modal-backdrop');
-  if(modalBackdrop) {
-    if(!document.querySelector('.modal.show')){
+  if (modalBackdrop) {
+    if (!document.querySelector('.modal.show')) {
       modalBackdrop.remove();
     }
   }
 };
-const initPopup = ()=>{
-  if(popUp.value === 'modal') {
+const initPopup = () => {
+  if (popUp.value === 'modal') {
     // modalButton.value.click()
     const modal = document.getElementById(modalId);
-    const bsModal = new Modal(modal,{});
+    const bsModal = new Modal(modal, {});
     bsModal.show();
     modal.addEventListener('hidden.bs.modal', event => {
       event.target.id === modalId && goBack();
     });
-  } else if (['offcanvas','canvas','offCanvas'].includes(popUp.value)){
+  } else if (['offcanvas', 'canvas', 'offCanvas'].includes(popUp.value)) {
     const offCanvas = document.getElementById(canvasId);
-    const bsOffCanvas = new Offcanvas(offCanvas,{});
+    const bsOffCanvas = new Offcanvas(offCanvas, {});
     bsOffCanvas.show();
     offCanvas.addEventListener('hidden.bs.offcanvas', event => {
       event.target.id === canvasId && goBack();
     });
   }
 };
-const goBack = ()=> route.matched.length > 1 && router.push(route.matched[route.matched.length-2].path);
+const goBack = () => {
+  if (route.matched.length) {
+    let backUrl = route.matched[route.matched.length - 2].path;
+    const params = route.params;
+    Object.keys(params).map(key => backUrl = backUrl.replace(`:${key}`,params[key]));
+    router.push(backUrl);
+  }
+};
 
 return (_ctx, _cache) => {
   return (openBlock(), createElementBlock(Fragment, null, [

package/package.json

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