@worksafevictoria/wcl7.5 1.1.0-beta.5 → 1.1.0-beta.51

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>
@@ -62,28 +62,35 @@ export default {
   components: {
     Search,
     CtaButton,
-    HeroHeader
+    HeroHeader,
   },
   props: {
     contentParser: {
       type: Function,
-      required: true
+      required: true,
     },
     heroHeader: {
       type: Object,
-      required: true
+      required: true,
     },
     fetchMenu: {
       type: Function,
-      required: true
-    }
+      required: true,
+    },
   },
-  async fetch() {
+  // TODO useAsyncData <script setup>
+  // async fetch() {
+  //   console.log("NEVA")
+  //   await this.renderMenu()
+  // },
+  // Temp use of mounted to replace fetch
+  async mounted() {
     await this.renderMenu()
   },
+
   data: () => ({
     links: [],
-    earthIcon
+    earthIcon,
   }),
   methods: {
     async renderMenu() {
@@ -91,11 +98,11 @@ export default {
       this.links = (Array.isArray(menu) ? menu : []).map((item) => {
         return {
           text: item.title,
-          path: item.relative || item.absolute
+          path: item.relative || item.absolute,
         }
       })
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -110,6 +117,7 @@ export default {
         font-size: 32px;
         line-height: 32px;
       }
+
       @media screen and (max-width: 767px) {
         font-size: 36px;
         line-height: 36px;
@@ -134,7 +142,9 @@ export default {
         margin-top: 32px;
       }
     }
+
     margin-left: 0 !important;
+
     &:last-of-type {
       img {
         position: absolute;
@@ -146,9 +156,11 @@ export default {
 
   &__search {
     padding-right: 15px;
+
     @include mq('xs') {
       padding-right: 0;
     }
+
     :deep(.gsc-results-wrapper-visible) {
       display: none !important;
     }
@@ -159,7 +171,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,75 @@
+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,203 @@
+<template>
+  <div class="homepage-header">
+    <div class="container">
+      <search
+          :page-limit="3"
+          :page-number="1"
+          :is-typeahead="true"
+          :content-parser="contentParser"
+          tabindex="0"
+          class="homepage-header__search"
+        />
+        <row class="wcl-hero-header__content-wrapper container">
+          <column class="wcl-hero-header__content-wrapper__content-col col-12 col-md-7 wcl-hero-header__content-wrapper__content-col--split wcl-rich-text--ltr">
+            <carousel-component 
+            :carouselItems="this.slideList"
+            :storybook="this.isStorybook"
+            />
+          </column>
+          <column class="wcl-hero-header__side col-md-4 offset-md-1">
+            <cta-button
+              v-for="(link, i) in links"
+              :key="i"
+              class="iebtn"
+              :url="link.path"
+              type="dark"
+              :stretch="true"
+              >{{ link.text }}</cta-button
+            >
+            <cta-button
+              class="iebtn"
+              url="/choose-your-language"
+              type="dark"
+              :stretch="true"
+              :glyph="earthIcon"
+              :is-centred="false"
+              >Choose your language</cta-button
+            >
+          </column>
+        </row>
+    </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'
+
+export default {
+  name: 'HomepageHeader',
+  components: {
+    Search,
+    CtaButton,
+    CarouselComponent,
+    Row,
+    Column
+  },
+  props: {
+    contentParser: {
+      type: Function,
+      required: true,
+    },
+    fetchMenu: {
+      type: Function,
+      required: true,
+    },
+    slideList: {
+      type: Array,
+      required: true,
+    },
+    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>
+
+<!-- styles from the heroheader are still used for consistency, 
+even though the component itself is no longer imported. -->
+
+<style lang="scss" scoped>
+@import '../../../includes/scss/all';
+@import './../../Global/HeroHeader/styles.scss';
+
+.homepage-header {
+  border-bottom: none !important;
+
+  :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;
+      }
+    }
+  }
+
+  :deep(.wcl-hero-header__content-wrapper) {
+    @include fp('top', 75, 250);
+    margin-top: 0;
+
+    @media screen and (max-width: 540px) {
+        padding-right: 35px;
+      }
+
+  }
+
+  :deep(.wcl-hero-header__wrap) {
+    display: block;
+    align-items: normal;
+  }
+
+  :deep(.wcl-cta) {
+    @include mq('mm') {
+      &:first-of-type {
+        margin-top: 32px;
+      }
+    }
+
+    margin-left: 0 !important;
+
+    &:last-of-type {
+      img {
+        position: absolute;
+        right: 16px;
+        top: 19px;
+      }
+    }
+  }
+
+  &__search {
+    // margin-top: 10px;
+    z-index: 1;
+    width: auto;
+
+    @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/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,42 +61,42 @@ 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: {
@@ -104,24 +104,30 @@ export default {
       // Some custom logic for gov caretaker logic
       if (process.env.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/index.stories.js

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

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

@@ -11,7 +11,7 @@
           <column>
             <div class="mobilescreen">Reviewed on {{ updateDate }}</div>
             <div v-if="!submitted">
-              <div style="margin-right:10px; display:inline">
+              <div style="margin-right: 10px; display: inline">
                 <strong>Was this page helpful?</strong>
               </div>
               <input
@@ -86,7 +86,7 @@
                     Cancel
                   </button>
                   <cta-button
-                    style="float:right;"
+                    style="float: right"
                     :url="''"
                     :rtl="rtl"
                     @clicked="submitFeedback()"
@@ -181,7 +181,7 @@
                     :key="subIndex"
                     class="app-footer-menu__item"
                     :class="{
-                      'app-footer-menu__item--hide': !menuItem.isOpen
+                      'app-footer-menu__item--hide': !menuItem.isOpen,
                     }"
                   >
                     <a
@@ -249,7 +249,7 @@
                   <li
                     class="app-footer-menu__item app-footer-menu__address app-footer-menu__item--link"
                     :class="{
-                      'app-footer-menu__item--hide': !contactMenuIsOpen
+                      'app-footer-menu__item--hide': !contactMenuIsOpen,
                     }"
                   >
                     <p>
@@ -261,7 +261,7 @@
                   <li
                     class="app-footer-menu__item app-footer-menu__item--link"
                     :class="{
-                      'app-footer-menu__item--hide': !contactMenuIsOpen
+                      'app-footer-menu__item--hide': !contactMenuIsOpen,
                     }"
                   >
                     <a class="dark" href="tel:+611800136089">1800 136 089</a>
@@ -269,7 +269,7 @@
                   <li
                     class="app-footer-menu__item app-footer-menu__item--link"
                     :class="{
-                      'app-footer-menu__item--hide': !contactMenuIsOpen
+                      'app-footer-menu__item--hide': !contactMenuIsOpen,
                     }"
                   >
                     <nuxt-link class="dark" to="/contact-worksafe"
@@ -337,7 +337,7 @@
             <button
               class="app-footer__main__subscribe-col__btn"
               :class="{
-                'app-footer__main__subscribe-btn--workwell': isWorkwell
+                'app-footer__main__subscribe-btn--workwell': isWorkwell,
               }"
               @click="subscribe"
             >
@@ -385,25 +385,25 @@ export default {
     Container,
     Row,
     Icon,
-    CtaButton
+    CtaButton,
   },
   props: {
     footerMenu: {
       type: Array,
-      required: true
+      required: true,
     },
     changedDate: {
       type: String,
-      required: true
+      required: true,
     },
     isWorkwell: {
       type: Boolean,
-      default: false
+      default: false,
     },
     storybook: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data() {
     return {
@@ -430,8 +430,8 @@ export default {
         webform_id: 'page_feedback_form',
         page_url: '',
         was_the_information_on_this_page_helpful_: '',
-        message: ''
-      }
+        message: '',
+      },
     }
   },
   computed: {
@@ -444,7 +444,7 @@ export default {
     },
     processID() {
       return `${Date.now()}-${Math.floor(Math.random() * 10000)}`
-    }
+    },
   },
   watch: {
     $route() {
@@ -452,10 +452,10 @@ export default {
       this.submitted = false
     },
     showForm: {
-      handler: function() {
+      handler: function () {
         this.initialiseFeedback()
-      }
-    }
+      },
+    },
   },
   mounted() {
     this.$nextTick(() => {
@@ -510,7 +510,8 @@ export default {
       const attrs = {
         event: 'custom.interaction.helpful',
         label: this.response.was_the_information_on_this_page_helpful_,
-        title: this.$store?.state?.page?.content?.title
+        //title: this.$store?.state?.page?.content?.title,
+        title: this.$pageStore?.content?.title,
       }
       if (this.$gtm) {
         this.$gtm.push({ event: 'custom.interaction.helpful', ...attrs })
@@ -518,20 +519,21 @@ export default {
     },
     fireGtagFeedback() {
       const attrs = {
-        title: this.$store?.state?.page?.content?.title,
+        //title: this.$store?.state?.page?.content?.title,
+        title: this.$pageStore?.content?.title,
         label: this.response.was_the_information_on_this_page_helpful_,
-        processID: this.processID
+        processID: this.processID,
       }
       if (this.$gtm) {
         this.$gtm.push({
           event: 'custom.interaction.helpful.feedback',
-          ...attrs
+          ...attrs,
         })
       }
     },
     backToTop() {
-      if (!this.storybook) {
-        this.$nuxt.$emit('scrollToTop')
+      if (this.$bus) {
+        this.$bus.$emit('scrollToTop')
       }
     },
     isAbsoluteUrl(uri) {
@@ -617,13 +619,13 @@ export default {
           this.$gtm.push({
             event: 'custom.interaction.outboundlink',
             category: item.title,
-            label: item.absolute
+            label: item.absolute,
           })
         }
         window.open(item.absolute)
       }
-    }
-  }
+    },
+  },
 }
 </script>