@worksafevictoria/wcl7.5 1.1.0-beta.1 → 1.1.0-beta.100

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,148 +45,61 @@
 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',
   components: {
     VideoMedia,
-    IconClose
+    IconClose,
+    'b-modal': BModal,
   },
   props: {
     video: {
       type: Object,
-      required: true
-    }
+      required: true,
+    },
   },
   data() {
     return {
       VideoPlay,
       IconClose,
       showModal: false,
-      videoThumbnail: ''
+      videoThumbnail: '',
     }
   },
   mounted() {
     this.getVideoThumbnail()
   },
   methods: {
-    async getVideoThumbnail() {
-      if (this.video.provider === 'youtube') {
-        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}`
-          )
-          if (
-            thumbnailAvailable &&
-            thumbnailAvailable.data &&
-            thumbnailAvailable.data.valid === false
-          ) {
+    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 (response.status === 200) {
+          } else {
             this.videoThumbnail = `https://i.ytimg.com/vi/${this.video.id}/hqdefault.jpg`
           }
+        } else if (this.video.provider === 'vimeo') {
+          let thumbnail = await axios.get(
+            `https://vimeo.com/api/v2/video/${this.video.id}.json`,
+          )
+          if (thumbnail.data) {
+            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`
+        } else {
         }
-      } else if (this.video.provider === 'vimeo') {
-        this.getVimeoThumbnail()
       }
     },
-    async getVimeoThumbnail() {
-      let thumbnail = await this.$axios.get(
-        `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/includes/scss/vars/src/colors.scss

@@ -20,6 +20,21 @@ $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 +58,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

@@ -1,17 +1,18 @@
 // Global Components
-import Container from './components/Containers/Container'
-import Row from './components/Containers/Row'
-import Column from './components/Containers/Column'
-import HomepageHeader from './components/Containers/HomepageHeader'
-import Subheader from './components/Containers/Subheader'
-import SectionGroup from './components/Containers/SectionGroup'
+import Container from './components/Containers/Container/index.vue'
+import Row from './components/Containers/Row/index.vue'
+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'
-import AppFooter from './components/Global/AppFooter'
-import HeroHeader from './components/Global/HeroHeader'
-import SocialShare from './components/Global/SocialShare'
-import Strip from './components/Global/Strip'
-import AlertStrip from './components/Global/AlertStrip'
+import AppHeader from './components/Global/AppHeader/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'
+import Strip from './components/Global/Strip/index.vue'
+import AlertStrip from './components/Global/AlertStrip/index.vue'
 import CardGrid from './components/Common/CardGrid/index.vue'
 import CardGridItem from './components/Common/CardGridItem/index.vue'
 import Cookies from './components/Global/Cookies/index.vue'
@@ -20,40 +21,44 @@ import GlobalNotice from './components/Global/GlobalNotice/index.vue'
 import ContrastMode from './components/Global/ContrastMode/index.vue'
 
 // Paragraphs
-import RichText from './components/Paragraphs/RichText'
-import TextMedia from './components/Paragraphs/TextMedia'
-import Accordion from './components/Paragraphs/Accordion'
-import TabbedCards from './components/Paragraphs/TabbedCards'
-import BrowseContent from './components/Paragraphs/BrowseContent'
-import TaskFinder from './components/Paragraphs/TaskFinder'
-import ListGroup from './components/Paragraphs/ListGroup'
-import ScrollSpy from './components/Paragraphs/ScrollSpy'
-import Directory from './components/Paragraphs/Directory'
-import SelectableCards from './components/Paragraphs/SelectableCards'
-import VideoMedia from './components/Paragraphs/VideoPlayer'
-import VideoGrid from './components/Paragraphs/VideoGrid'
-import Statistics from './components/Paragraphs/Statistics'
-import ProofPoints from './components/Paragraphs/ProofPoints'
-import TabulatedData from './components/Paragraphs/TabulatedData'
-import Breakout from './components/Paragraphs/Breakout'
-import Tabs from './components/Paragraphs/Tabs'
-import MarketingBanner from './components/Paragraphs/MarketingBanner'
-import RelatedInformation from './components/Paragraphs/RelatedInformation'
-import Calculator from './components/Paragraphs/Calculator'
+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 TaskFinder from './components/Paragraphs/TaskFinder/index.vue'
+import ListGroup from './components/Paragraphs/ListGroup/index.vue'
+import ScrollSpy from './components/Paragraphs/ScrollSpy/index.vue'
+import Directory from './components/Paragraphs/Directory/index.vue'
+import SelectableCards from './components/Paragraphs/SelectableCards/index.vue'
+import VideoMedia from './components/Paragraphs/VideoPlayer/index.vue'
+import VideoGrid from './components/Paragraphs/VideoGrid/index.vue'
+import Statistics from './components/Paragraphs/Statistics/index.vue'
+import ProofPoints from './components/Paragraphs/ProofPoints/index.vue'
+import TabulatedData from './components/Paragraphs/TabulatedData/index.vue'
+import Breakout from './components/Paragraphs/Breakout/index.vue'
+import Tabs from './components/Paragraphs/Tabs/index.vue'
+import MarketingBanner from './components/Paragraphs/MarketingBanner/index.vue'
+import RelatedInformation from './components/Paragraphs/RelatedInformation/index.vue'
+import Calculator from './components/Paragraphs/Calculator/index.vue'
+import Chart from './components/Paragraphs/Chart/index.vue'
 
 // SubComponents
-import FormAddressPostcode from './components/SubComponents/FormAddressPostcode'
-import CtaButton from './components/SubComponents/CtaButton'
-import Pagination from './components/SubComponents/Pagination'
-import SingleImage from './components/SubComponents/SingleImage'
-import Loading from './components/SubComponents/Loading'
-import Icon from './components/SubComponents/Icon'
-import Breadcrumb from './components/SubComponents/Breadcrumb'
+import FormAddressPostcode from './components/SubComponents/FormAddressPostcode/index.vue'
+import CtaButton from './components/SubComponents/CtaButton/index.vue'
+import Pagination from './components/SubComponents/Pagination/index.vue'
+import SingleImage from './components/SubComponents/SingleImage/index.vue'
+import Loading from './components/SubComponents/Loading/index.vue'
+import Icon from './components/SubComponents/Icon/index.vue'
+import Breadcrumb from './components/SubComponents/Breadcrumb/index.vue'
 import CardGroup from './components/SubComponents/CardGroup/index.vue'
 import Search from './components/SubComponents/Search/index.vue'
 import VideoThumbnail from './components/SubComponents/VideoThumbnail/index.vue'
 import ResourceGroup from './components/SubComponents/ResourceGroup/index.vue'
 
+// Temp Components for testing
+import BrowseContent2 from './components/Paragraphs/BrowseContent/setup.vue'
+
 // Export Global Components
 export {
   Container,
@@ -77,7 +82,8 @@ export {
   Cookies,
   BackToTop,
   GlobalNotice,
-  ContrastMode
+  ContrastMode,
+  CarouselComponent,
 }
 
 // Export Paragraphs
@@ -98,7 +104,8 @@ export {
   Tabs,
   MarketingBanner,
   RelatedInformation,
-  Calculator
+  Calculator,
+  Chart,
 }
 
 // Export Sub Components
@@ -112,5 +119,18 @@ 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,
 }
+
+// Temp Components for testing
+export { BrowseContent2 }

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)