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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/package.json +1 -1
  2. package/src/components/Containers/Carousel/index.vue +18 -28
  3. package/src/components/Containers/HomepageHeaderNew/index.stories.js +5 -0
  4. package/src/components/Containers/HomepageHeaderNew/index.vue +6 -7
  5. package/src/components/Global/AppHeaderNew/index.vue +28 -19
  6. package/src/components/Global/AppHeaderNew/mobile.scss +50 -12
  7. package/src/components/Global/AppHeaderNew/styles.scss +20 -32
  8. package/src/components/Paragraphs/Directory/Asbestos/Records/SingleRecord/index.stories.js +7 -7
  9. package/src/components/Paragraphs/Directory/Asbestos/Records/SingleRecord/index.vue +21 -23
  10. package/src/components/Paragraphs/Directory/Asbestos/Records/index.vue +41 -40
  11. package/src/index.js +3 -3
  12. package/src/mock/asbestos-removalists.js +224 -196
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@worksafevictoria/wcl7.5",
3
- "version": "1.13.0-beta.1",
3
+ "version": "1.13.0-beta.11",
4
4
  "main": "src/index.js",
5
5
  "license": "MIT",
6
6
  "repository": {
package/src/components/Containers/Carousel/index.vue CHANGED
@@ -1,26 +1,29 @@
1
1
  <template>
2
2
  <div>
3
- <b-carousel
3
+ <BCarousel
4
4
  id="carousel-1"
5
5
  :class="{carouselPara: isParagraph}"
6
6
  v-model="slide"
7
7
  interval="0"
8
8
  controls
9
9
  indicators
10
+ label-indicators="Select a slide to display"
10
11
  keyboard
11
12
  :fade="true"
12
13
  background="#ababab"
14
+ img-width="100%"
15
+ img-height="auto"
13
16
  >
14
- <b-carousel-slide
17
+ <BCarouselSlide
15
18
  v-for="item in filteredCarouselItems"
16
19
  :key="item.id"
17
20
  :img-src="getImageURL(item.imageURL)"
18
21
  :img-alt="item.imageAlt"
19
22
  @click.prevent="handleClick(item.linkURL)"
20
23
  >
21
- <h4>{{ item.title }}</h4>
22
- </b-carousel-slide>
23
- </b-carousel>
24
+ <h4>{{ item.title }}</h4>
25
+ </BCarouselSlide>
26
+ </BCarousel>
24
27
  </div>
25
28
  </template>
26
29
 
@@ -113,29 +116,19 @@ methods: {
113
116
  <style>
114
117
  .carousel {
115
118
  position: relative;
116
- padding-bottom: 7rem;
117
- max-width: 540px;
119
+ margin-bottom: 10px;
118
120
  }
119
-
120
- .carousel-inner {
121
- overflow: visible;
122
- }
123
-
124
- .carousel-indicators {
125
- padding-bottom: 3rem;
126
- float: right;
127
- right: 2% !important;
128
- width: 20%;
129
- justify-content: end;
130
- margin-left: 80%;
131
- margin-right: 0;
121
+ /* Introduced changes to make image responsive */
122
+ .carousel img {
123
+ object-fit: cover;
124
+ max-height: 420px;
125
+ width: 100%;
132
126
  }
133
127
 
134
128
  .carousel-indicators button {
135
129
  width: 10px !important;
136
130
  height: 10px !important;
137
131
  border-radius: 50% !important;
138
- background-color: black !important;
139
132
  }
140
133
 
141
134
  .carousel-indicators button:focus,
@@ -145,12 +138,9 @@ methods: {
145
138
  }
146
139
 
147
140
  .carousel-caption {
148
- color: black;
149
- top: 100%;
150
- left: 0;
151
- right: 20%;
152
- text-align: left;
141
+ color: white;
153
142
  text-decoration: underline;
143
+ background-color: black;
154
144
  }
155
145
 
156
146
  .carousel-control-next,
@@ -176,8 +166,8 @@ methods: {
176
166
  .carouselPara {
177
167
  margin-left: auto;
178
168
  margin-right: auto;
179
- width: 75%;
180
- height: auto;
169
+ height: 50%;
170
+ width:50%;
181
171
  }
182
172
 
183
173
  </style>
package/src/components/Containers/HomepageHeaderNew/index.stories.js CHANGED
@@ -1,6 +1,7 @@
1
1
  import HomepageHeader from './index.vue'
2
2
  import { mockCarouselItems } from '../../../mock/carousel-items'
3
3
 
4
+ // Introduced an additional headerLink
4
5
 
5
6
  const headerLinks = [
6
7
  {
@@ -22,6 +23,10 @@ const headerLinks = [
22
23
  {
23
24
  text: 'Pay or renew your insurance',
24
25
  path: '/pay-or-renew-your-workcover-insurance-premium'
26
+ },
27
+ {
28
+ text: 'Contact Worksafe',
29
+ path: '/contact-worksafe'
25
30
  }
26
31
  ]
27
32
 
package/src/components/Containers/HomepageHeaderNew/index.vue CHANGED
@@ -14,10 +14,9 @@
14
14
  <div class="homepage-header__content-wrapper">
15
15
  <container class="homepage-header__content-wrapper__content">
16
16
  <row>
17
+ <!-- changes made to bootstrap grid breakpoints -->
17
18
  <column
18
- class="homepage-header__content-wrapper__content-col col-12 col-md-7 homepage-header__content-wrapper__content-col--split wcl-rich-text--ltr"
19
- :xs="7"
20
- :md="7"
19
+ class="homepage-header__content-wrapper__content-col col-12 col-md-7 col-lg-8 homepage-header__content-wrapper__content-col--split wcl-rich-text--ltr"
21
20
  >
22
21
  <carousel-component
23
22
  :carousel-items="slideList"
@@ -25,10 +24,8 @@
25
24
  :is-paragraph="false"
26
25
  />
27
26
  </column>
28
- <column
29
- md="4"
30
- :offset-md="1"
31
- class="homepage-header__side col-md-4 offset-md-1"
27
+ <column
28
+ class="homepage-header__side col-12 col-md-5 col-lg-4"
32
29
  >
33
30
  <div>
34
31
  <cta-button
@@ -220,4 +217,6 @@ export default {
220
217
  }
221
218
  }
222
219
  }
220
+
221
+
223
222
  </style>
package/src/components/Global/AppHeaderNew/index.vue CHANGED
@@ -5,7 +5,7 @@
5
5
  :class="'app-header' + (screen === 'mobile' ? ' ' + 'isMobile' : '')"
6
6
  >
7
7
  <!-- Top menu -->
8
- <div class="logo">
8
+ <div :class="screen === 'mobile' ? 'logoMobile' : 'logo'">
9
9
  <!-- Mobile Menu -->
10
10
  <div v-if="screen === 'mobile'" class="app-header__mobile-menu-container">
11
11
  <a class="dark" role="button" @click.prevent="showMobileMenu">
@@ -15,7 +15,7 @@
15
15
  <!-- Logo -->
16
16
  <nuxt-link class="dark" to="/">
17
17
  <img
18
- :class="screen === 'mobile' ? 'LogoImgMobile' : 'LogoImg'"
18
+ :class="screen === 'mobile' ? 'logoImgMobile' : 'logoImg'"
19
19
  :alt="
20
20
  isWorkWell
21
21
  ? 'Work Well Victoria - Logo'
@@ -26,36 +26,38 @@
26
26
  </nuxt-link>
27
27
  <span :class="screen === 'mobile' ? 'logo__nav_mobile' : 'logo__nav'">
28
28
  <!-- Roles added for accessibility -->
29
- <table role="presentation" >
29
+ <table role="presentation" style="margin-right: 0;">
30
30
  <tbody role="presentation">
31
31
  <tr role="presentation">
32
- <td :class="screen === 'mobile' ? 'td_mobile' : ''">
32
+ <td :class="screen === 'mobile' ? 'td_mobile mobile-link' : ''">
33
33
  <!-- Language link -->
34
+
34
35
  <nuxt-link
35
- :class="screen === 'mobile' ? 'mobile-link' : ''"
36
36
  to="/languages"
37
37
  @click.native="fireAnalytics('Choose your language', '/languages')"
38
38
  title="Language"
39
39
  >
40
40
  <span v-if="screen !== 'mobile'">Choose your language </span>
41
- <img alt="Language Icon" width="15px" height="15px" :src=LanguageIcon />
41
+ <img :class="screen === 'mobile' ? 'imgMobile' : ''" alt="Language Icon" width="15px" height="15px" :src=LanguageIcon />
42
42
  </nuxt-link>
43
+
43
44
  </td>
44
- <td :class="screen === 'mobile' ? 'td_mobile' : ''">
45
+ <td :class="screen === 'mobile' ? 'td_mobile mobile-link' : ''">
45
46
  <!-- Contrast link -->
46
- <a href="javascript:void(0)" :class="screen === 'mobile' ? 'mobile-link' : ''" @click="show = !show" @keyup.esc="show = !show" title="Contrast" ref="selectContrast">
47
- <span v-if="screen !== 'mobile'">Adjust contrast</span> <img alt="Contrast Icon" width="15px" height="15px" :src=ContrastIcon />
47
+ <a href="javascript:void(0)" @click="show = !show" @keyup.esc="show = !show" title="Contrast" ref="selectContrast">
48
+ <span v-if="screen !== 'mobile'">Adjust contrast</span> <img :class="screen === 'mobile' ? 'imgMobile' : ''" alt="Contrast Icon" width="15px" height="15px" :src=ContrastIcon />
48
49
  </a>
49
50
  <div
50
51
  ref="contrastChoices"
51
- class="flex-container"
52
+ :class="screen === 'mobile' ? 'flex-container_contrast_mobile' : 'flex-container_contrast'"
52
53
  v-if="show"
53
54
  >
54
- <div class="flex-item contrast_slide--box-list">
55
- <div v-for="list in lists" :key="list.value">
56
- <label :class="{'last-radio': list.label==='Greyscale'}">
55
+ <div class="flex-item_contrast contrast_slide--box-list">
56
+ <div v-for="list in lists" :key="list.value" >
57
+ <label :for="list.id" :class="{'last-radio': list.label==='Greyscale'}">
57
58
  <input
58
59
  type="radio"
60
+ :id="list.id"
59
61
  :name="list.name"
60
62
  :value="list.value"
61
63
  :checked="list.value === selectedValue"
@@ -74,7 +76,7 @@
74
76
  class="cta-button cta-button--text-only cta-button--slim"
75
77
  to="/search"
76
78
  title="Search"
77
- ><span v-if="screen !== 'mobile'">Search &nbsp;</span> <img alt="Search Icon" width="15px" height="15px" :src=NavSearchIcon />
79
+ ><span v-if="screen !== 'mobile'">Search &nbsp;</span><img alt="Search Icon" style="margin-top: 2px;" width="15px" height="15px" :src=NavSearchIcon />
78
80
  </nuxt-link>
79
81
  </td>
80
82
  <td :class="screen === 'mobile' ? 'td_mobile-last' : ''">
@@ -411,18 +413,25 @@ export default {
411
413
  NavSearchIcon,
412
414
  lists: [
413
415
  {
416
+ id: 'contrast1',
414
417
  name: 'contrast',
415
418
  value: 'default',
416
- label: 'Light contrast (default)'
419
+ label: 'Light contrast (default)',
420
+ labelmobile: 'Light'
417
421
  },
418
422
  {
423
+ id: 'contrast2',
419
424
  name: 'contrast',
420
425
  value: 'high_contrast',
421
- label: 'Increased contrast'
426
+ label: 'Increased contrast',
427
+ labelmobile: 'Increased'
422
428
  },
423
- { name: 'contrast',
424
- value: 'grayscale',
425
- label: 'Greyscale'
429
+ {
430
+ id: 'contrast3',
431
+ name: 'contrast',
432
+ value: 'grayscale',
433
+ label: 'Greyscale',
434
+ labelmobile: 'Greyscale'
426
435
  }
427
436
  ],
428
437
  selectedValue: null
package/src/components/Global/AppHeaderNew/mobile.scss CHANGED
@@ -3,6 +3,7 @@
3
3
  .app-header {
4
4
  &.isMobile {
5
5
  padding: 0;
6
+ width: 100vw;
6
7
 
7
8
  .app-header {
8
9
  &__wrap {
@@ -20,6 +21,8 @@
20
21
 
21
22
  ul {
22
23
  float: none;
24
+ padding-left: 15px;
25
+ padding-right: 10px;
23
26
 
24
27
  li {
25
28
  height: 62px;
@@ -71,6 +74,8 @@
71
74
  display: table-cell;
72
75
  vertical-align: middle;
73
76
  text-align: left;
77
+ margin-left: 0px;
78
+ margin-right: 10px;
74
79
 
75
80
  svg {
76
81
  filter: invert(100%) sepia(5%) saturate(49%) hue-rotate(165deg)
@@ -177,6 +182,7 @@
177
182
  margin-bottom: 5px;
178
183
  padding: 0;
179
184
  top: 0;
185
+ margin-left: 10px;
180
186
 
181
187
  span {
182
188
  color: $app-header-active;
@@ -267,38 +273,70 @@
267
273
  top: 10px !important;
268
274
  }
269
275
 
270
- .LogoImgMobile {
276
+ .logoMobile {
277
+ height: 85px;
278
+ padding: 15px 0%;
279
+ display: flex;
280
+ align-items: center;
281
+ margin-right: 0px;
282
+ margin-left: 10px;
283
+ background-color: white;
284
+ width: 100%;
285
+ }
286
+
287
+ .logoImgMobile {
271
288
  height: 40px;
272
289
  width: auto;
273
290
  }
274
291
 
275
- .logo__nav-mobile {
276
- display:inline-block;
277
- margin-left: 10px;
278
- margin-right: 0px;
279
- width: 100%;
292
+ .logo__nav_mobile {
293
+ display:flex;
294
+ margin-left: 15px;
295
+ margin-right: 25px;
296
+ width: 60% !important;
280
297
  overflow-y:auto;
298
+ justify-content: flex-end;
299
+
300
+ table {
301
+ border-collapse: separate;
302
+ border-spacing: 5px;
303
+ }
304
+
305
+ }
306
+
307
+ .imgMobile {
308
+ display: block;
309
+ margin-left: auto;
310
+ margin-right: auto;
281
311
  }
282
312
 
283
313
  .td_mobile {
284
- padding: 0px 5px !important;
285
314
  height: 35px;
286
315
  width: 35px;
287
316
  }
288
317
 
289
318
  .td_mobile-last {
290
- padding: 0px 0px 0px 5px !important;
319
+ padding: 0px !important;
291
320
  }
292
321
 
293
322
  .mobile-link {
294
- height: 35px;
295
- width: 35px;
323
+ width: 40px !important;
324
+ height: 40px !important;
296
325
  background-color: #f2f2f2;
297
326
  border: 1px solid #f2f2f2;
298
- border-radius: 5px;
327
+ border-radius: 8px;
328
+
329
+ &:focus, &:hover {
330
+ border: 1px solid #BABABA;
331
+ }
299
332
  }
300
333
 
301
334
  .app-header__wrap_mobile {
302
335
  background: none;
303
336
  height: 0px;
304
- }
337
+ }
338
+
339
+ .flex-container_contrast_mobile {
340
+ margin-left: -167px;
341
+ }
342
+
package/src/components/Global/AppHeaderNew/styles.scss CHANGED
@@ -4,8 +4,8 @@
4
4
  color: $app-menu-white;
5
5
  z-index: 27;
6
6
  position: relative;
7
- padding: 0px 10px;
8
- width: 100%;
7
+ padding: 0px;
8
+ width: 100vw;
9
9
  font-size: 14px;
10
10
 
11
11
  &__wrap {
@@ -18,6 +18,9 @@
18
18
  padding: 0px 15px;
19
19
  display: table;
20
20
  width: 100%;
21
+ border-bottom-style: solid;
22
+ border-bottom-color: white;
23
+ border-bottom-width: 2px;
21
24
 
22
25
  > nav {
23
26
  width: 100%;
@@ -43,7 +46,7 @@
43
46
  .isActiveChild {
44
47
  > a {
45
48
  background: $app-header-active;
46
- color: $app-header-text-colour;
49
+ color: white;
47
50
  border-bottom: 1px solid transparent;
48
51
  }
49
52
  }
@@ -378,16 +381,19 @@
378
381
 
379
382
  .logo {
380
383
  height: 85px;
381
- padding: 15px 15px 15px 0px;
384
+ padding: 15px 0%;
382
385
  width: 100%;
383
386
  display: flex;
384
387
  align-items: center;
385
- margin-right: 0%;
388
+ margin-right: 50px;
389
+ margin-left: -10px;
386
390
  background-color: white;
391
+ width: 100vw;
387
392
 
388
393
  &__nav {
389
394
  display:inline-block;
390
395
  margin-left: 15px;
396
+ margin-right: 10px;
391
397
  color: #000;
392
398
  width: 100%;
393
399
  text-align: right;
@@ -421,9 +427,10 @@
421
427
  }
422
428
  }
423
429
 
424
- .LogoImg {
430
+ .logoImg {
425
431
  height: 55px;
426
432
  width: auto;
433
+ margin-left: 20px;
427
434
  }
428
435
 
429
436
  .semi-circle {
@@ -470,11 +477,7 @@
470
477
  }
471
478
  }
472
479
  }
473
- @mixin opened-slide {
474
- left: 100%;
475
- -webkit-transform: translateX(-100%);
476
- transform: translateX(-100%);
477
- }
480
+
478
481
  .contrast_slide {
479
482
  &_container {
480
483
  background: white;
@@ -490,21 +493,6 @@
490
493
  margin: 0;
491
494
  right: 0;
492
495
  position: absolute;
493
-
494
- // &.closed {}
495
- &.opened {
496
- > .contrast_slide_hoverbar {
497
- @include opened-slide;
498
- }
499
- }
500
-
501
- @media (min-width: 768px) {
502
- &:hover {
503
- > .contrast_slide_hoverbar {
504
- @include opened-slide;
505
- }
506
- }
507
- }
508
496
  }
509
497
 
510
498
  &_hoverbar {
@@ -604,14 +592,13 @@
604
592
  padding: 10px 0;
605
593
 
606
594
  input[type='radio'] {
607
- border: 2px solid #bebebe;
595
+ border: 3px solid #bebebe;
608
596
  border-radius: 50%;
609
- box-shadow: 0 0 0px 0px #bebebe inset;
610
- height: 24px;
597
+ height: 25px;
611
598
  outline: none;
612
599
  vertical-align: middle;
613
600
  margin-right: 5px;
614
- width: 24px;
601
+ width: 25px;
615
602
  appearance: none;
616
603
 
617
604
  &:before {
@@ -633,11 +620,11 @@
633
620
  }
634
621
  }
635
622
 
636
- .flex-container {
623
+ .flex-container_contrast {
637
624
  margin-left: -5px;
638
625
  }
639
626
 
640
- .flex-item {
627
+ .flex-item_contrast {
641
628
  border: 1px solid;
642
629
  border-color: #BABABA;
643
630
  padding: 10px;
@@ -647,5 +634,6 @@
647
634
  input[type="radio"] {
648
635
  accent-color: black;
649
636
  margin-right: 5px;
637
+ vertical-align: middle;
650
638
  }
651
639
  }
package/src/components/Paragraphs/Directory/Asbestos/Records/SingleRecord/index.stories.js CHANGED
@@ -3,17 +3,17 @@ import arRecord from './index.vue'
3
3
  const arData =
4
4
  {
5
5
  title: 'Ventia Utility Services Pty Limited',
6
- fullAddress: 'MITCHAM VIC 3132',
7
- workPhone: '0438531164',
6
+ fullAddress: 'MITCHAM 3132',
7
+ // workPhone: '0438531164',
8
8
  mobilePhone: '0438531164',
9
9
  email: 'daniel.dehaan@ventia.com',
10
10
  website: 'http://www.ventia.com.au',
11
11
  contact1: 'Daniel DeHaan',
12
- phone1: '0438531164',
13
- email1: 'daniel.dehaan@ventia.com',
14
- mobile1: '0438531164',
15
- serviceCategory: 'Class B - Restricted - Asbestos Removalists',
16
- services: 'Bituminous coal tar coatings,Non-friable Asbestos Cement Water Pipes and Associated Fittings ONLY,Non-friable Asbetos Containing Bituminous Coating on Mild Steel Pipes',
12
+ // phone1: '0438531164',
13
+ // email1: 'daniel.dehaan@ventia.com',
14
+ // mobile1: '0438531164',
15
+ serviceCategory: 'Class B - Non-friable',
16
+ // services: 'Bituminous coal tar coatings,Non-friable Asbestos Cement Water Pipes and Associated Fittings ONLY,Non-friable Asbetos Containing Bituminous Coating on Mild Steel Pipes',
17
17
  }
18
18
 
19
19
 
package/src/components/Paragraphs/Directory/Asbestos/Records/SingleRecord/index.vue CHANGED
@@ -14,26 +14,23 @@
14
14
  {{ item.title }}
15
15
  </a>
16
16
  </column>
17
- <column md="2" sm="12" class="address">
17
+ <column md="3" sm="12" class="address">
18
18
  <div class="label">Location</div>
19
19
  <a v-if="item.fullAddress" target="_blank" :href="gMapLink"
20
20
  ><span class="sr-only visually-hidden">Address</span>
21
21
  {{ item.fullAddress }}
22
22
  </a>
23
23
  </column>
24
- <column md="2" sm="12" class="coldata longstring">
24
+ <column md="3" sm="12" class="coldata longstring">
25
25
  <div class="label">Email</div>
26
26
  <a v-if="item.email" target="_blank" :href="`mailto:${item.email}`"
27
27
  ><span class="sr-only visually-hidden">Email address</span>
28
28
  {{ item.email }}
29
29
  </a>
30
30
  </column>
31
- <column md="3" sm="12" class="coldata longstring">
32
- <div class="label">Website</div>
33
- <a v-if="item.website" target="_blank" :href="`${item.website}`"
34
- ><span class="sr-only visually-hidden">Website address</span>
35
- {{ item.website }}
36
- </a>
31
+ <column md="2" sm="12" class="coldata">
32
+ <div class="label">Contact</div>
33
+ {{ item.contact1 }}
37
34
  </column>
38
35
  <column md="2" sm="12" class="coldata">
39
36
  <div class="label">Phone</div>
@@ -61,33 +58,34 @@
61
58
  <div style="padding-top: 20px">
62
59
  <hr />
63
60
  </div>
64
- <!-- Contacts, if any -->
65
- <div v-if="validContacts">
61
+ <!-- Website, if any -->
62
+
63
+ <div v-if="item.website">
66
64
  <row>
67
65
  <column>
68
- <h4>Contact Information</h4>
66
+ <h4>Website</h4>
69
67
  </column>
70
68
  </row>
71
- <row v-if="item.contact1 !== ''">
72
- <column sm="2" class="label"> Contact </column>
73
- <column sm="4" class="dir-additional-records">
74
- {{ item.contact1 }}
75
- </column>
69
+ <row v-if="item.website !== ''">
70
+ <a v-if="item.website" target="_blank" :href="`${item.website}`"
71
+ ><span class="sr-only visually-hidden">Website address</span>
72
+ {{ item.website }}
73
+ </a>
76
74
  </row>
77
- <row v-if="item.phone1 !== ''">
75
+ <!-- <row v-if="item.phone1 !== ''">
78
76
  <column sm="2" class="label"> Phone </column>
79
77
  <column sm="4" class="dir-additional-records">
80
78
  {{ item.phone1 }}
81
79
  </column>
82
- </row>
83
- <row v-if="item.mobile1 !== ''">
80
+ </row> -->
81
+ <row v-if="item.mobile1">
84
82
  <column sm="2" class="label"> Mobile </column>
85
83
  <column sm="4" class="dir-additional-records">
86
84
  {{ item.mobile1 }}
87
85
  </column>
88
86
  </row>
89
- <row v-if="item.email1 !== ''">
90
- <column sm="2" class="label"> Email </column>
87
+ <row v-if="item.email1">
88
+ <column sm="2" class="label" > Email </column>
91
89
  <column sm="4" class="dir-additional-records">
92
90
  {{ item.email1 }}
93
91
  </column>
@@ -99,7 +97,7 @@
99
97
  <h4>{{ item.serviceCategory }}</h4>
100
98
  </column>
101
99
  </row>
102
- <row class="dir-additional-records">
100
+ <!-- <row class="dir-additional-records">
103
101
  <column>
104
102
  <ul>
105
103
  <li v-for="serv in item.services.split(',')" :key="serv.id">
@@ -107,7 +105,7 @@
107
105
  </li>
108
106
  </ul>
109
107
  </column>
110
- </row>
108
+ </row> -->
111
109
  </div>
112
110
  </div>
113
111
  </container>
package/src/components/Paragraphs/Directory/Asbestos/Records/index.vue CHANGED
@@ -1,7 +1,7 @@
1
1
  <template>
2
2
  <section-group class="paragraph--directory dir-filters">
3
3
  <!-- Filters -->
4
- <row style="column-gap: 16px">
4
+ <row style="column-gap: 10px">
5
5
  <!-- Keyword Filters -->
6
6
  <column xxl="2" xl="3" md="4" sm="6">
7
7
  <label class="col-form-label visually-hidden" for="keyword-search">
@@ -44,21 +44,21 @@
44
44
  <option class="placeholder" value="" disabled hidden selected>
45
45
  Service class
46
46
  </option>
47
- <option value="Class A Asbestos Removalists">
48
- Class A Asbestos Removalists
47
+ <option value="Class A - Friable and non-friable">
48
+ Class A - Friable and non-friable
49
49
  </option>
50
- <option value="Class B Asbestos Removalists">
51
- Class B Asbestos Removalists
50
+ <option value="Class B - Non-friable">
51
+ Class B - Non-friable
52
52
  </option>
53
- <option value="Class A - Restricted - Asbestos Removalists">
53
+ <!-- <option value="Class A - Restricted - Asbestos Removalists">
54
54
  Class A - Restricted - Asbestos Removalists
55
55
  </option>
56
56
  <option value="Class B - Restricted - Asbestos Removalists">
57
57
  Class B - Restricted - Asbestos Removalists
58
- </option>
58
+ </option> -->
59
59
  </select>
60
60
  </column>
61
- <column xxl="2" xl="3" md="4" sm="6">
61
+ <!-- <column xxl="2" xl="3" md="4" sm="6">
62
62
  <label class="col-form-label visually-hidden" for="search-services">
63
63
  Search by suburb (typed suburb automatically filters below results)
64
64
  </label>
@@ -70,7 +70,7 @@
70
70
  aria-label="Search by suburb (typed suburb automatically filters below results)"
71
71
  class="search"
72
72
  />
73
- </column>
73
+ </column> -->
74
74
  <column md="2">
75
75
  <filter-button
76
76
  v-if="!hideReset"
@@ -120,7 +120,7 @@ export default {
120
120
  searchRem: '',
121
121
  searchSub: '',
122
122
  searchClass: '',
123
- searchServices: '',
123
+ // searchServices: '',
124
124
  filteredItems: null,
125
125
  perPage: 10,
126
126
  page: 0,
@@ -159,21 +159,21 @@ export default {
159
159
  .includes(this.searchClass.toLowerCase()),
160
160
  )
161
161
  }
162
- if (this.searchServices.length) {
163
- this.hideReset = false
164
- results = results.filter((item) =>
165
- item.services
166
- .toLowerCase()
167
- .includes(this.searchServices.toLowerCase()),
168
- )
169
- }
162
+ // if (this.searchServices.length) {
163
+ // this.hideReset = false
164
+ // results = results.filter((item) =>
165
+ // item.services
166
+ // .toLowerCase()
167
+ // .includes(this.searchServices.toLowerCase()),
168
+ // )
169
+ // }
170
170
  this.filteredItems = results
171
171
 
172
172
  if (
173
173
  this.searchRem.length ||
174
174
  this.searchSub.length ||
175
- this.searchClass.length ||
176
- this.searchServices.length
175
+ this.searchClass.length
176
+ // || this.searchServices.length
177
177
  ) {
178
178
  this.pageChanged(1)
179
179
  }
@@ -184,7 +184,7 @@ export default {
184
184
  flatRecords() {
185
185
  let flatRecords = []
186
186
  const sortedItems = this.items.sort((a, b) =>
187
- a.ResourceName.localeCompare(b.ResourceName, 'en', {
187
+ a.Account.localeCompare(b.Account, 'en', {
188
188
  sensitivity: 'base',
189
189
  }),
190
190
  )
@@ -192,21 +192,22 @@ export default {
192
192
  sortedItems.forEach((record) => {
193
193
  flatRecords.push({
194
194
  type: 'ar',
195
- title: record.ResourceName,
196
- fullAddress: record.AddressLine2,
197
- workPhone: record.Phone,
198
- mobilePhone: record.CompanyMobile,
199
- email: record.CompanyEmailDisp,
200
- website: this.formatWebsite(record.CompanyWebURLDisp),
201
- contact1: this.returnContact(
202
- record.ContactFirstName,
203
- record.ContactLastName,
204
- ),
205
- email1: record.ContactEmail,
206
- phone1: record.ContactPhoneDisp,
207
- mobile1: record.ContactMobileDisp,
208
- services: record.ServicesAll.replace(/,$/, ''),
209
- serviceCategory: record.ServiceAll,
195
+ title: record.Account,
196
+ fullAddress: record.Regbusinessaddresssuburb + ' ' + record.Regbusinessaddresspostcode,
197
+ // workPhone: record.Phone,
198
+ mobilePhone: record.PrimaryContactMobile,
199
+ email: record.PrimaryContactEmail,
200
+ website: record.Website ? this.formatWebsite(record.Website) : '',
201
+ // contact1: this.returnContact(
202
+ // record.ContactFirstName,
203
+ // record.ContactLastName,
204
+ // ),
205
+ contact1: record.PrimaryContactAccountName,
206
+ // email1: record.PrimaryContactEmail,
207
+ // phone1: record.ContactPhoneDisp,
208
+ // mobile1: record.PrimaryContactMobile,
209
+ // services: record.ServicesAll.replace(/,$/, ''),
210
+ serviceCategory: record.AsbestosClass,
210
211
  })
211
212
  })
212
213
  return flatRecords
@@ -245,10 +246,10 @@ export default {
245
246
  return returnUrl
246
247
  },
247
248
 
248
- returnContact(firstN, lastN) {
249
- let retContact = [firstN, lastN].filter(Boolean).join(' ')
250
- return retContact
251
- },
249
+ // returnContact(firstN, lastN) {
250
+ // let retContact = [firstN, lastN].filter(Boolean).join(' ')
251
+ // return retContact
252
+ // },
252
253
 
253
254
  chunkify(arr, n) {
254
255
  if (arr) {
package/src/index.js CHANGED
@@ -1,13 +1,13 @@
1
- // Global Components
1
+ // Global Componentsn - replace HomePageheader with HomepageHeaderNew to introduce new header
2
2
  import Container from './components/Containers/Container/index.vue'
3
3
  import Row from './components/Containers/Row/index.vue'
4
4
  import Column from './components/Containers/Column/index.vue'
5
- import HomepageHeader from './components/Containers/HomepageHeader/index.vue'
5
+ import HomepageHeader from './components/Containers/HomepageHeaderNew/index.vue'
6
6
  import Subheader from './components/Containers/Subheader/index.vue'
7
7
  import SectionGroup from './components/Containers/SectionGroup/index.vue'
8
8
  import CarouselComponent from './components/Containers/Carousel/index.vue'
9
9
 
10
- import AppHeader from './components/Global/AppHeader/index.vue'
10
+ import AppHeader from './components/Global/AppHeaderNew/index.vue'
11
11
  import AppFooter from './components/Global/AppFooter/index.vue'
12
12
  import HeroHeader from './components/Global/HeroHeader/index.vue'
13
13
  import SocialShare from './components/Global/SocialShare/index.vue'
package/src/mock/asbestos-removalists.js CHANGED
@@ -1,226 +1,254 @@
1
1
  export const arData = [
2
2
  {
3
- ResourceName: 'A.D.S. Asbestos Removal Pty Ltd',
4
- CompanyAddress: '62 Webber Parade',
5
- AddressLine2: 'KEILOR EAST VIC 3033',
6
- Phone: '0404073745',
7
- CompanyMobile: '0404 073 745',
8
- CompanyEmailDisp: 'ads.asbestos@gmail.com',
9
- CompanyWebURLDisp: 'adsasbestosremoval.com.au',
10
- ContactFirstName: 'Ivan',
11
- ContactLastName: 'Silva',
12
- ContactPhoneDisp: '0404073745',
13
- ContactEmail: 'ads.asbestos@gmail.com',
14
- ContactMobileDisp: '1300 064 277',
15
- ServiceAll: 'Class A - Restricted - Asbestos Removalists',
16
- ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
3
+ Account: 'A.D.S. Asbestos Removal Pty Ltd',
4
+ // CompanyAddress: '62 Webber Parade',
5
+ Regbusinessaddresssuburb: 'KEILOR EAST',
6
+ Regbusinessaddresspostcode: '3033',
7
+ // Phone: '0404073745',
8
+ // CompanyMobile: '0404 073 745',
9
+ // CompanyEmailDisp: 'ads.asbestos@gmail.com',
10
+ Website: 'adsasbestosremoval.com.au',
11
+ // ContactFirstName: 'Ivan',
12
+ // ContactLastName: 'Silva',
13
+ PrimaryContactAccountName: 'Ivan Silva',
14
+ // ContactPhoneDisp: '0404073745',
15
+ PrimaryPrimaryContactEmail: 'ads.asbestos@gmail.com',
16
+ PrimaryContactMobile: '1300 064 277',
17
+ AsbestosClass: 'Class A - Friable and non-friable',
18
+ // ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
17
19
  },
18
20
  {
19
- ResourceName: 'AAA ASBESTOS SOLUTIONS PTY LTD',
20
- CompanyAddress: '9 Ewens Court',
21
- AddressLine2: 'MOUNT GAMBIER VIC 5290',
22
- Phone: '0418 854 443',
23
- CompanyMobile: '0418 854 443',
24
- CompanyEmailDisp: 'nieto4@bigpond.net.au',
25
- CompanyWebURLDisp: '',
26
- ContactFirstName: 'ERIC',
27
- ContactLastName: 'NIETO',
28
- ContactPhoneDisp: '0418 854 443',
29
- ContactEmail: 'nieto4@bigpond.net.au',
30
- ContactMobileDisp: '0418 854 443',
31
- ServiceAll: 'Class B Asbestos Removalists',
32
- ServicesAll: 'All types of non-friable asbestos containing material (eg. cement sheeting or vinyl tiles)',
21
+ Account: 'AAA ASBESTOS SOLUTIONS PTY LTD',
22
+ // CompanyAddress: '9 Ewens Court',
23
+ Regbusinessaddresssuburb: 'MOUNT GAMBIER',
24
+ Regbusinessaddresspostcode: '5290',
25
+ // Phone: '0418 854 443',
26
+ // CompanyMobile: '0418 854 443',
27
+ // CompanyEmailDisp: 'nieto4@bigpond.net.au',
28
+ Website: '',
29
+ // ContactFirstName: 'ERIC',
30
+ // ContactLastName: 'NIETO',
31
+ PrimaryContactAccountName: 'ERIC NIETO',
32
+ // ContactPhoneDisp: '0418 854 443',
33
+ PrimaryContactEmail: 'nieto4@bigpond.net.au',
34
+ PrimaryContactMobile: '0418 854 443',
35
+ AsbestosClass: 'Class B - Non-friable',
36
+ // ServicesAll: 'All types of non-friable asbestos containing material (eg. cement sheeting or vinyl tiles)',
33
37
  },
34
38
  {
35
- ResourceName: 'Aaron John Field',
36
- CompanyAddress: '44 Townsent Street',
37
- AddressLine2: 'Howlong NSW 2643',
38
- Phone: '',
39
- CompanyMobile: '0408474707',
40
- CompanyEmailDisp: 'azz_317@homail.com',
41
- CompanyWebURLDisp: '',
42
- ContactFirstName: 'Aaron',
43
- ContactLastName: 'Field',
44
- ContactPhoneDisp: '',
45
- ContactEmail: 'azz_317@homail.com',
46
- ContactMobileDisp: '0408474707',
47
- ServiceAll: 'Class B Asbestos Removalists',
48
- ServicesAll: 'All types of non-friable asbestos containing material (eg. cement sheeting or vinyl tiles),Telecommunication Asbestos cement pits and pipes',
39
+ Account: 'Aaron John Field',
40
+ // CompanyAddress: '44 Townsent Street',
41
+ Regbusinessaddresssuburb: 'Howlong',
42
+ Regbusinessaddresspostcode: '2643',
43
+ // Phone: '',
44
+ // CompanyMobile: '0408474707',
45
+ // CompanyEmailDisp: 'azz_317@homail.com',
46
+ Website: '',
47
+ // ContactFirstName: 'Aaron',
48
+ // ContactLastName: 'Field',
49
+ PrimaryContactAccountName: 'Aaron Field',
50
+ // ContactPhoneDisp: '',
51
+ PrimaryContactEmail: 'azz_317@homail.com',
52
+ PrimaryContactMobile: '0408474707',
53
+ AsbestosClass: 'Class B - Non-friable',
54
+ // ServicesAll: 'All types of non-friable asbestos containing material (eg. cement sheeting or vinyl tiles),Telecommunication Asbestos cement pits and pipes',
49
55
  },
50
56
  {
51
- ResourceName: 'Al Baarini Ahmad',
52
- CompanyAddress: '13 Rudkin Court',
53
- AddressLine2: 'Hoppers Crossing VIC 3029',
54
- Phone: '0421 280 732',
55
- CompanyMobile: '0401 016 565',
56
- CompanyEmailDisp: 'CITYWIDEDEMOLITION@HOTMAIL.COM',
57
- CompanyWebURLDisp: 'www.citywidedemolition.com.au',
58
- ContactFirstName: 'Eman',
59
- ContactLastName: 'Al Baarini',
60
- ContactPhoneDisp: '0421 280 732',
61
- ContactEmail: 'CITYWIDEDEMOLITION@HOTMAIL.COM',
62
- ContactMobileDisp: '0421 280 732',
63
- ServiceAll: 'Class B Asbestos Removalists',
64
- ServicesAll: 'All types of non-friable asbestos containing material (eg. cement sheeting or vinyl tiles)',
57
+ Account: 'Al Baarini Ahmad',
58
+ // CompanyAddress: '13 Rudkin Court',
59
+ Regbusinessaddresssuburb: 'Hoppers Crossing',
60
+ Regbusinessaddresspostcode: '3029',
61
+ // Phone: '0421 280 732',
62
+ // CompanyMobile: '0401 016 565',
63
+ // CompanyEmailDisp: 'CITYWIDEDEMOLITION@HOTMAIL.COM',
64
+ Website: 'www.citywidedemolition.com.au',
65
+ // ContactFirstName: 'Eman',
66
+ // ContactLastName: 'Al Baarini',
67
+ PrimaryContactAccountName: 'Eman Al Baarini',
68
+ // ContactPhoneDisp: '0421 280 732',
69
+ PrimaryContactEmail: 'CITYWIDEDEMOLITION@HOTMAIL.COM',
70
+ PrimaryContactMobile: '0421 280 732',
71
+ AsbestosClass: 'Class B - Non-friable',
72
+ // ServicesAll: 'All types of non-friable asbestos containing material (eg. cement sheeting or vinyl tiles)',
65
73
  },
66
74
  {
67
- ResourceName: 'Ashcorp Holdings Pty Ltd',
68
- CompanyAddress: '17 Rohs Road',
69
- AddressLine2: 'EAST BENDIGO VIC 3550',
70
- Phone: '(03) 5444 3261',
71
- CompanyMobile: '0409 012 780',
72
- CompanyEmailDisp: 'admin@ashworthdemolition.com.au',
73
- CompanyWebURLDisp: '',
74
- ContactFirstName: 'Dean',
75
- ContactLastName: 'Ashworth',
76
- ContactPhoneDisp: '(03) 5444 3261',
77
- ContactEmail: 'info@ashworthdemolition.com.au',
78
- ContactMobileDisp: '0409012780',
79
- ServiceAll: 'Class A - Restricted - Asbestos Removalists',
80
- ServicesAll: 'removal of all types of non-friable asbestos containing material,removal of asbestos containing gaskets and ropes,removal of friable asbestos containing material from soil that does not require an enclosure with negative air unit(s),removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire,The Licence is restricted to removal of asbestos containing material that does not require an enclosure with a negative air unit(s).'
75
+ Account: 'Ashcorp Holdings Pty Ltd',
76
+ // CompanyAddress: '17 Rohs Road',
77
+ Regbusinessaddresssuburb: 'EAST BENDIGO',
78
+ Regbusinessaddresspostcode: '3550',
79
+ // Phone: '(03) 5444 3261',
80
+ // CompanyMobile: '0409 012 780',
81
+ // CompanyEmailDisp: 'admin@ashworthdemolition.com.au',
82
+ Website: '',
83
+ // ContactFirstName: 'Dean',
84
+ // ContactLastName: 'Ashworth',
85
+ PrimaryContactAccountName: 'Dean Ashworth',
86
+ // ContactPhoneDisp: '(03) 5444 3261',
87
+ PrimaryContactEmail: 'info@ashworthdemolition.com.au',
88
+ PrimaryContactMobile: '0409012780',
89
+ AsbestosClass: 'Class A - Friable and non-friable',
90
+ // ServicesAll: 'removal of all types of non-friable asbestos containing material,removal of asbestos containing gaskets and ropes,removal of friable asbestos containing material from soil that does not require an enclosure with negative air unit(s),removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire,The Licence is restricted to removal of asbestos containing material that does not require an enclosure with a negative air unit(s).'
81
91
  },
82
92
  {
83
- ResourceName: 'Ventia Utility Services Pty Limited',
84
- CompanyAddress: 'Ventia - Cardinia Building, 25 Lucknow Street',
85
- AddressLine2: 'MITCHAM VIC 3132',
86
- Phone: '0438531164',
87
- CompanyMobile: '',
88
- CompanyEmailDisp: 'daniel.dehaan@ventia.com',
89
- CompanyWebURLDisp: 'www.ventia.com.au',
90
- ContactFirstName: 'Daniel',
91
- ContactLastName: 'DeHaan',
92
- ContactPhoneDisp: '0438531164',
93
- ContactEmail: 'daniel.dehaan@ventia.com',
94
- ContactMobileDisp: '0438531164',
95
- ServiceAll: 'Class B - Restricted - Asbestos Removalists',
96
- ServicesAll: 'Bituminous coal tar coatings,Non-friable Asbestos Cement Water Pipes and Associated Fittings ONLY,Non-friable Asbetos Containing Bituminous Coating on Mild Steel Pipes',
93
+ Account: 'Ventia Utility Services Pty Limited',
94
+ // CompanyAddress: 'Ventia - Cardinia Building, 25 Lucknow Street',
95
+ Regbusinessaddresssuburb: 'MITCHAM',
96
+ Regbusinessaddresspostcode: '3132',
97
+ // Phone: '0438531164',
98
+ // CompanyMobile: '',
99
+ // CompanyEmailDisp: 'daniel.dehaan@ventia.com',
100
+ Website: 'www.ventia.com.au',
101
+ // ContactFirstName: 'Daniel',
102
+ // ContactLastName: 'DeHaan',
103
+ PrimaryContactAccountName: 'Daniel DeHaan',
104
+ // ContactPhoneDisp: '0438531164',
105
+ PrimaryContactEmail: 'daniel.dehaan@ventia.com',
106
+ PrimaryContactMobile: '0438531164',
107
+ AsbestosClass: 'Class B - Non-friable',
108
+ // ServicesAll: 'Bituminous coal tar coatings,Non-friable Asbestos Cement Water Pipes and Associated Fittings ONLY,Non-friable Asbetos Containing Bituminous Coating on Mild Steel Pipes',
97
109
  },
98
110
  {
99
- ResourceName: 'ONE A.D.S Asbestos Removal Pty Ltd',
100
- CompanyAddress: '62 Webber Parade',
101
- AddressLine2: 'KEILOR EAST VIC 3033',
102
- Phone: '0404073745',
103
- CompanyMobile: '0404 073 745',
104
- CompanyEmailDisp: 'ads.asbestos@gmail.com',
105
- CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
106
- ContactFirstName: '',
107
- ContactLastName: '',
108
- ContactPhoneDisp: '0404073745',
109
- ContactEmail: 'ads.asbestos@gmail.com',
110
- ContactMobileDisp: '1300 064 277',
111
- ServiceAll: 'Class A - Restricted - Asbestos Removalists',
112
- ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
111
+ Account: 'ONE A.D.S Asbestos Removal Pty Ltd',
112
+ // CompanyAddress: '62 Webber Parade',
113
+ Regbusinessaddresssuburb: 'KEILOR EAST',
114
+ Regbusinessaddresspostcode: '3033',
115
+ // Phone: '0404073745',
116
+ // CompanyMobile: '0404 073 745',
117
+ // CompanyEmailDisp: 'ads.asbestos@gmail.com',
118
+ Website: 'http://www.adsasbestosremoval.com.au',
119
+ // ContactFirstName: '',
120
+ // ContactLastName: '',
121
+ PrimaryContactAccountName: '',
122
+ // ContactPhoneDisp: '0404073745',
123
+ PrimaryContactEmail: 'ads.asbestos@gmail.com',
124
+ PrimaryContactMobile: '1300 064 277',
125
+ AsbestosClass: 'Class A - Friable and non-friable',
126
+ // ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
113
127
  },
114
128
  {
115
- ResourceName: 'TWO A.D.S Asbestos Removal Pty Ltd',
116
- CompanyAddress: '62 Webber Parade',
117
- AddressLine2: 'KEILOR EAST VIC 3033',
118
- Phone: '0404073745',
119
- CompanyMobile: '0404 073 745',
120
- CompanyEmailDisp: 'ads.asbestos@gmail.com',
121
- CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
122
- ContactFirstName: 'Ivan',
123
- ContactLastName: 'Silva',
124
- ContactPhoneDisp: '',
125
- ContactEmail: 'ads.asbestos@gmail.com',
126
- ContactMobileDisp: '1300 064 277',
127
- ServiceAll: 'Class A - Restricted - Asbestos Removalists',
128
- ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
129
+ Account: 'TWO A.D.S Asbestos Removal Pty Ltd',
130
+ // CompanyAddress: '62 Webber Parade',
131
+ Regbusinessaddresssuburb: 'KEILOR EAST',
132
+ Regbusinessaddresspostcode: '3033',
133
+ // Phone: '0404073745',
134
+ // CompanyMobile: '0404 073 745',
135
+ // CompanyEmailDisp: 'ads.asbestos@gmail.com',
136
+ Website: 'http://www.adsasbestosremoval.com.au',
137
+ // ContactFirstName: 'Ivan',
138
+ // ContactLastName: 'Silva',
139
+ PrimaryContactAccountName: 'Ivan Silva',
140
+ // ContactPhoneDisp: '',
141
+ PrimaryContactEmail: 'ads.asbestos@gmail.com',
142
+ PrimaryContactMobile: '1300 064 277',
143
+ AsbestosClass: 'Class A - Friable and non-friable',
144
+ // ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
129
145
  },
130
146
  {
131
- ResourceName: 'Three A.D.S Asbestos Removal Pty Ltd',
132
- CompanyAddress: '62 Webber Parade',
133
- AddressLine2: 'KEILOR EAST VIC 3033',
134
- Phone: '0404073745',
135
- CompanyMobile: '0404 073 745',
136
- CompanyEmailDisp: 'ads.asbestos@gmail.com',
137
- CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
138
- ContactFirstName: 'Ivan',
139
- ContactLastName: 'Silva',
140
- ContactPhoneDisp: '0404073745',
141
- ContactEmail: '',
142
- ContactMobileDisp: '1300 064 277',
143
- ServiceAll: 'Class A - Restricted - Asbestos Removalists',
144
- ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
147
+ Account: 'Three A.D.S Asbestos Removal Pty Ltd',
148
+ // CompanyAddress: '62 Webber Parade',
149
+ Regbusinessaddresssuburb: 'KEILOR EAST',
150
+ Regbusinessaddresspostcode: '3033',
151
+ // Phone: '0404073745',
152
+ // CompanyMobile: '0404 073 745',
153
+ // CompanyEmailDisp: 'ads.asbestos@gmail.com',
154
+ Website: 'http://www.adsasbestosremoval.com.au',
155
+ // ContactFirstName: 'Ivan',
156
+ // ContactLastName: 'Silva',
157
+ PrimaryContactAccountName: 'Ivan Silva',
158
+ // ContactPhoneDisp: '0404073745',
159
+ PrimaryContactEmail: '',
160
+ PrimaryContactMobile: '1300 064 277',
161
+ AsbestosClass: 'Class A - Friable and non-friable',
162
+ // ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
145
163
  },
146
164
  {
147
- ResourceName: 'FOUR A.D.S Asbestos Removal Pty Ltd',
148
- CompanyAddress: '62 Webber Parade',
149
- AddressLine2: 'KEILOR EAST VIC 3033',
150
- Phone: '0404073745',
151
- CompanyMobile: '0404 073 745',
152
- CompanyEmailDisp: 'ads.asbestos@gmail.com',
153
- CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
154
- ContactFirstName: 'Ivan',
155
- ContactLastName: 'Silva',
156
- ContactPhoneDisp: '0404073745',
157
- ContactEmail: 'ads.asbestos@gmail.com',
158
- ContactMobileDisp: '',
159
- ServiceAll: 'Class A - Restricted - Asbestos Removalists',
160
- ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
165
+ Account: 'FOUR A.D.S Asbestos Removal Pty Ltd',
166
+ // CompanyAddress: '62 Webber Parade',
167
+ Regbusinessaddresssuburb: 'KEILOR EAST',
168
+ Regbusinessaddresspostcode: '3033',
169
+ // Phone: '0404073745',
170
+ // CompanyMobile: '0404 073 745',
171
+ // CompanyEmailDisp: 'ads.asbestos@gmail.com',
172
+ Website: 'http://www.adsasbestosremoval.com.au',
173
+ // ContactFirstName: 'Ivan',
174
+ // ContactLastName: 'Silva',
175
+ PrimaryContactAccountName: 'Ivan Silva',
176
+ // ContactPhoneDisp: '0404073745',
177
+ PrimaryContactEmail: 'ads.asbestos@gmail.com',
178
+ PrimaryContactMobile: '',
179
+ AsbestosClass: 'Class A - Friable and non-friable',
180
+ // ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
161
181
  },
162
182
  {
163
- ResourceName: 'Five A.D.S Asbestos Removal Pty Ltd',
164
- CompanyAddress: '62 Webber Parade',
165
- AddressLine2: 'KEILOR EAST VIC 3033',
166
- Phone: '0404073745',
167
- CompanyMobile: '0404 073 745',
168
- CompanyEmailDisp: 'ads.asbestos@gmail.com',
169
- CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
170
- ContactFirstName: '',
171
- ContactLastName: '',
172
- ContactPhoneDisp: '',
173
- ContactEmail: '',
174
- ContactMobileDisp: '',
175
- ServiceAll: 'Class A - Restricted - Asbestos Removalists',
176
- ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
183
+ Account: 'Five A.D.S Asbestos Removal Pty Ltd',
184
+ // CompanyAddress: '62 Webber Parade',
185
+ Regbusinessaddresssuburb: 'KEILOR EAST',
186
+ Regbusinessaddresspostcode: '3033',
187
+ // Phone: '0404073745',
188
+ // CompanyMobile: '0404 073 745',
189
+ // CompanyEmailDisp: 'ads.asbestos@gmail.com',
190
+ Website: 'http://www.adsasbestosremoval.com.au',
191
+ // ContactFirstName: '',
192
+ // ContactLastName: '',
193
+ PrimaryContactAccountName: '',
194
+ // ContactPhoneDisp: '',
195
+ PrimaryContactEmail: '',
196
+ PrimaryContactMobile: '',
197
+ AsbestosClass: 'Class A - Friable and non-friable',
198
+ // ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
177
199
  },
178
200
  {
179
- ResourceName: 'SIX A.D.S Asbestos Removal Pty Ltd',
180
- CompanyAddress: '62 Webber Parade',
181
- AddressLine2: 'KEILOR EAST VIC 3033',
182
- Phone: '0404073745',
183
- CompanyMobile: '0404 073 745',
184
- CompanyEmailDisp: 'ads.asbestos@gmail.com',
185
- CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
186
- ContactFirstName: 'Ivan',
187
- ContactLastName: 'Silva',
188
- ContactPhoneDisp: '0404073745',
189
- ContactEmail: 'ads.asbestos@gmail.com',
190
- ContactMobileDisp: '1300 064 277',
191
- ServiceAll: 'Class A - Restricted - Asbestos Removalists',
192
- ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
201
+ Account: 'SIX A.D.S Asbestos Removal Pty Ltd',
202
+ // CompanyAddress: '62 Webber Parade',
203
+ Regbusinessaddresssuburb: 'KEILOR EAST',
204
+ Regbusinessaddresspostcode: '3033',
205
+ // Phone: '0404073745',
206
+ // CompanyMobile: '0404 073 745',
207
+ // CompanyEmailDisp: 'ads.asbestos@gmail.com',
208
+ Website: 'http://www.adsasbestosremoval.com.au',
209
+ // ContactFirstName: 'Ivan',
210
+ // ContactLastName: 'Silva',
211
+ PrimaryContactAccountName: 'Ivan Silva',
212
+ // ContactPhoneDisp: '0404073745',
213
+ PrimaryContactEmail: 'ads.asbestos@gmail.com',
214
+ PrimaryContactMobile: '1300 064 277',
215
+ AsbestosClass: 'Class A - Friable and non-friable',
216
+ // ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
193
217
  },
194
218
  {
195
- ResourceName: 'SSM Asbestos Removal Pty Ltd',
196
- CompanyAddress: '90 Marriage Lane',
197
- AddressLine2: 'HILLSIDE VIC 3875',
198
- Phone: '0405 083 197',
199
- CompanyMobile: '0405 083 197',
200
- CompanyEmailDisp: 'steve@ssmasbestos.com.au',
201
- CompanyWebURLDisp: 'www.ssm-asbestosremoval.com',
202
- ContactFirstName: 'Steven',
203
- ContactLastName: 'McCarthy',
204
- ContactPhoneDisp: '0405 083 197',
205
- ContactEmail: 'steve@ssmasbestos.com.au',
206
- ContactMobileDisp: '0405 083 197',
207
- ServiceAll: 'Class A Asbestos Removalists',
208
- ServicesAll: 'All types of Asbestos containing material (friable & non-friable)',
219
+ Account: 'SSM Asbestos Removal Pty Ltd',
220
+ // CompanyAddress: '90 Marriage Lane',
221
+ Regbusinessaddresssuburb: 'HILLSIDE',
222
+ Regbusinessaddresspostcode: '3875',
223
+ // Phone: '0405 083 197',
224
+ // CompanyMobile: '0405 083 197',
225
+ // CompanyEmailDisp: 'steve@ssmasbestos.com.au',
226
+ Website: 'www.ssm-asbestosremoval.com',
227
+ // ContactFirstName: 'Steven',
228
+ // ContactLastName: 'McCarthy',
229
+ PrimaryContactAccountName: 'Steven McCarthy',
230
+ // ContactPhoneDisp: '0405 083 197',
231
+ PrimaryContactEmail: 'steve@ssmasbestos.com.au',
232
+ PrimaryContactMobile: '0405 083 197',
233
+ AsbestosClass: 'Class A - Friable and non-friable',
234
+ // ServicesAll: 'All types of Asbestos containing material (friable & non-friable)',
209
235
  },
210
236
  {
211
- ResourceName: 'Golden Plains Asbestos PTY LTD',
212
- CompanyAddress: '165 Grevillea Drive',
213
- AddressLine2: 'ENFIELD VIC 3352',
214
- Phone: '0450582103',
215
- CompanyMobile: '0450582103',
216
- CompanyEmailDisp: 'gpasbestos@outlook.com',
217
- CompanyWebURLDisp: '',
218
- ContactFirstName: 'Carlos',
219
- ContactLastName: 'Rios',
220
- ContactPhoneDisp: '0450582103',
221
- ContactEmail: 'gpasbestos@outlook.com',
222
- ContactMobileDisp: '0450582103',
223
- ServiceAll: 'Class A Asbestos Removalists',
224
- ServicesAll: 'All types of Asbestos containing material (friable & non-friable)',
237
+ Account: 'Golden Plains Asbestos PTY LTD',
238
+ // CompanyAddress: '165 Grevillea Drive',
239
+ Regbusinessaddresssuburb: 'ENFIELD',
240
+ Regbusinessaddresspostcode: '3352',
241
+ // Phone: '0450582103',
242
+ // CompanyMobile: '0450582103',
243
+ // CompanyEmailDisp: 'gpasbestos@outlook.com',
244
+ Website: '',
245
+ // ContactFirstName: 'Carlos',
246
+ // ContactLastName: 'Rios',
247
+ PrimaryContactAccountName: 'Carlos Rios',
248
+ // ContactPhoneDisp: '0450582103',
249
+ PrimaryContactEmail: 'gpasbestos@outlook.com',
250
+ PrimaryContactMobile: '0450582103',
251
+ AsbestosClass: 'Class A - Friable and non-friable',
252
+ // ServicesAll: 'All types of Asbestos containing material (friable & non-friable)',
225
253
  }
226
254
  ]