@worksafevictoria/wcl7.5 1.8.0 → 1.9.0-beta.10

package/src/components/SubComponents/Search/index.vue

@@ -12,6 +12,8 @@
         >
         <b-form-input
           id="site-search"
+          autofocus
+          ref="siteSearch"
           v-model="searchQuery"
           name="search"
           aria-label="searchbar"
@@ -59,6 +61,7 @@ import { BButton, BInputGroup, BFormInput } from "bootstrap-vue-next";
 
 export default {
   components: { SearchListing, BButton, BInputGroup, BFormInput },
+  
   props: {
     pageLimit: {
       type: Number,
@@ -106,6 +109,7 @@ export default {
     },
   },
   mounted() {
+    
     if (this.searchType === "google") {
       this.setupGoogleStyle();
     } else {
@@ -274,8 +278,6 @@ export default {
       }
     },
     onChange(e) {
-      //debugger
-
       if (this.searchQuery && this.searchQuery.length > 2) {
         this.onSearch(e);
       }

package/src/components/SubComponents/VideoThumbnail/index.vue

@@ -4,20 +4,21 @@
       <div class="video-thumbnail">
         <img
           :src="videoThumbnail"
-          alt="video thumbnail"
+          :alt="`Thumbnail for video: ${video.mediaTitle}`"
           width="100%"
           class="video-thumbnail__image"
         />
         <img
           :src="VideoPlay"
-          alt="Play button"
+          alt="Video play button"
+          aria-hidden="true"
           class="video-thumbnail__button"
         />
       </div>
     </a>
     <!-- Modal -->
     <b-modal
-      :id="`wcl-video-modal`"
+      :id="`wcl-video-modal-${video.id}`"
       v-model="showModal"
       scrollable
       class="wcl-video-modal__modal"
@@ -42,18 +43,18 @@
 </template>
 
 <script>
-import VideoMedia from './../../Paragraphs/VideoPlayer/index.vue'
-import VideoPlay from './../../../assets/icons/video-play.svg?url'
-import IconClose from './../../../assets/icons/icon-close.svg?url'
-import { BModal } from 'bootstrap-vue-next'
-import axios from 'axios'
+import VideoMedia from "./../../Paragraphs/VideoPlayer/index.vue";
+import VideoPlay from "./../../../assets/icons/video-play.svg?url";
+import IconClose from "./../../../assets/icons/icon-close.svg?url";
+import { BModal } from "bootstrap-vue-next";
+import axios from "axios";
 
 export default {
-  name: 'VideoThumbnail',
+  name: "VideoThumbnail",
   components: {
     VideoMedia,
     IconClose,
-    'b-modal': BModal,
+    "b-modal": BModal,
   },
   props: {
     video: {
@@ -66,42 +67,42 @@ export default {
       VideoPlay,
       IconClose,
       showModal: false,
-      videoThumbnail: '',
-    }
+      videoThumbnail: "",
+    };
   },
   mounted() {
-    this.getVideoThumbnail()
+    this.getVideoThumbnail();
   },
   methods: {
     async getVideoThumbnail(url) {
       try {
-        if (this.video.provider === 'youtube') {
-          this.videoThumbnail = `https://i.ytimg.com/vi/${this.video.id}/maxresdefault.jpg`
-          const response = await axios.head(this.videoThumbnail)
+        if (this.video.provider === "youtube") {
+          this.videoThumbnail = `https://i.ytimg.com/vi/${this.video.id}/maxresdefault.jpg`;
+          const response = await axios.head(this.videoThumbnail);
           if (response.status === 200) {
           } else {
-            this.videoThumbnail = `https://i.ytimg.com/vi/${this.video.id}/hqdefault.jpg`
+            this.videoThumbnail = `https://i.ytimg.com/vi/${this.video.id}/hqdefault.jpg`;
           }
-        } else if (this.video.provider === 'vimeo') {
+        } else if (this.video.provider === "vimeo") {
           let thumbnail = await axios.get(
-            `https://vimeo.com/api/v2/video/${this.video.id}.json`,
-          )
+            `https://vimeo.com/api/v2/video/${this.video.id}.json`
+          );
           if (thumbnail.data) {
-            this.videoThumbnail = thumbnail.data[0].thumbnail_large
+            this.videoThumbnail = thumbnail.data[0].thumbnail_large;
           }
         }
       } catch (error) {
         if (error.response && error.response.status === 404) {
-          this.videoThumbnail = `https://i.ytimg.com/vi/${this.video.id}/hqdefault.jpg`
+          this.videoThumbnail = `https://i.ytimg.com/vi/${this.video.id}/hqdefault.jpg`;
         } else {
         }
       }
     },
   },
-}
+};
 </script>
 <style lang="scss" scoped>
-@import '../../../includes/scss/all';
+@import "../../../includes/scss/all";
 // Outside wrapper style
 .wcl-video-thumbnail-wrapper {
   margin-bottom: 32px;
@@ -127,17 +128,17 @@ export default {
         left: 50%;
         //height: 68px;
         //width: 68px;
-        @include fp('height', 65, 68);
-        @include fp('width', 65, 68);
+        @include fp("height", 65, 68);
+        @include fp("width", 65, 68);
         -ms-transform: translate(-50%, -50%);
         transform: translate(-50%, -50%);
 
-        @include mq('sm') {
+        @include mq("sm") {
           height: 80px;
           width: 80px;
         }
 
-        @include mq('xs') {
+        @include mq("xs") {
           height: 64px;
           width: 64px;
         }

package/src/index.js

@@ -7,7 +7,7 @@ import Subheader from './components/Containers/Subheader/index.vue'
 import SectionGroup from './components/Containers/SectionGroup/index.vue'
 import CarouselComponent from './components/Containers/Carousel/index.vue'
 
-import AppHeader from './components/Global/AppHeader/index.vue'
+import AppHeader from './components/Global/AppHeaderNew/index.vue'
 import AppFooter from './components/Global/AppFooter/index.vue'
 import HeroHeader from './components/Global/HeroHeader/index.vue'
 import SocialShare from './components/Global/SocialShare/index.vue'

package/src/mock/asbestos-removalists.js

@@ -6,7 +6,7 @@ export const arData = [
         Phone: '0404073745',
         CompanyMobile: '0404 073 745',
         CompanyEmailDisp: 'ads.asbestos@gmail.com',
-        CompanyWebURLDisp: 'www.adsasbestosremoval.com.au',
+        CompanyWebURLDisp: 'adsasbestosremoval.com.au',
         ContactFirstName: 'Ivan',
         ContactLastName: 'Silva',
         ContactPhoneDisp: '0404073745',

package/src/mock/carousel-items.js

@@ -1,82 +1,47 @@
 export const mockCarouselItems = [
-    {
-      field_title: 'This is the first slider',
-      field_image: {
-        field_media_image: {
-          uri: {
-            url: '/sites/default/files/2025-01/image-ag-safety-network-veg-001.jpg'
-          }
-        }     
-      }, 
-      field_link: {
-        url: 'https://www.google.com',
-      }, 
-      field_date_start: '2025-02-05',
-      field_date_end: '2025-03-07',
-      field_favorite: true
-    },
-    {
-        field_title: 'This is the second slider',
-        field_image: {
-          field_media_image: {
-            uri: {
-              url: '/sites/default/files/2025-01/large-2023%20WorkSafe%20Awards.jpg'
-            }
-          }
-        }, 
-        field_link: {
-          url: '/news/2019-11/winners-named-distinguished-worksafe-awards',
-        },
-        field_date_start: '2025-02-05',
-        field_date_end: '2025-07-05',
-        field_favorite: false
-      },
-      {
-        field_title: 'This is the third slider',
-        field_image: {
-          field_media_image: {
-            uri: {
-              url: '/sites/default/files/2024-12/header-image-workwell-oelg-project.jpg'
-            }
-          }
-        }, 
-        field_link: {
-          url: '/resources/workwell-ageing-workforce-ready-age-difference',
-        },
-        field_date_start: '2024-01-12',
-        field_date_end: '2024-12-12',
-        favorite: false
-      },
-      {
-        field_title: 'This is the fourth slider',
-        field_image: {
-          field_media_image: {
-            uri: {
-              url: '/sites/default/files/styles/large/public/2018-06/Topics-explosives_0.jpg'
-            }
-          }
-        }, 
-        field_link: {
-          url: '/explosives',
-        },
-        field_date_start: '2025-01-30',
-        field_date_end: '2025-12-12',
-        field_favorite: false
-      },
-      {
-        field_title: '',
-        field_image: {
-          field_media_image: {
-            uri: {
-              url: '/sites/default/files/styles/large/public/2022-07/card-bricklaying-3x2.jpg'
-            }
-          }
-        }, 
-        field_link: {
-          url: '/construction',
-        },
-        field_date_start: '2024-10-30',
-        field_date_end: '2025-12-12',
-        field_favorite: false
-      },
-    ]
+  {
+    title: 'This is the first slider',
+    imageURL: '/sites/default/files/2025-01/image-ag-safety-network-veg-001.jpg', 
+    imageAlt: 'Picture of Agricultural Safety Inspectors',
+    linkURL: 'https://www.google.com',
+    dateStart: '2025-02-05',
+    dateEnd: '2025-03-07',
+    favourite: true
+  },
+  {
+    title: 'This is the second slider',
+    imageURL: '/sites/default/files/2025-01/large-2023%20WorkSafe%20Awards.jpg', 
+    imageAlt: 'Picture of WorkSafe Awards Banquet',
+    linkURL: '/news/2019-11/winners-named-distinguished-worksafe-awards',
+    dateStart: '2025-02-05',
+    dateEnd: '2025-07-05',
+    favourite: false
+  },
+  {
+    title: 'This is the third slider',
+    imageURL: '/sites/default/files/2024-12/header-image-workwell-oelg-project.jpg', 
+    imageAlt: 'Workwell image',
+    linkURL: '/resources/workwell-ageing-workforce-ready-age-difference',
+    dateStart: '2024-01-12',
+    dateEnd: '2024-12-12',
+    favourite: false
+  },
+  {
+    title: 'This is the fourth slider',
+    imageURL: '/sites/default/files/styles/large/public/2018-06/Topics-explosives_0.jpg',
+    imageAlt: 'Picture of demolition in quarry',
+    linkURL: '/explosives',
+    dateStart: '2025-01-30',
+    dateEnd: '2025-12-12',
+    favourite: false
+  },
+  {
+    title: '',
+    imageURL: '/sites/default/files/styles/large/public/2022-07/card-bricklaying-3x2.jpg', 
+    imageAlt: 'Picture of construction worker',
+    linkURL: '/construction',
+    dateStart: '2024-10-30',
+    dateEnd: '2025-12-12',
+    favourite: false
+  },
+]

package/src/mock/course-provider.js

@@ -7,7 +7,7 @@ export const hscpData = [
         Work_phone: '03 9555 9333',
         Toll_free_phone: '1800 555 333',
         Email1: 'ohs@test.com.au',
-        Website: 'https://www.anmfvic.asn.au/education-and-training/hsr-training/events',
+        Website: 'anmfvic.asn.au/education-and-training/hsr-training/events',
         Contact_1: 'Christina Groebl',
         Contact_1_Phone: '03 9555 0222',
         Contact_1_Email: 'cgroebl@test.com.au',
@@ -26,7 +26,7 @@ export const hscpData = [
         Work_phone: '03 5990 7117',
         Toll_free_phone: '1300 244 746',
         Email1: 'csadmin@chisholm.edu.au',
-        Website: 'https://www.chisholm.edu.au/career-fields/workplace-safety',
+        Website: 'http://www.chisholm.edu.au/career-fields/workplace-safety',
         Contact_1: 'Francesca Laforgia',
         Contact_1_Email: 'csadmin@chisholm.edu.au',
         Contact_1_Phone: '03 5990 7117',