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

package/src/components/Containers/HomepageHeader/index.vue

@@ -14,7 +14,7 @@
     class="homepage-header"
   >
     <template v-slot:top>
-      <slot />
+      <slot></slot>
     </template>
 
     <template v-slot:description>
@@ -51,51 +51,45 @@
     </template>
   </hero-header>
 </template>
-<script>
+<script setup>
 import Search from './../../SubComponents/Search/index.vue'
 import CtaButton from './../../SubComponents/CtaButton/index.vue'
 import HeroHeader from './../../Global/HeroHeader/index.vue'
 import earthIcon from './../../../assets/icons/earth.svg?url'
 
-export default {
-  name: 'HomepageHeader',
-  components: {
-    Search,
-    CtaButton,
-    HeroHeader
+const props = defineProps({
+  contentParser: {
+    type: Function,
+    required: true,
   },
-  props: {
-    contentParser: {
-      type: Function,
-      required: true
-    },
-    heroHeader: {
-      type: Object,
-      required: true
-    },
-    fetchMenu: {
-      type: Function,
-      required: true
-    }
+  heroHeader: {
+    type: Object,
+    required: true,
   },
-  async fetch() {
-    await this.renderMenu()
+  fetchMenu: {
+    type: Function,
+    required: true,
   },
-  data: () => ({
-    links: [],
-    earthIcon
-  }),
-  methods: {
-    async renderMenu() {
-      const menu = await this.fetchMenu()
-      this.links = (Array.isArray(menu) ? menu : []).map((item) => {
-        return {
-          text: item.title,
-          path: item.relative || item.absolute
-        }
-      })
-    }
+})
+
+const links = ref([])
+
+await useAsyncData('fetchData', async () => {
+  try {
+    await renderMenu()
+  } catch (err) {
+    console.log('🚀 ~ err:', err)
   }
+})
+
+async function renderMenu() {
+  const menu = await props.fetchMenu()
+  links.value = (Array.isArray(menu) ? menu : []).map((item) => {
+    return {
+      text: item.title,
+      path: item.relative || item.absolute,
+    }
+  })
 }
 </script>
 <style lang="scss" scoped>
@@ -110,6 +104,7 @@ export default {
         font-size: 32px;
         line-height: 32px;
       }
+
       @media screen and (max-width: 767px) {
         font-size: 36px;
         line-height: 36px;
@@ -134,7 +129,9 @@ export default {
         margin-top: 32px;
       }
     }
+
     margin-left: 0 !important;
+
     &:last-of-type {
       img {
         position: absolute;
@@ -146,9 +143,11 @@ export default {
 
   &__search {
     padding-right: 15px;
+
     @include mq('xs') {
       padding-right: 0;
     }
+
     :deep(.gsc-results-wrapper-visible) {
       display: none !important;
     }
@@ -159,7 +158,9 @@ export default {
     .iebtn {
       bottom: 280px;
       left: 650px;
-    } /* IE11 */
+    }
+
+    /* IE11 */
 
     @media screen\9, screen and (max-width: 1150px) {
       .iebtn {

package/src/components/Containers/HomepageHeaderNew/index.stories.js

@@ -0,0 +1,76 @@
+import HomepageHeader from './index.vue'
+import { mockCarouselItems } from '../../../mock/carousel-items'
+
+
+const fetchMenu = () =>
+  Promise.resolve([
+    {
+      title: 'Report an incident',
+      relative: '/report-incident'
+    },
+    {
+      title: 'Report a case of COVID-19',
+      relative: '/report-confirmed-positive-case-covid-19'
+    },
+    {
+      title: 'Make a claim',
+      relative: '/before-claim'
+    },
+    {
+      title: 'Apply for a licence',
+      relative: '/apply-for-licence'
+    },
+    {
+      title: 'Pay or renew your insurance',
+      relative: '/pay-or-renew-your-workcover-insurance-premium'
+    }
+  ])
+
+  const contentParser = () => {
+    return Promise.resolve({
+      results: [
+        {
+          title: 'Content title 1',
+          description: 'Content description 2'
+        }
+      ],
+      offset: 0,
+      numFound: 1000
+    })
+  }
+
+export default {
+  title: 'Website_Redesign/HomepageHeader',
+  component: HomepageHeader,
+  argTypes: {
+    fetchMenu: {
+      control: 'function',
+      table: { disable: true }
+    },
+    contentParser: {
+      control: 'function',
+      table: { disable: true }
+    }
+  },
+  args: {
+    fetchMenu: fetchMenu,
+    slideList: mockCarouselItems,
+    isStorybook: true,
+    contentParser: contentParser
+  }
+}
+
+const DefaultHH = (args) => ({
+  components: { HomepageHeader },
+  setup() {
+    return { args };
+  },
+  mounted() {
+    setTimeout(() => {
+      this.$refs.hh.renderMenu()
+    })
+  },
+  template: '<homepage-header v-bind="args" ref="hh" />'
+})
+
+export const Default = DefaultHH.bind({})

package/src/components/Containers/HomepageHeaderNew/index.vue

@@ -0,0 +1,242 @@
+<!-- When implemented, importing mock values for carousel to be removed.  This was only for testing locally, while values not available from drupal. -->
+
+<template>
+  <div class="homepage-header"> 
+    <container>
+      <search
+      :page-limit="3"
+      :page-number="1"
+      :is-typeahead="true"
+      :content-parser="contentParser"
+      tabindex="0"
+      class="homepage-header__search"
+    />
+    </container>
+      
+    <div class="homepage-header__content-wrapper">
+      <container class="homepage-header__content-wrapper__content">
+        <row>
+          <column
+              class="homepage-header__content-wrapper__content-col col-12 col-md-7 homepage-header__content-wrapper__content-col--split wcl-rich-text--ltr"
+              :xs="7"
+              :md="7"
+            >
+              <carousel-component 
+                :carouselItems="this.slideList"
+                :storybook="this.isStorybook"
+              />
+          </column>
+          <column
+              md="4"
+              :offset-md="1"
+              class="homepage-header__side col-md-4 offset-md-1"
+            >
+              <div>
+                <cta-button
+                  v-for="(link, i) in links"
+                  :key="i"
+                  class="iebtn"
+                  :url="link.path"
+                  type="dark"
+                  :stretch="true"
+                  >{{ link.text }}</cta-button
+                >
+              </div>
+            </column>
+        </row>
+      </container>
+    </div>
+  </div>
+</template>
+
+<script>
+import Search from './../../SubComponents/Search/index.vue'
+import CtaButton from './../../SubComponents/CtaButton/index.vue'
+import earthIcon from './../../../assets/icons/earth.svg?url'
+import CarouselComponent from './../../Containers/Carousel/index.vue'
+import Row from './../../Containers/Row/index.vue'
+import Column from './../../Containers/Column/index.vue'
+// import { mockCarouselItems } from '../../../mock/carousel-items'
+
+export default {
+  name: 'HomepageHeader',
+  components: {
+    Search,
+    CtaButton,
+    CarouselComponent,
+    Row,
+    Column,
+    // mockCarouselItems
+  },
+  props: {
+    contentParser: {
+      type: Function,
+      required: true,
+    },
+    fetchMenu: {
+      type: Function,
+      required: true,
+    },
+    slideList: {
+      type: Array,
+      required: true,
+      // default: mockCarouselItems
+    },
+    isStorybook: {
+      type: Boolean,
+      default: false
+    }
+  },
+  async mounted() {
+    await this.renderMenu()
+  },
+
+  data: () => ({
+    links: [],
+    earthIcon,
+  }),
+  methods: {
+    async renderMenu() {
+      const menu = await this.fetchMenu()
+      this.links = (Array.isArray(menu) ? menu : []).map((item) => {
+        return {
+          text: item.title,
+          path: item.relative || item.absolute,
+        }
+      })
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+@import '../../../includes/scss/all';
+@import './../../Global/HeroHeader/styles.scss';
+
+
+.homepage-header {
+  position:relative;
+  margin-bottom: 10px;
+  display: block;
+  border-bottom: none !important;
+  height: auto;
+  align-items: normal;
+
+  :deep(.wysiwyg) {
+    h1 {
+      @media screen and (max-width: 390px) {
+        font-size: 32px;
+        line-height: 32px;
+      }
+
+      @media screen and (max-width: 767px) {
+        font-size: 36px;
+        line-height: 36px;
+        margin-bottom: 16px;
+      }
+    }
+  }
+
+  &__content-wrapper {
+    width: 100%;
+    position: relative;
+    margin-top: 80px;
+    @include mq('mm') {
+      margin-top: 10px !important;
+    }
+
+    &__content {
+      @include mq('md') {
+        max-width: 100%;
+        margin: 0;
+        padding: 0 30px;
+      }
+      &-col {
+        max-width: 69%;
+        z-index: 2;
+        @include mq('mm') {
+          max-width: 100%;
+          padding-right: 45px;
+        }
+        @include mq('xs') {
+          padding-right: 0px;
+          padding-left: 0px;
+        }
+
+        &--split {
+          padding-right: 0;
+        }
+
+        .header-rich-text-wrap {
+          max-width: 100%;
+        }
+      }
+    }
+  }
+
+  :deep(.homepage-header__wrap) {
+    display: block;
+    align-items: normal;
+  }
+
+  :deep(.wcl-cta) {
+
+    margin-left: 0 !important;
+
+    &:last-of-type {
+      img {
+        position: absolute;
+        right: 16px;
+        top: 19px;
+      }
+    }
+  }
+
+  &__search {
+    margin-top: 10px;
+    z-index: 1;
+    width: auto;
+    position: relative;
+    
+
+    @include mq('xs') {
+      padding-right: 0;
+    }
+
+    :deep(.gsc-results-wrapper-visible) {
+      display: none !important;
+    }
+  }
+
+  @media all and (-ms-high-contrast: none) {
+    ::-ms-backdrop,
+    .iebtn {
+      bottom: 280px;
+      left: 650px;
+    }
+
+    /* IE11 */
+
+    @media screen\9, screen and (max-width: 1150px) {
+      .iebtn {
+        bottom: 330px;
+        left: 480px;
+      }
+    }
+
+    @media screen\9, screen and (max-width: 950px) {
+      .iebtn {
+        bottom: 350px;
+        left: 450px;
+      }
+    }
+
+    @media screen\9, screen and (max-width: 767px) {
+      .iebtn {
+        left: 2px;
+        top: 10px;
+      }
+    }
+  }
+}
+</style>

package/src/components/Containers/SectionGroup/index.vue

@@ -50,7 +50,7 @@
             <slot name="preContent"></slot>
           </column>
         </row>
-
+        
         <div
           class="section-group__content section-group__row"
           :class="{

package/src/components/Containers/Subheader/index.vue

@@ -35,12 +35,12 @@
             v-if="card.description"
             class="subheader__description"
             :class="{
-              [`w-100 text-left`]: alignLeft
+              [`w-100 text-left`]: alignLeft,
             }"
           >
             <strong
               v-if="singleLineCards && card.title"
-              v-html="card.title + ':'"
+              v-html="card.title + ': '"
             >
             </strong>
             <span v-html="card.description"></span>
@@ -61,67 +61,77 @@ export default {
   props: {
     itemList: {
       type: Array,
-      required: true
+      required: true,
     },
     cardColumnSize: {
       type: Number,
-      default: null
+      default: null,
     },
     singleLineCards: {
-      type: Boolean
+      type: Boolean,
     },
     background: {
       type: String,
-      default: 'none'
+      default: 'none',
     },
     heading: {
       type: String,
-      default: ''
+      default: '',
     },
     alignLeft: {
-      type: Boolean
+      type: Boolean,
     },
     showIcon: {
       type: Boolean,
-      default: true
+      default: true,
     },
     iconPosition: {
       type: String,
-      default: null
+      default: null,
     },
     type: {
       type: String,
-      default: ''
-    }
+      default: '',
+    },
   },
   data() {
     return {
-      isSingleColumn: false
+      isSingleColumn: false,
     }
   },
   methods: {
     selectedCard(card) {
       // Some custom logic for gov caretaker logic
-      if (process.env.CARETAKER && process.env.CARETAKER === 'true') {
+      if (
+        (this.$config
+          ? this.$config.public.caretaker
+          : process.env.CARETAKER) === 'true'
+      ) {
         if (!isGovSite(card?.selectedCard?.linkHref)) {
-          this.$store.commit('page/SET_CARETAKER_REF', 'subheader')
-          this.$root.$emit('caretaker-open', card?.selectedCard?.linkHref)
+          // this.$store.commit('page/SET_CARETAKER_REF', 'subheader')
+          // this.$root.$emit('caretaker-open', card?.selectedCard?.linkHref)
+          if (this.$pageStore) {
+            this.$pageStore.caretaker.referrer = 'subheader'
+          }
+          if (this.$bus) {
+            this.$bus.$emit('caretaker-open', card?.selectedCard?.linkHref)
+          }
         } else {
           navigateToPath.call(
             this,
             card?.selectedCard?.linkHref,
-            card?.ev?.ctrlKey === true || card?.ev?.metaKey === true
+            card?.ev?.ctrlKey === true || card?.ev?.metaKey === true,
           )
         }
       } else {
         navigateToPath.call(
           this,
           card?.selectedCard?.linkHref,
-          card?.ev?.ctrlKey === true || card?.ev?.metaKey === true
+          card?.ev?.ctrlKey === true || card?.ev?.metaKey === true,
         )
       }
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>

package/src/components/Global/AlertStrip/index.stories.js

@@ -3,6 +3,7 @@ import AlertStrip from './index.vue'
 export default {
   title: 'Global/AlertStrip',
   component: AlertStrip,
+  tags: ['autodocs'],
   args: {
     isWarning: false,
     desc: 'Refresh the page in order to show alert strip after dismissing it.',

package/src/components/Global/AppFooter/FooterSocialShare/index.vue

@@ -22,7 +22,7 @@
 
 <script>
 import facebookIcon from '../../../../assets/icons/AppFooter/facebook-ws-footer.svg?url'
-import twitterIcon from '../../../../assets/icons/AppFooter/twitter-ws-footer.svg?url'
+import twitterIcon from '../../../../assets/icons/AppFooter/x-ws-footer.svg?url'
 import linkedInIcon from '../../../../assets/icons/AppFooter/linkedin-ws-footer.svg?url'
 import instagramIcon from '../../../../assets/icons/instagram.svg?url'
 import youtubeIcon from '../../../../assets/icons/AppFooter/youtube-ws-footer.svg?url'

package/src/components/Global/AppFooter/index.stories.js

@@ -7,6 +7,7 @@ dateInput = dateInput.toString()
 export default {
   title: 'Global/AppFooter',
   component: AppFooter,
+  tags: ['autodocs'],
   data() {
     return {
       footerMenu