cec-nuxt-lib 0.3.12 → 0.4.0

package/dist/module.json

@@ -1,5 +1,5 @@
 {
   "name": "cec-nuxt-lib",
   "configKey": "cec-nuxt-lib",
-  "version": "0.3.12"
+  "version": "0.4.0"
 }

package/dist/runtime/components/cecBreadcrumb.vue

@@ -1,22 +1,22 @@
 <script setup lang="ts">
 import { useState } from '#app';
-import { useRuntimeConfig } from '#app';
 import { useRoute } from 'vue-router';
 
 const classicPath = useState('classicPath');
-const config = useRuntimeConfig();
-const path = useState('path');
 const route = useRoute();
-const baseUrl = config.app.baseURL;
 
-const trimPath = (str) => str && str.replace(/\/$/, '');
-let baseLength = baseUrl ? trimPath(baseUrl).split('/').length : 0;
+const trimPath = (str) => {
+  if (str === '/' || !str) {
+    return str;
+  }
+  return str.replace(/\/$/, '');
+};
 
-// Helper functions
 const makeLink = (i, routes) => {
-  i = baseUrl ? baseLength - 1 : i + 1;
-  let l = routes.slice(0, i).join('/');
-  return l === '' ? '/' : l;
+  if (!i) {
+    return '/';
+  }
+  return '/' + routes.slice(0, i).join('/');
 };
 
 const toTitleCase = (str) => {
@@ -26,8 +26,8 @@ const toTitleCase = (str) => {
 };
 
 const makeArr = (str) => {
-  return str.split('/').reduce((acc, e, i) => {
-    if (!i || (i && e.length)) {
+  return str.split('/').reduce((acc, e) => {
+    if (e.length) {
       return [...acc, e];
     }
     return acc;
@@ -36,25 +36,15 @@ const makeArr = (str) => {
 
 // Make arrays of the items in the paths
 let routeTrim = trimPath(route.path);
-let pathTrim = trimPath(path.value);
 let routes = makeArr(routeTrim);
-let paths = makeArr(pathTrim);
-//console.log(routes)
-
-// Use the route path if it includes the node's path
-if (!routeTrim.toLowerCase().startsWith(pathTrim.toLowerCase())) {
-  routes = [...paths, ...routes.filter((e) => e.length)];
-}
 
 // Get the classic path for legacy links
 let classic = trimPath(classicPath.value).split('/');
 const length = classic.length;
-let hrefs =
-  baseUrl.length > 1 && route.path !== '/'
-    ? `${classicPath.value}${routeTrim}`.split('/')
-    : routes.reduce((acc, e, i) => {
-        return classic[i] ? [...acc, classic[i]] : [...acc, e];
-      }, []);
+
+let hrefs = `${classicPath.value}${routeTrim === '/' ? '' : routeTrim}`.split(
+  '/'
+);
 const links = hrefs.map((e, i) => (!i ? 'Home' : toTitleCase(e)));
 </script>
 <template>
@@ -67,7 +57,9 @@ const links = hrefs.map((e, i) => (!i ? 'Home' : toTitleCase(e)));
               <li class="breadcrumb-item" v-for="(l, i) in links" :key="i">
                 <span v-if="i === links.length - 1">{{ l }}</span>
                 <template v-else-if="i + 1 >= length">
-                  <NuxtLink :to="makeLink(i, routes)">{{ l }}</NuxtLink>
+                  <NuxtLink :to="makeLink(i - length + 1, routes)">{{
+                    l
+                  }}</NuxtLink>
                 </template>
                 <a v-else :href="'/' + hrefs.slice(1, i + 1).join('/')">
                   {{ l }}</a

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.12",
+  "version": "0.4.0",
   "name": "cec-nuxt-lib",
   "description": "Nuxt components and assets",
   "license": "MIT",