Updated DAE Logo To 7 Across & added forceupdate

package-lock.json

@@ -12432,6 +12432,11 @@
         "vue-style-loader": "^4.1.0"
       }
     },
+    "vue-loaders": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/vue-loaders/-/vue-loaders-4.1.4.tgz",
+      "integrity": "sha512-YlT9js3/NSQr8CTebto0NM9jaUl+kkGR3HgdCvoDV2H3NLzCrzSUxzo+VkPgPzBrOs8s40Bad+OX1XOZexeeVQ=="
+    },
     "vue-owl-carousel": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/vue-owl-carousel/-/vue-owl-carousel-2.0.3.tgz",

package.json

@@ -38,6 +38,7 @@
     "vue-float-label": "^1.6.1",
     "vue-js-modal": "^1.3.33",
     "vue-json-excel": "^0.2.99",
+    "vue-loaders": "^4.1.4",
     "vue-owl-carousel": "^2.0.3",
     "vue-router": "^3.1.5",
     "vue-social-sharing": "^3.0.0-beta.11",

public/img/logos/header_7across-logo.svg

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 170 33" style="enable-background:new 0 0 170 33;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#00EBD7;}
+</style>
+<g>
+	<path class="st0" d="M38.27,7.35v3.96h9.36c-4.37,4.36-6.18,9.93-6.31,16.4h4.42c0.08-7.3,2.12-12.1,7.42-16.72V7.35L38.27,7.35
+		L38.27,7.35z"/>
+	<path class="st0" d="M138.89,20.46c0.23,2.5,1.66,3.9,4.04,3.9c1.63,0,2.97-0.72,2.97-2.18c0-1.6-1.28-2.15-4.16-2.94
+		c-4.59-1.25-6.63-3.05-6.63-6.25c0-3.46,2.74-6.08,7.13-6.08c4.65,0,7.27,2.91,7.33,6.72h-4.59c-0.03-1.71-1.07-2.94-2.85-2.94
+		c-1.63,0-2.44,0.9-2.44,2c0,1.31,1.31,1.92,3.93,2.68c4.71,1.34,6.86,2.97,6.86,6.4c0,2.35-1.07,4.22-2.85,5.26
+		c-1.28,0.78-2.94,1.11-4.77,1.11c-4.92,0-8.34-2.76-8.58-7.68L138.89,20.46L138.89,20.46z"/>
+	<path class="st0" d="M157.42,20.46c0.23,2.5,1.66,3.9,4.04,3.9c1.63,0,2.97-0.72,2.97-2.18c0-1.6-1.28-2.15-4.16-2.94
+		c-4.59-1.25-6.63-3.05-6.63-6.25c0-3.46,2.74-6.08,7.13-6.08c4.65,0,7.27,2.91,7.33,6.72h-4.59c-0.03-1.71-1.07-2.94-2.85-2.94
+		c-1.63,0-2.44,0.9-2.44,2c0,1.31,1.31,1.92,3.93,2.68c4.71,1.34,6.86,2.97,6.86,6.4c0,2.35-1.07,4.22-2.85,5.26
+		c-1.28,0.78-2.94,1.11-4.77,1.11c-4.92,0-8.34-2.76-8.58-7.68L157.42,20.46L157.42,20.46z"/>
+	<path class="st0" d="M106.59,27.71h4.88l-4.77-8.6c2.29-0.94,3.55-2.95,3.55-5.5c0-3.96-2.65-6.25-7.15-6.25h-3.63h-1.71h-2.59
+		v20.36h4.3v-7.77h3.03L106.59,27.71z M99.46,11.13h3.34c1.77,0,3.05,0.76,3.05,2.56s-1.28,2.53-3.05,2.53h-3.34V11.13z"/>
+	<path class="st0" d="M77.84,17.53c0,4.13,1.66,6.78,4.71,6.78c2.47,0,3.96-1.75,4.39-4.53h4.42c-0.52,5.03-3.84,8.38-8.81,8.38
+		c-5.76,0-9.1-4.36-9.1-10.61s3.34-10.61,9.1-10.61c4.97,0,8.28,3.34,8.81,8.38h-4.42c-0.43-2.79-1.92-4.53-4.39-4.53
+		C79.49,10.75,77.84,13.39,77.84,17.53z"/>
+	<path class="st0" d="M122.57,28.14c-5.76,0-9.13-4.36-9.13-10.61s3.38-10.61,9.13-10.61c5.76,0,9.13,4.36,9.13,10.61
+		S128.33,28.14,122.57,28.14z M122.57,24.25c3.05,0,4.71-2.59,4.71-6.72s-1.66-6.72-4.71-6.72c-3.05,0-4.71,2.59-4.71,6.72
+		S119.52,24.25,122.57,24.25z"/>
+	<path class="st0" d="M67.61,27.71h4.53L65.46,7.35h-5l-6.69,20.36h4.39l1.07-3.49h7.3L67.61,27.71z M60.37,20.55l2.52-8.17
+		l2.52,8.17H60.37z"/>
+</g>
+<path class="st1" d="M29.86,9.26c-0.87-1.6-2.01-3.03-3.38-4.23l-7.97,7.18l0.64-10.72c-1.8-0.32-3.63-0.32-5.41,0l0.64,10.72
+	L6.4,5.03C5.05,6.22,3.89,7.66,3.03,9.26l8.78,6.18L1.22,17.2c0.08,1.86,0.5,3.64,1.2,5.28l10.3-3.01L7.5,28.83
+	c1.46,1.05,3.1,1.86,4.88,2.35l4.07-9.92l4.07,9.92c1.78-0.49,3.42-1.29,4.88-2.35l-5.22-9.36l10.3,3.01
+	c0.7-1.63,1.12-3.41,1.2-5.28l-10.58-1.76L29.86,9.26z"/>
+</svg>

