cec-nuxt-lib 0.8.9 → 0.10.0

package/dist/module.json

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

package/dist/runtime/components/cecBreadcrumb.vue

@@ -2,9 +2,8 @@
 import { useState, useRuntimeConfig } from '#app';
 import { useRoute } from 'vue-router';
 const config = useRuntimeConfig();
-
 const baseUrl = config.app.baseURL;
-const classicPath = useState('classicPath');
+const page = useState('page');
 const route = useRoute();
 
 const trimPath = (str) => {
@@ -40,13 +39,15 @@ const toSentenceCase = (str, notLast) => {
 // Make arrays of the items in the paths
 let routeTrim = trimPath(route.path);
 let routes = routeTrim.split('/');
-let classic = trimPath(classicPath.value).split('/');
+let classic = trimPath(page.value.classicPath).split('/');
 const length = classic.length;
 
 // Build an array of hrefs
 let hrefs =
   baseUrl !== '/'
-    ? `${classicPath.value}${routeTrim === '/' ? '' : routeTrim}`.split('/')
+    ? `${page.value.classicPath}${routeTrim === '/' ? '' : routeTrim}`.split(
+        '/'
+      )
     : routes.reduce((acc, e, i) => {
         if (classic[i]) {
           return [...acc, classic[i]];

package/dist/runtime/components/cecCanvas.vue

@@ -1,16 +1,11 @@
 <script setup lang="ts">
-import { onMounted } from 'vue';
 import { useState } from '#app';
-
 import { createRenderer, text } from '@contensis/canvas-html';
 import type { Block } from '@contensis/canvas-html';
 const getCanvas = (data: Block[]) => renderer({ data });
 
-const baseUrl = useState('baseUrl');
 const listItems = useState('listItems');
-const path = useState('path');
 const questions = useState('questions');
-const title = useState('title');
 let canvasHtml;
 
 const props = defineProps({
@@ -73,7 +68,7 @@ const accordion = (data) => {
           acc +
           `
             <li>
-              <a href="${baseUrl.value}${processUri(p.sys.uri)}"
+              <a href="${processUri(p.sys.uri)}"
                 >${p.title[0].toUpperCase()}${p.title.slice(1)}
                 (${p.sys.contentTypeId.toUpperCase()},
                 ${sizeString(p.sys.properties.fileSize)})
@@ -263,7 +258,7 @@ const fullWidthImageWithOverlay = (props: any) => {
         <img
           class="px-4 mx-auto mt-2"
           alt="${item.overlayImage.altText}"
-          src="${baseUrl.value}${item.overlayImage.asset.sys.uri}"
+          src="${item.overlayImage.asset.sys.uri}"
         />
     </div>
   </div>`;
@@ -274,7 +269,7 @@ const fullWidthImageWithOverlay = (props: any) => {
       <img
         class="img-fluid"
         alt="${item.image.altText}"
-        src="${baseUrl.value}${item.image.asset.sys.uri}"
+        src="${item.image.asset.sys.uri}"
       />
       <div class="cec-cent-promo-txt-wrap top-50 end-0">
         <div class="container-md">
@@ -297,7 +292,7 @@ const fullWidthImageWithOverlay = (props: any) => {
       <img
         class="img-fluid"
         alt="${item.image.altText}"
-        src="${baseUrl.value}${item.image.asset.sys.uri}"
+        src="${item.image.asset.sys.uri}"
       />
   ${overlay}
     </div>
@@ -313,7 +308,7 @@ const fullWidthImageWithSideOverlay = (props: any) => {
         <img
           class="img-fluid"
           alt="${item.image.altText}"
-          src="${baseUrl.value}${item.image.asset.sys.uri}"
+          src="${item.image.asset.sys.uri}"
         />
     <div style="position: absolute;" class="my-side-overlay  col-lg-6 bg-cec-green ms-lg-5 mt-lg-5 p-2 top-0 ">
       <h2 class="text-white promo-heading display-6">${item.heading}</h2>
@@ -544,7 +539,7 @@ const promotionalBannerWithText = (props: any) => {
   <div class="position-relative row g-0 mb-3">
     <img
       alt="${item.bannerImage.altText}"
-      src="${baseUrl.value}${item.bannerImage.asset.sys.uri}"
+      src="${item.bannerImage.asset.sys.uri}"
     />
     ${overlay}
   </div>
@@ -562,7 +557,7 @@ const promotionalContrastRegion = (props: any) => {
       <img
         class="img-fluid"
         alt="${item.image.altText}"
-        src="${baseUrl.value}${item.image.asset.sys.uri}"
+        src="${item.image.asset.sys.uri}"
       />
     </div>`;
   return `
@@ -586,7 +581,7 @@ const promotionalFullWidthImageWithOverlay = (props: any) => {
         <img
           class="px-4 mx-auto mt-2"
           alt="${item.overlayImage.altText}"
-          src="${baseUrl.value}${item.overlayImage.asset.sys.uri}"
+          src="${item.overlayImage.asset.sys.uri}"
         />
     </div>
   </div>`;
@@ -597,7 +592,7 @@ const promotionalFullWidthImageWithOverlay = (props: any) => {
       <img
         class="img-fluid"
         alt="${item.image.altText}"
-        src="${baseUrl.value}${item.image.asset.sys.uri}"
+        src="${item.image.asset.sys.uri}"
       />
       <div class="cec-cent-promo-txt-wrap top-50 end-0">
         <div class="container-md">
@@ -618,7 +613,7 @@ const promotionalFullWidthImageWithOverlay = (props: any) => {
       <img
         class="img-fluid"
         alt="${item.image.altText}"
-        src="${baseUrl.value}${item.image.asset.sys.uri}"
+        src="${item.image.asset.sys.uri}"
       />
   ${overlay}
     </div>
@@ -633,7 +628,7 @@ const promotionalFullWidthImageWithSideOverlay = (props: any) => {
       <img
         class="img-fluid"
         alt="${item.image.altText}"
-        src="${baseUrl.value}${item.image.asset.sys.uri}"
+        src="${item.image.asset.sys.uri}"
       />
       <div
         style="position: absolute"
@@ -648,7 +643,7 @@ const promotionalFullWidthImageWithSideOverlay = (props: any) => {
 };
 
 const processUri = (uri) => {
-  return uri.toLowerCase().replace(/%e2/g, '%E2');
+  return encodeURI(decodeURI(uri).toLowerCase());
 };
 
 const genericList = (props: any) => {
@@ -742,7 +737,7 @@ canvasHtml = canvasHtml.replace(
   (match) => {
     switch (match) {
       case '<img src="':
-        return `<img src="${baseUrl.value}`;
+        return `<img src="`;
       case '<caption':
         return "<caption class='hidden'";
       case '<table':

package/dist/runtime/components/cecFeedback.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useState } from '#app';
-const hideReviewDate = useState('hideReviewDate');
+const page = useState('page');
 const props = defineProps({
   reviewed: {
     type: String,
@@ -23,7 +23,7 @@ const { path, title, reviewed } = props;
   <div class="mt-4">
     <div class="row">
       <div class="col-lg-8">
-        <p v-if="!hideReviewDate">
+        <p v-if="!page.hideReviewDate">
           <small>Page last reviewed: {{ reviewed }} </small>
         </p>
         <div class="accordion pb-4">

package/dist/runtime/components/cecHeader.vue

@@ -3,10 +3,9 @@ import { onMounted } from 'vue';
 import { useState, navigateTo } from '#app';
 
 const searchTerm = useState('searchTerm', () => undefined);
-const showSiteSearch = useState('showSiteSearch');
 const questions = useState('questions');
 const baseUrl = useState('baseUrl');
-const title = useState('title');
+const page = useState('page');
 const path = useState('path');
 
 const regex =
@@ -245,7 +244,7 @@ onMounted(() => {
 
   forms.forEach((link) => {
     link.href = `${link.href}&pageTitle=${encodeURIComponent(
-      title.value
+      page.value.title
     )}&pagePath=${baseUrl.value}${encodeURIComponent(path.value)}`;
   });
 
@@ -444,7 +443,7 @@ onMounted(() => {
         <div class="cec-search-site">
           <div
             class="sys_search-query-control"
-            :class="{ 'd-none': !showSiteSearch }"
+            :class="{ 'd-none': !page.showSiteSearch }"
           >
             <label for="searchTextBox" class="hidden sys_search-label"
               >Search</label

package/dist/runtime/components/cecMeta.vue

@@ -1,24 +1,26 @@
 <script setup>
 import { useState, useHead, useSeoMeta } from '#app';
 const baseUrl = useState('baseUrl');
-const description = useState('description');
 const ogImage = useState('ogImage');
-const noindex = useState('noindex');
 const path = useState('path');
-const reviewISO = useState('reviewISO');
-const title = useState('title');
+const page = useState('page');
+
+let reviewDate = new Date(page.value.dateReviewed);
+let reviewISO = reviewDate.toISOString().slice(0, 10);
 
 let meta = [
   {
     name: 'description',
-    content: description.value,
+    content: page.value.description,
   },
 ];
-if (noindex.value) {
+
+if (page.value.noindex) {
   meta.push({ name: 'robots', content: 'noindex, nofollow' });
 }
+
 useHead({
-  title: title.value,
+  title: page.value.title,
   meta: meta,
   script: [
     {
@@ -26,7 +28,7 @@ useHead({
       children: {
         '@context': 'https://schema.org',
         '@type': 'WebPage',
-        lastReviewed: reviewISO.value,
+        lastReviewed: reviewISO,
       },
     },
     {
@@ -78,7 +80,7 @@ useHead({
           },
           {
             '@type': 'ContactPoint',
-            url: `https://digital-core.cheshireeast.gov.uk/w/webpage/request?form=contact_us&pageTitle=${encodeURIComponent(title.value)}&pagePath=${baseUrl.value}${path.value}`,
+            url: `https://digital-core.cheshireeast.gov.uk/w/webpage/request?form=contact_us&pageTitle=${encodeURIComponent(page.value.title)}&pagePath=${baseUrl.value}${path.value}`,
             contactType: 'Online contact form',
             areaServed: 'Cheshire East',
           },
@@ -111,9 +113,9 @@ useHead({
   ],
 });
 useSeoMeta({
-  ogTitle: title.value,
+  ogTitle: page.value.title,
   ogImage: ogImage.value,
-  ogDescription: description.value,
+  ogDescription: page.value.title,
 });
 </script>
 <template><span class="d-none">meta</span></template>

package/dist/runtime/components/pagination.vue

@@ -3,7 +3,7 @@ import { useState } from '#app';
 const pages = useState('pages');
 const pageIndex = useState('pageIndex');
 const scrollTo = useState('scrollTo');
-const showResultsNum = useState('showResultsNum');
+const page = useState('page');
 
 const goToPage = (n) => {
   pageIndex.value = n;
@@ -71,7 +71,7 @@ const goToPage = (n) => {
       </ol>
     </nav>
     <p>
-      <span v-if="showResultsNum"
+      <span v-if="page.showResultsNum"
         >Total results:
         {{
           pages.reduce((acc, p) => {

package/package.json

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