@worksafevictoria/wcl7.5 1.2.1 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@worksafevictoria/wcl7.5",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "main": "src/index.js",
   "license": "MIT",
   "repository": {

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

@@ -226,14 +226,13 @@ export default {
     }
   },
   mounted() {
-    // required, as unable to check localStorage until window loaded
-    window.addEventListener('load', this.checkCookie)
     // detect screen size to display smaller content
     this.screenWidth = window.innerWidth
-    this.$nextTick(() => {
-      window.addEventListener('resize', this.updateScreenWidth)
-    })
     this.updateScreenWidth()
+    // required, as unable to check localStorage until window loaded
+    this.checkCookie()
+    window.addEventListener('resize', this.updateScreenWidth)
+    
   },
   unmounted() {
     window.removeEventListener('load', this.checkCookie)
@@ -251,36 +250,31 @@ export default {
       const analyticsCookieName = 'analyticsCookies'
       const marketingCookieName = 'marketingCookies'
       var cookieElement = document.getElementById('mainCookieContainer')
+     
       if (cookieElement) {
+        localStorage.setItem('cookieBannerDisplayed', 'true') // Mark the banner as displayed
+        
         if (clickResponse === 'accept') {
-          localStorage.setItem('cookieBannerDisplayed', 'false')
+          // localStorage.setItem('cookieBannerDisplayed', 'false')
           localStorage.setItem(analyticsCookieName, 'granted')
           localStorage.setItem(marketingCookieName, 'granted')
-          cookieElement.classList.add('hide')
-          cookieElement.classList.remove('show')
+
         } else if (clickResponse === 'save') {
+          // localStorage.setItem('cookieBannerDisplayed', 'false')
           const acb = document.getElementById('modal2CB')
           const mcb = document.getElementById('modal3CB')
-          localStorage.setItem('cookieBannerDisplayed', 'false')
-          if (acb.checked) {
-            localStorage.setItem(analyticsCookieName, 'granted')
-          } else {
-            localStorage.setItem(analyticsCookieName, 'denied')
-          }
-          if (mcb.checked) {
-            localStorage.setItem(marketingCookieName, 'granted')
-          } else {
-            localStorage.setItem(marketingCookieName, 'denied')
-          }
-          cookieElement.classList.add('hide')
-          cookieElement.classList.remove('show')
+
+          localStorage.setItem(analyticsCookieName, acb.checked ? 'granted' : 'denied')
+          localStorage.setItem(marketingCookieName, mcb.checked ? 'granted' : 'denied')
         } else {
-          localStorage.setItem('cookieBannerDisplayed', 'false')
+          // clickResponse === 'reject'
+          // localStorage.setItem('cookieBannerDisplayed', 'false')
           localStorage.setItem(analyticsCookieName, 'denied')
           localStorage.setItem(marketingCookieName, 'denied')
-          cookieElement.classList.add('hide')
-          cookieElement.classList.remove('show')
         }
+
+        cookieElement.classList.add('hide')
+        cookieElement.classList.remove('show')
       }
     },
     // function to update consent in GTM
@@ -322,18 +316,18 @@ export default {
     },
     // function to remove cookies according to response from overlay or modal
     checkCookie: function() {
-      var cookieElement = document.getElementById('mainCookieContainer')
-      console.log('**else this.showCookie:-', this.showCookie)
-      console.log('**else typeof this.showCookie:-', typeof this.showCookie)
-      console.log('**else localStorage.getItem(cookieBannerDisplayed):-', localStorage.getItem('cookieBannerDisplayed'))
-      
-      if (cookieElement) {
-        if (this.showCookie === true && !localStorage.getItem('cookieBannerDisplayed')) {
-          console.log('**Ifffff:-')
+      const cookieElement = document.getElementById('mainCookieContainer');
+      const bannerDisplayed = localStorage.getItem('cookieBannerDisplayed');
+
+
+        if (this.showCookie && bannerDisplayed !== 'true') {
+          // Show the banner if it's not been displayed yet
+          console.log('** Show the banner if its not been displayed yet:-')
           cookieElement.classList.remove('hide')
           cookieElement.classList.add('show')
         } else {
-          console.log('**Elseeee:-')
+          // Hide the banner if user has already made a selection
+          console.log('** Hide the banner if user has already made a selection:-')
           // need to remove cookies in rejected categories, but first hide cookie overlay
           cookieElement.classList.add('hide')
           cookieElement.classList.remove('show')
@@ -427,7 +421,7 @@ export default {
             })
           }
         }
-      }
+
     }
   }
 }