src/components/home/propertySection.vue

@@ -37,10 +37,14 @@ export default {
     ...mapState("propertySearch", ["latestProperties"])
   },
   methods: {
-    ...mapActions("propertySearch", ["searchLatestProperties"])
+    ...mapActions("propertySearch", ["searchLatestProperties"]),
+    LoadData() {
+      this.searchLatestProperties();
+      this.$forceUpdate();
+    }
   },
   mounted() {
-    this.searchLatestProperties();
+    this.LoadData();
   }
 };
 </script>

src/components/property/commercial/latestListings.vue

@@ -30,17 +30,21 @@ import { mapState, mapActions } from "vuex";
 import propertyCard from "../propertyCard";
 export default {
   components: {
-    propertyCard,
+    propertyCard
   },
   methods: {
     ...mapActions("propertySearch", ["searchLatestPropertiesType"]),
+    LoadData() {
+      this.searchLatestPropertiesType("Commercial");
+      this.$forceUpdate();
+    }
   },
   mounted() {
-    this.searchLatestPropertiesType("Commercial");
+    this.LoadData();
   },
   computed: {
-    ...mapState("propertySearch", ["latestProperties"]),
-  },
+    ...mapState("propertySearch", ["latestProperties"])
+  }
 };
 </script>
 

src/components/property/residential/latestListings.vue

@@ -32,17 +32,21 @@ import { mapState, mapActions } from "vuex";
 import propertyCard from "../propertyCard";
 export default {
   components: {
-    propertyCard,
+    propertyCard
   },
   methods: {
     ...mapActions("propertySearch", ["searchLatestPropertiesType"]),
+    async LoadData() {
+      await this.searchLatestPropertiesType("Residential");
+      this.$forceUpdate();
+    }
   },
-  async mounted() {
-    await this.searchLatestPropertiesType("Residential");
+  mounted() {
+    this.LoadData();
   },
   computed: {
-    ...mapState("propertySearch", ["latestProperties"]),
-  },
+    ...mapState("propertySearch", ["latestProperties"])
+  }
 };
 </script>
 

src/components/shared/footerSection.vue

@@ -68,9 +68,9 @@
           </div>
         </div>
         <div class="row justify-content-center">
-          <div class="col-lg-2 p-4">
+          <div class="col-lg-2 p-4" style="margin-top:9px">
             <a href="https://www.daelive.com/" target="_blank"
-              ><img src="../../../public/img/logos/daeNew.png"
+              ><img src="../../../public/img/logos/header_7across-logo.svg"
             /></a>
           </div>
           <div class="col-lg-2 p-4">

src/components/timeshare/buy/latestWeeks.vue

@@ -21,6 +21,9 @@
           </div>
         </div>
       </div>
+      <div v-else>
+        <vue-loaders-ball-clip-rotate />
+      </div>
     </div>
   </section>
 </template>
@@ -33,11 +36,8 @@ export default {
     ...mapState("resort", ["resort", "description", "images", "layout"]),
     ...mapGetters("timeshare", ["getLatestWeeks"])
   },
-  mounted() {},
   created() {
-    this.retrieveLatestWeeks().then(() => {
-      this.boolLoaded = true;
-    });
+    this.LoadData();
   },
   data() {
     return {
@@ -53,7 +53,12 @@ export default {
     },
     ...mapActions("weekList", ["getWeeks", "applyResortFilter"]),
     ...mapActions("resort", ["getImage1", "getResortData"]),
-    ...mapActions("timeshare", ["retrieveLatestWeeks"])
+    ...mapActions("timeshare", ["retrieveLatestWeeks"]),
+    LoadData() {
+      this.retrieveLatestWeeks().then(() => {
+        this.boolLoaded = true;
+      });
+    }
   }
 };
 </script>

src/components/timeshare/sell/contentSectionNew.vue

@@ -1101,6 +1101,7 @@ export default {
         this.$router.push("/user/login");
       }
     },
+
     paygateRedirect() {
       var amount = this.getListingFee.amount;
       var paymentObj = {

src/main.js

@@ -14,7 +14,10 @@ import VueFloatLabel from "vue-float-label";
 import VueCryptojs from "vue-cryptojs";
 import VueAnalytics from 'vue-analytics';
 import JsonExcel from "vue-json-excel";
+import 'vue-loaders/dist/vue-loaders.css';
+import VueLoaders from 'vue-loaders';
 
+Vue.use(VueLoaders);
 Vue.use(VueSocialSharing);
 Vue.use(EvaIcons);
 Vue.use(Vuetify);
@@ -35,15 +38,15 @@ Vue.use(VueGoogleMaps, {
   }
 });
 //More info @ https://webdeasy.de/en/vue-analytics-en/
-Vue.use(VueAnalytics, {
-  id: 'UA-128891091-1',
-  router
-});
+// 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/";
-//axios.defaults.baseURL = "http://training.provision-sa.com:82/";
+//axios.defaults.baseURL = "https://www.pvsl.co.za:86/";
+axios.defaults.baseURL = "http://training.provision-sa.com:82/";
 //axios.defaults.baseURL = "http://localhost:8080/"
 
 Vue.prototype.$axios = axios;

vue.config.js

@@ -3,8 +3,8 @@ module.exports = {
     proxy: {
       "/api": {
         //target: "http://localhost:57260/",
-        //target: "http://training.provision-sa.com:82/",
-        target: "https://www.pvsl.co.za:86/",
+        target: "http://training.provision-sa.com:82/",
+        //target: "https://www.pvsl.co.za:86/",
         changeOrigin: true
       },
       "/nph-srep": {