@worksafevictoria/wcl7.5 1.1.0-beta.9 → 1.1.0-beta.91

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

@@ -22,18 +22,18 @@
           @update="searchType !== 'googlerest' ? onChange : () => {}"
           @keyup.enter="onChange"
         ></b-form-input>
-        <b-input-group-append>
+        <template #append>
           <b-button size="sm" class="search-button" @click="onSearch"
             ><span class="not-extra-small-screen">Search</span>
             <img alt="search icon" :src="searchIcon"
           /></b-button>
-        </b-input-group-append>
+        </template>
       </b-input-group>
       <search-listing
         v-if="loadSearchList && (searchResults || isLoading)"
         :class="{
           [`wcl-search__typeahead`]: isTypeahead,
-          [`wcl-search__modal`]: isTypeahead
+          [`wcl-search__modal`]: isTypeahead,
         }"
         :is-loading="isLoading"
         :is-typeahead="isTypeahead"
@@ -56,35 +56,35 @@
 import axios from 'axios'
 import searchIcon from '../../../assets/icons/search.svg?url'
 import SearchListing from './SearchListing/index.vue'
-import { BButton, BInputGroup, BFormInput, BInputGroupAppend } from 'bootstrap-vue-next'
+import { BButton, BInputGroup, BFormInput } from 'bootstrap-vue-next'
 
 export default {
-  components: { SearchListing, BButton, BInputGroup, BFormInput, BInputGroupAppend },
+  components: { SearchListing, BButton, BInputGroup, BFormInput },
   props: {
     pageLimit: {
       type: Number,
-      required: true
+      required: true,
     },
     contentParser: {
       type: Function,
-      required: true
+      required: true,
     },
     isTypeahead: {
       type: Boolean,
-      required: true
+      required: true,
     },
     initialSearchQuery: {
       type: String,
-      default: ''
+      default: '',
     },
     googleSearchFlag: {
       type: String,
-      default: 'solar'
+      default: 'solar',
     },
     visibleSearchList: {
       type: Boolean,
-      default: true
-    }
+      default: true,
+    },
   },
   data() {
     return {
@@ -95,16 +95,16 @@ export default {
       field_language: '8671',
       searchType: this.googleSearchFlag,
       googleSearchScript: false,
-      loadSearchList: this.visibleSearchList
+      loadSearchList: this.visibleSearchList,
     }
   },
   computed: {
     searchClass() {
       return {
         'wcl-search': true,
-        'wcl-search__google': this.searchType !== 'solar'
+        'wcl-search__google': this.searchType !== 'solar',
       }
-    }
+    },
   },
   mounted() {
     if (this.searchType === 'google') {
@@ -134,9 +134,9 @@ export default {
               key: apiKey,
               cx: searchEngineId,
               q: query,
-              start: start
-            }
-          }
+              start: start,
+            },
+          },
         )
         return response
       } catch (error) {
@@ -156,7 +156,7 @@ export default {
         apiKey,
         searchEngineId,
         searchQuery,
-        start
+        start,
       )
       let items = []
       let suggest = response?.data?.spelling?.correctedQuery || ''
@@ -165,7 +165,7 @@ export default {
           apiKey,
           searchEngineId,
           response?.data?.spelling?.correctedQuery,
-          start
+          start,
         )
         items = response?.data?.items
       } else if (response?.data?.items) {
@@ -181,7 +181,7 @@ export default {
           // Return the modified item with the updated title
           return {
             ...item,
-            title: modifiedTitle
+            title: modifiedTitle,
           }
         })
 
