Merge branch 'master' of http://provision-sa.co.za:3000/Provision/UnivateProperties into master

package-lock.json

@@ -12302,6 +12302,11 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
       "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
     },
+    "vue-analytics": {
+      "version": "5.22.1",
+      "resolved": "https://registry.npmjs.org/vue-analytics/-/vue-analytics-5.22.1.tgz",
+      "integrity": "sha512-HPKQMN7gfcUqS5SxoO0VxqLRRSPkG1H1FqglsHccz6BatBatNtm/Vyy8brApktZxNCfnAkrSVDpxg3/FNDeOgQ=="
+    },
     "vue-carousel": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/vue-carousel/-/vue-carousel-0.18.0.tgz",

package.json

@@ -29,6 +29,7 @@
     "stylus-loader": "^3.0.2",
     "v-file-upload": "^3.1.7",
     "vue": "^2.6.11",
+    "vue-analytics": "^5.22.1",
     "vue-carousel": "^0.18.0",
     "vue-cryptojs": "^2.1.5",
     "vue-currency-input": "^1.22.3",

src/components/property/commercial/commercialCarouselSection.vue

@@ -133,6 +133,11 @@ export default {
       this.propertySearch.suburb = place.suburb;
     },
   },
+  mounted() {    
+    this.propertySearch.city = "All";
+    this.propertySearch.suburb = "All";
+    this.propertySearch.province = "All";
+  }
 };
 </script>
 

src/components/property/commercial/commercialSearchResults.vue

@@ -43,6 +43,7 @@
       </div>
     </section> -->
     <section v-else id="intro" style="margin-bottom:-50px">
+      <br/>
       <div class="container">
         <div class="row d-flex justify-content-center">
           <div class="col-md-8">
@@ -138,6 +139,11 @@ export default {
     ParamsChanged() {
       return null;
     }
+  },
+  beforeDestroy(){
+    this.propertySearch.city = "All";
+    this.propertySearch.suburb = "All";
+    this.propertySearch.province = "All";    
   }
 };
 </script>

src/components/property/residential/residentialCarouselSection.vue

@@ -153,6 +153,11 @@ export default {
       this.propertySearch.suburb = place.suburb;
     },
   },
+  mounted() {    
+    this.propertySearch.city = "All";
+    this.propertySearch.suburb = "All";
+    this.propertySearch.province = "All";
+  }
 };
 </script>
 

src/components/property/residential/residentialSearchResults.vue

@@ -12,6 +12,7 @@
       :showSort="false"
     />
     <section v-else id="intro" style="margin-bottom:-50px">
+      <br/>
       <div class="container">
         <div class="row d-flex justify-content-center">
           <div class="col-md-8">
@@ -29,7 +30,7 @@
         :items="1"
         :autoplay="true"
         :loop="true"
-        id="intro-carousel"
+        id="intro-carousel_residential"
         style="margin-top:-50px"
         :responsive="{ 0: { items: 1, nav: false }, 600: { items: 1, nav: false } }"
       >
@@ -48,11 +49,13 @@
 /* eslint-disable */
 import { mapState, mapActions } from "vuex";
 import propertyCard from "../propertyCardSearch";
+import carousel from "vue-owl-carousel";
 
 export default {
   name: "propertysearch",
   components: {
-    propertyCard
+    propertyCard,
+     carousel
   },
   data() {
     return {
@@ -107,6 +110,11 @@ export default {
     ParamsChanged() {
       return null;
     }
+  },
+  beforeDestroy(){
+    this.propertySearch.city = "All";
+    this.propertySearch.suburb = "All";
+    this.propertySearch.province = "All";    
   }
 };
 </script>

src/main.js

@@ -12,6 +12,7 @@ import VueSocialSharing from "vue-social-sharing";
 import VueCurrencyInput from "vue-currency-input";
 import VueFloatLabel from "vue-float-label";
 import VueCryptojs from "vue-cryptojs";
+import VueAnalytics from 'vue-analytics';
 
 Vue.use(VueSocialSharing);
 Vue.use(EvaIcons);
@@ -31,6 +32,12 @@ Vue.use(VueGoogleMaps, {
     // v: '3.26',
   }
 });
+//More info @ https://webdeasy.de/en/vue-analytics-en/
+Vue.use(VueAnalytics, {
+  id: 'UA-128891091-1',
+  router
+});
+
 Vue.config.productionTip = false;
 //axios.defaults.baseURL = "http://localhost:57260";
 //axios.defaults.baseURL = "https://www.pvsl.co.za:86/";