@worksafevictoria/wcl7.5 1.13.0 → 1.14.0-beta.1

package/src/components/Paragraphs/Directory/Asbestos/Records/index.vue

@@ -1,7 +1,7 @@
 <template>
   <section-group class="paragraph--directory dir-filters">
     <!-- Filters -->
-    <row style="column-gap: 16px">
+    <row style="column-gap: 10px">
       <!-- Keyword Filters -->
       <column xxl="2" xl="3" md="4" sm="6">
         <label class="col-form-label visually-hidden" for="keyword-search">
@@ -44,21 +44,21 @@
           <option class="placeholder" value="" disabled hidden selected>
             Service class
           </option>
-          <option value="Class A Asbestos Removalists">
-            Class A Asbestos Removalists
+          <option value="Class A - Friable and non-friable">
+            Class A - Friable and non-friable
           </option>
-          <option value="Class B Asbestos Removalists">
-            Class B Asbestos Removalists
+          <option value="Class B - Non-friable">
+            Class B - Non-friable
           </option>
-          <option value="Class A - Restricted - Asbestos Removalists">
+          <!-- <option value="Class A - Restricted - Asbestos Removalists">
             Class A - Restricted - Asbestos Removalists
           </option>
           <option value="Class B - Restricted - Asbestos Removalists">
             Class B - Restricted - Asbestos Removalists
-          </option>
+          </option> -->
         </select>
       </column>
-      <column xxl="2" xl="3" md="4" sm="6">
+      <!-- <column xxl="2" xl="3" md="4" sm="6">
         <label class="col-form-label visually-hidden" for="search-services">
           Search by suburb (typed suburb automatically filters below results)
         </label>
@@ -70,7 +70,7 @@
           aria-label="Search by suburb (typed suburb automatically filters below results)"
           class="search"
         />
-      </column>
+      </column> -->
       <column md="2">
         <filter-button
           v-if="!hideReset"
@@ -120,7 +120,7 @@ export default {
       searchRem: '',
       searchSub: '',
       searchClass: '',
-      searchServices: '',
+      // searchServices: '',
       filteredItems: null,
       perPage: 10,
       page: 0,
@@ -159,21 +159,21 @@ export default {
             .includes(this.searchClass.toLowerCase()),
         )
       }
-      if (this.searchServices.length) {
-        this.hideReset = false
-        results = results.filter((item) =>
-          item.services
-            .toLowerCase()
-            .includes(this.searchServices.toLowerCase()),
-        )
-      }
+      // if (this.searchServices.length) {
+      //   this.hideReset = false
+      //   results = results.filter((item) =>
+      //     item.services
+      //       .toLowerCase()
+      //       .includes(this.searchServices.toLowerCase()),
+      //   )
+      // }
       this.filteredItems = results
 
       if (
         this.searchRem.length ||
         this.searchSub.length ||
-        this.searchClass.length ||
-        this.searchServices.length
+        this.searchClass.length
+        // || this.searchServices.length
       ) {
         this.pageChanged(1)
       }
@@ -184,7 +184,7 @@ export default {
     flatRecords() {
       let flatRecords = []
       const sortedItems = this.items.sort((a, b) =>
-        a.ResourceName.localeCompare(b.ResourceName, 'en', {
+        a.Account.localeCompare(b.Account, 'en', {
           sensitivity: 'base',
         }),
       )
@@ -192,21 +192,22 @@ export default {
       sortedItems.forEach((record) => {
         flatRecords.push({
           type: 'ar',
-          title: record.ResourceName,
-          fullAddress: record.AddressLine2,
-          workPhone: record.Phone,
-          mobilePhone: record.CompanyMobile,
-          email: record.CompanyEmailDisp,
-          website: this.formatWebsite(record.CompanyWebURLDisp),
-          contact1: this.returnContact(
-            record.ContactFirstName,
-            record.ContactLastName,
-          ),
-          email1: record.ContactEmail,
-          phone1: record.ContactPhoneDisp,
-          mobile1: record.ContactMobileDisp,
-          services: record.ServicesAll.replace(/,$/, ''),
-          serviceCategory: record.ServiceAll,
+          title: record.Account,
+          fullAddress: record.Regbusinessaddresssuburb + ' ' + record.Regbusinessaddresspostcode,
+          // workPhone: record.Phone,
+          mobilePhone: record.PrimaryContactMobile,
+          email: record.PrimaryContactEmail,
+          website: record.Website ? this.formatWebsite(record.Website) : '',
+          // contact1: this.returnContact(
+          //   record.ContactFirstName,
+          //   record.ContactLastName,
+          // ),
+          contact1: record.PrimaryContactAccountName,
+          // email1: record.PrimaryContactEmail,
+          // phone1: record.ContactPhoneDisp,
+          // mobile1: record.PrimaryContactMobile,
+          // services: record.ServicesAll.replace(/,$/, ''),
+          serviceCategory: record.AsbestosClass,
         })
       })
       return flatRecords
@@ -245,10 +246,10 @@ export default {
       return returnUrl
     },
 
-    returnContact(firstN, lastN) {
-      let retContact = [firstN, lastN].filter(Boolean).join(' ')
-      return retContact
-    },
+    // returnContact(firstN, lastN) {
+    //   let retContact = [firstN, lastN].filter(Boolean).join(' ')
+    //   return retContact
+    // },
 
     chunkify(arr, n) {
       if (arr) {

package/src/includes/scss/mixins/src/fp.scss

@@ -17,6 +17,7 @@
   $multiplier: calc(($max - $min) / ($end - $start) * 100);
   $adder: calc(($min * $end - $max * $start) / ($end - $start));
   $formula: calc(#{$multiplier + 0vw} + #{$adder + 0px});
+  #{$property}: $formula;
   @if $clip and $clipAtStart {
     @media (max-width: #{$start + 0px}) {
       #{$property}: $min + 0px;
@@ -27,5 +28,4 @@
       #{$property}: $max + 0px;
     }
   }
-  #{$property}: $formula;
 }

package/src/index.js

@@ -1,4 +1,4 @@
-// Global Components
+// Global Componentsn  - replace HomePageheader with HomepageHeaderNew to introduce new header
 import Container from './components/Containers/Container/index.vue'
 import Row from './components/Containers/Row/index.vue'
 import Column from './components/Containers/Column/index.vue'
@@ -59,9 +59,6 @@ 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,
@@ -128,15 +125,8 @@ export {
   ResourceGroup,
 }
 
-// Export for BrowseContent
+// DEPRECATED - to be removed in future
 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 }
+export { DirectoryFilters, Switcher }