@@ -190,7 +190,7 @@ export default {
           numFound: Number(totalResults),
           query: this.searchQuery,
           results: modifiedResults,
-          suggestion: suggest
+          suggestion: suggest,
         }
       } else {
         this.searchResults = {
@@ -198,7 +198,7 @@ export default {
           numFound: 0,
           query: this.searchQuery ?? '',
           results: [],
-          suggestion: suggest
+          suggestion: suggest,
         }
       }
       this.$emit('loading', false)
@@ -214,10 +214,10 @@ export default {
             this.$route?.path === '/'
               ? 'Homepage'
               : this.$route?.path === '/search'
-              ? 'Search Page'
-              : this.$route?.path,
+                ? 'Search Page'
+                : this.$route?.path,
           label: this.searchQuery,
-          results: this.searchResults.numFound
+          results: this.searchResults.numFound,
         }
         if (this.$gtm) {
           this.$gtm.push({ event: 'custom.search.site.submit', ...attrs })
@@ -291,7 +291,7 @@ export default {
           query: searchQuery,
           start: pageNr > 1 ? (pageNr - 1) * pageLimit : 0,
           rows: pageLimit,
-          field_language: this.field_language
+          field_language: this.field_language,
         }).then((res) => {
           if (res.numFound) {
             this.searchResults = {
@@ -299,7 +299,7 @@ export default {
               numFound: Number(res.numFound),
               query: searchQuery,
               results: res.results,
-              suggestion: null
+              suggestion: null,
             }
           } else {
             this.searchResults = {
@@ -307,7 +307,7 @@ export default {
               numFound: 0,
               query: this.searchQuery ?? '',
               results: [],
-              suggestion: null
+              suggestion: null,
             }
           }
           this.$emit('loading', false)
@@ -322,10 +322,10 @@ export default {
                 this.$route?.path === '/'
                   ? 'Homepage'
                   : this.$route?.path === '/search'
-                  ? 'Search Page'
-                  : this.$route?.path,
+                    ? 'Search Page'
+                    : this.$route?.path,
               label: this.searchQuery,
-              results: this.searchResults.numFound
+              results: this.searchResults.numFound,
             }
             if (this.$gtm) {
               this.$gtm.push({ event: 'custom.search.site.submit', ...attrs })
@@ -340,7 +340,9 @@ export default {
       if (this.googleSearchScript === false) {
         const script = document.createElement('script')
         script.async = true
-        script.src = process.env.GOOGLE__URL
+        script.src = this.$config
+          ? this.$config.public.googleSearch
+          : process.env.GOOGLE__URL
         document.head.appendChild(script)
         this.googleSearchScript = true
 
@@ -386,8 +388,8 @@ export default {
 
         this.setupPaginationEvent()
       }
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -454,8 +456,8 @@ export default {
       display: none;
     }
   }
-    // Google Search styling
-    &.wcl-search__google {
+  // Google Search styling
+  &.wcl-search__google {
     :deep(form.gsc-search-box) {
       position: relative;
       display: -ms-flexbox;

package/src/components/SubComponents/SingleImage/index.stories.js

@@ -3,26 +3,12 @@ import SingleImage from './index.vue'
 export default {
   title: 'SubComponents/SingleImage',
   component: SingleImage,
+  tags: ['autodocs'],
   argTypes: {
     size: {
       control: 'select',
       options: ['page', 'content', 'half-content']
-    },
-    caption: {
-      control: 'text'
-    },
-    url: {
-      control: 'text',
-    },
-    rtl: {
-      control: 'boolean'
-    },
-    presentation: {
-      control: 'boolean'
-    },
-    alt: {
-      control: 'text',
-     }
+    }
   }
 }
 

package/src/components/SubComponents/VideoThumbnail/index.stories.js

@@ -17,6 +17,7 @@ const mockData = {
 export default {
   title: 'SubComponents/VideoThumbnail',
   component: { VideoThumbnail },
+  tags: ['autodocs'],
   argTypes: {
     video: {
       control: 'object',

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

@@ -16,29 +16,28 @@
       </div>
     </a>
     <!-- Modal -->
-    <div v-if="showModal" :id="wcl-video-modal" class="modal" tabindex="-1" aria-modal="true" role="dialog" style="display: block;">
-      <div class="modal-dialog modal-dialog-scrollable">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="btn-close" @click="showModal = !showModal" aria-label="close"></button>
-          </div>
-          <div class="modal-body">
-            <div class="wcl-video-modal__video">
-              <video-media
-                :media-title="video.mediaTitle"
-                :media-description="video.mediaDescription"
-                :video-id="video.id"
-                :provider="video.provider"
-                :transcript="video.transcript"
-                :transcript-title="video.transcriptTitle"
-                :fix-width="video.fixWidth"
-                :rtl="video.rtl"
-              />
-            </div>
-          </div>
-        </div>
+    <b-modal
+      :id="`wcl-video-modal`"
+      v-model="showModal"
+      scrollable
+      class="wcl-video-modal__modal"
+      no-footer
+      size="xl"
+    >
+      <div class="wcl-video-modal__video" v-if="showModal">
+        <video-media
+          :media-title="video.mediaTitle"
+          :media-description="video.mediaDescription"
+          :video-id="video.id"
+          :provider="video.provider"
+          :transcript="video.transcript"
+          :transcript-title="video.transcriptTitle"
+          :fix-width="video.fixWidth"
+          :rtl="video.rtl"
+        />
       </div>
-    </div>
+      <template #footer><div></div></template>
+    </b-modal>
   </div>
 </template>
 
@@ -46,25 +45,27 @@
 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'
 
 export default {
   name: 'VideoThumbnail',
   components: {
     VideoMedia,
-    IconClose
+    IconClose,
+    'b-modal': BModal,
   },
   props: {
     video: {
       type: Object,
-      required: true
-    }
+      required: true,
+    },
   },
   data() {
     return {
       VideoPlay,
       IconClose,
       showModal: false,
-      videoThumbnail: ''
+      videoThumbnail: '',
     }
   },
   mounted() {
@@ -76,7 +77,7 @@ export default {
         this.videoThumbnail = `https://i.ytimg.com/vi/${this.video.id}/maxresdefault.jpg`
         if (process.env.IS_STORYBOOK !== 'TRUE') {
           let thumbnailAvailable = await this.$axios?.get(
-            `${window.location.origin}/api/v2/urlExists?url=${this.videoThumbnail}`
+            `${window.location.origin}/api/v2/urlExists?url=${this.videoThumbnail}`,
           )
           if (
             thumbnailAvailable &&
@@ -92,102 +93,15 @@ export default {
     },
     async getVimeoThumbnail() {
       let thumbnail = await this.$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
       }
-    }
-  }
+    },
+  },
 }
 </script>
-<style lang="scss">
-@import '../../../includes/scss/all';
-// The modal styling
-  .modal {
-  background: rgba(0,0,0,0.5)
-}
-
-.modal-backdrop {
-  display: none;
-}
-.modal-dialog {
-  max-width: 1110px;
-  @media only screen and (max-width: 1150px) {
-    margin: {
-      left: 15px;
-      right: 15px;
-      top: 15px;
-    }
-  }
-
-  .modal-content {
-    position: relative;
-    border-radius: 8px;
-  }
-
-  .modal-header {
-    position: absolute;
-    top: 0;
-    height: 45px;
-    background: $white;
-    z-index: 1;
-    width: 100%;
-
-    &__wrap {
-      position: relative;
-      width: 100%;
-      a {
-        position: absolute;
-        right: 0;
-        z-index: 1;
-        &.rtl {
-          right: auto;
-          left: 0;
-        }
-        svg {
-          fill: $black;
-        }
-      }
-    }
-  }
-  .modal-body {
-    padding: 32px;
-    margin-top: 16px;
-    .video-player {
-      @include fp(min-height, 250, 588);
-    }
-
-    .paragraph--video-media {
-      margin: 0;
-      .container {
-        padding: 0;
-        width: 100%;
-      }
-      h3 {
-        margin: 0;
-        font-style: normal;
-        font-weight: bold;
-        font-size: 28px;
-        line-height: 32px;
-        margin-bottom: 16px;
-        display: inline-block;
-        width: 98%;
-      }
-    }
-    .section-group__block {
-      max-width: 100%;
-    }
-  }
-  .modal-header,
-  .modal-footer {
-    border: none;
-  }
-  .modal-footer {
-    display: none;
-  }
-}
-</style>
 <style lang="scss" scoped>
 @import '../../../includes/scss/all';
 // Outside wrapper style

package/src/includes/scss/mixins/src/grid.scss

@@ -7,14 +7,16 @@ $grid-breakpoints: (
   sm: 576px,
   md: 768px,
   lg: 992px,
-  xl: 1200px
+  xl: 1200px,
+  xxl: 1400px
 );
 
 $container-max-widths: (
   sm: 540px,
   md: 720px,
   lg: 960px,
-  xl: 1140px
+  xl: 1140px,
+  xxl: 1320px
 );
 
 // Minimum breakpoint width. Null for the smallest (first) breakpoint.

package/src/includes/scss/mixins/src/units.scss

@@ -1,3 +1,4 @@
+@use "sass:math";
 $current-rootsize: 16px;
 
 // Returns a unitless number
@@ -53,10 +54,11 @@ $current-rootsize: 16px;
 
 
 // Converts a px value to rems. Should only work in absolute em document context (root level), unless $context is specified
-@function px-to-rem($value, $context: $current-rootsize) {
-    @if unit($context) == "rem" {
-        $context: rem-to-px($context);
-    }
+/**/ 
+/* @function px-to-rem($value, $context: $current-rootsize) {
+    //@if unit($context) == "rem" {
+    //    $context: rem-to-px($context);
+    //}
     $result: ();
 
     @each $val in $value {
@@ -67,6 +69,25 @@ $current-rootsize: 16px;
       }
     }
     @return $result;
+}  */
+
+@function px-to-rem($px, $context: $current-rootsize) {
+  @if unit($context) == "rem" {
+      $context: rem-to-px($context);
+  }
+  $result: ();
+
+  // Iterate over each value in the $px list
+  @each $val in $px {
+    @if unit($val) == "px" {
+      // Convert px to rem
+      $val: #{math.div($val, $context)}rem;
+    }
+    // Append converted value to the result list
+    $result: append($result, $val);
+  }
+
+  @return $result;
 }
 
 // Converts a em value to rems. Should only work in absolute em document context (root level), unless $context is specified

package/src/includes/scss/vars/src/colors.module.scss

@@ -20,6 +20,20 @@ $yellow: #ffd229;
 $lightyellow: #fff6d4;
 $outline: #da47ff;
 $outline-dark: #ffffff;
+// Functional colours
+$wsv-fun-dark-green: #576D2F;
+$wsv-fun-dark-blue: #104f77;
+$wsv-fun-dark-purple: #55356b;
+$wsv-fun-dark-red: #760031;
+$wsv-fun-dark-brown: #763b00;
+$wsv-fun-dark-caramel: #cb7c2d;
+$wsv-fun-light-teal: #7ac2b5;
+$wsv-fun-light-blue: #8ecade;
+$wsv-fun-light-purple: #9871a8;
+$wsv-fun-light-fuchsia: #f16a7e;
+$wsv-fun-light-green: #edeb72;
+$wsv-fun-light-brown: #dbc38b;
+
 
 $theme-colors: (
   'gold': $gold,
@@ -43,7 +57,20 @@ $theme-colors: (
   'yellow': $yellow,
   'lightyellow': $lightyellow,
   'outline': $outline,
-  'outline-dark': $outline-dark
+  'outline-dark': $outline-dark,
+  // Functional colours
+  'wsv-fun-dark-green':$wsv-fun-dark-green,
+  'wsv-fun-dark-blue':$wsv-fun-dark-blue,
+  'wsv-fun-dark-purple':$wsv-fun-dark-purple,
+  'wsv-fun-dark-red':$wsv-fun-dark-red,
+  'wsv-fun-dark-brown':$wsv-fun-dark-brown,
+  'wsv-fun-dark-caramel':$wsv-fun-dark-caramel,
+  'wsv-fun-light-teal':$wsv-fun-light-teal,
+  'wsv-fun-light-blue':$wsv-fun-light-blue,
+  'wsv-fun-light-purple':$wsv-fun-light-purple,
+  'wsv-fun-light-fuchsia':$wsv-fun-light-fuchsia,
+  'wsv-fun-light-green':$wsv-fun-light-green,
+  'wsv-fun-light-brown':$wsv-fun-light-brown
 );
 
 :export {

package/src/index.js

@@ -5,6 +5,7 @@ import Column from './components/Containers/Column/index.vue'
 import HomepageHeader from './components/Containers/HomepageHeader/index.vue'
 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 AppFooter from './components/Global/AppFooter/index.vue'
@@ -24,7 +25,7 @@ import RichText from './components/Paragraphs/RichText/index.vue'
 import TextMedia from './components/Paragraphs/TextMedia/index.vue'
 import Accordion from './components/Paragraphs/Accordion/index.vue'
 import TabbedCards from './components/Paragraphs/TabbedCards/index.vue'
-import BrowseContent from './components/Paragraphs/BrowseContent/index.vue'
+// import BrowseContent from './components/Paragraphs/BrowseContent/index.vue'
 import TaskFinder from './components/Paragraphs/TaskFinder/index.vue'
 import ListGroup from './components/Paragraphs/ListGroup/index.vue'
 import ScrollSpy from './components/Paragraphs/ScrollSpy/index.vue'
@@ -78,7 +79,8 @@ export {
   Cookies,
   BackToTop,
   GlobalNotice,
-  ContrastMode
+  ContrastMode,
+  CarouselComponent,
 }
 
 // Export Paragraphs
@@ -87,7 +89,7 @@ export {
   TextMedia,
   Accordion,
   TabbedCards,
-  BrowseContent,
+  // BrowseContent, moved to FE
   ListGroup,
   ScrollSpy,
   Directory,
@@ -100,7 +102,7 @@ export {
   MarketingBanner,
   RelatedInformation,
   Calculator,
-  Chart
+  Chart,
 }
 
 // Export Sub Components
@@ -114,5 +116,15 @@ export {
   Breadcrumb,
   Search,
   VideoThumbnail,
-  ResourceGroup
+  ResourceGroup,
+}
+
+// Export for BrowseContent
+import DirectoryFilters from './components/Global/DirectoryFilters/index.vue'
+import Switcher from './components/Paragraphs/BrowseContent/switcher.vue'
+
+export {
+  // CardGroup, already imported
+  DirectoryFilters,
+  Switcher,
 }

package/src/main.js

@@ -1,18 +1,10 @@
 import './assets/main.css'
 
 import { createApp } from 'vue'
-import './style.css'
-import 'bootstrap/dist/css/bootstrap.min.css'
-import 'bootstrap-vue/dist/bootstrap-vue.css'
-import 'bootstrap/dist/css/bootstrap.css'
-import 'bootstrap-vue-3/dist/bootstrap-vue-3.css'
-import 'bootstrap-vue-next/dist/bootstrap-vue-next.css'
-import 'bootstrap'
-import 'bootstrap-vue'
 import App from './App.vue'
-import BootstrapVue from 'bootstrap-vue'
 import BootstrapVueNext from 'bootstrap-vue-next'
+import 'bootstrap/dist/css/bootstrap.css'
+import 'bootstrap-vue-next/dist/bootstrap-vue-next.css'
 
 createApp(App).mount('#app')
 .use(BootstrapVueNext)
-.use(BootstrapVue)