Merge branch 'master' of http://192.168.6.188:3000/Provision/UnivateProperties

src/components/shared/navBar.vue

@@ -17,7 +17,7 @@
           <span></span>
           <span></span>
         </button>
-        <a class="navbar-brand text-brand" @click="routerGoTo('/')">
+        <div class="navbar-brand text-brand" style="cursor: pointer;" @click="routerGoTo('/')">
           <img
             class="img-fluid"
             src="/img/logos/UVProp.png"
@@ -26,7 +26,7 @@
           />
           Uni-Vate
           <span class="color-b">Properties</span>
-        </a>
+        </div>
         <button
           type="button"
           class="btn btn-link nav-search navbar-toggle-box-collapse d-md-none"
@@ -41,9 +41,6 @@
       <div class="col-md-8">
         <div class="navbar-collapse collapse justify-content-center" id="navbarDefault">
           <ul class="navbar-nav">
-            <!-- <li class="nav-item">
-            <a class="nav-link active" @click="routerGoTo('/')">Home</a>
-            </li>-->
             <li class="nav-item dropdown">
               <a
                 class="nav-link dropdown-toggle"
@@ -61,12 +58,14 @@
                   @click="routerGoTo('/timeshare/sell')"
                 >To Sell</a>
                 <a class="dropdown-item cursor-pointer" @click="routerGoTo('/timeshare/faq')">FAQ</a>
-                <hr />
-                <a
-                  v-if="isLoggedIn"
-                  class="dropdown-item cursor-pointer"
-                  @click="routerGoTo('/timeshare/sell')"
-                >My Timeshare Weeks</a>
+                <div v-if="isLoggedIn">
+                  <hr />
+                  <a
+                    v-if="isLoggedIn"
+                    class="dropdown-item cursor-pointer"
+                    @click="routerGoTo('/timeshare/sell')"
+                  >My Timeshare Weeks</a>
+                </div>
               </div>
             </li>
             <li class="nav-item dropdown">
@@ -263,3 +262,13 @@ export default {
   },
 };
 </script>
+<style scoped>
+a {
+  border: transparent thin solid;
+}
+a:hover {
+  background-color: #a9e0ff;
+  border-radius: 5px;
+  border: silver thin solid;
+}
+</style>

src/components/timeshare/faqPage.vue

@@ -32,6 +32,7 @@
               class="collapse show color-text-a"
               aria-labelledby="heading1"
               data-parent="#accordion"
+              style="background-color:#E3E3E3"
             >
               <div class="card-body" style="text-align:left">
                 Owning a timeshare means you own a portion of time in a specific unit in a resort. Most commonly the
@@ -57,6 +58,7 @@
               class="collapse"
               aria-labelledby="heading2"
               data-parent="#accordion"
+              style="background-color:#E3E3E3"
             >
               <div class="card-body" style="text-align:left">
                 Most timeshare resorts are self-catering which means you have a ‘home away from home” holiday. You will
@@ -81,6 +83,7 @@
               class="collapse"
               aria-labelledby="heading3"
               data-parent="#accordion"
+              style="background-color:#E3E3E3"
             >
               <div class="card-body" style="text-align:left">
                 Should the needs or lifestyle change for the timeshare owner, he may decide to sell his week. As a proud
@@ -104,6 +107,7 @@
               class="collapse"
               aria-labelledby="heading4"
               data-parent="#accordion"
+              style="background-color:#E3E3E3"
             >
               <div class="card-body" style="text-align:left">
                 Uni-Vate Properties specialise in fixed weeks or flexi week timeshare but are qualified to sell and/or
@@ -126,6 +130,7 @@
               class="collapse"
               aria-labelledby="heading5"
               data-parent="#accordion"
+              style="background-color:#E3E3E3"
             >
               <div class="card-body" style="text-align:left">
                 You can complete the on-line details which you will find under the “To Sell” tab. There will be a listing
@@ -149,6 +154,7 @@
               class="collapse"
               aria-labelledby="heading6"
               data-parent="#accordion"
+              style="background-color:#E3E3E3"
             >
               <div class="card-body" style="text-align:left">
                 Timeshare is not an appreciating property investment but it is an investment into your vacation lifestyle.
@@ -173,6 +179,7 @@
               class="collapse"
               aria-labelledby="heading7"
               data-parent="#accordion"
+              style="background-color:#E3E3E3"
             >
               <div class="card-body" style="text-align:left">
                 Through Uni-Vate Properties your week will be marketed extensively to all of their available channels.
@@ -195,6 +202,7 @@
               class="collapse"
               aria-labelledby="heading8"
               data-parent="#accordion"
+              style="background-color:#E3E3E3"
             >
               <div class="card-body" style="text-align:left">
                 All available and verified weeks will be listed on the website for prospective buyers. Once you identify a
@@ -218,6 +226,7 @@
               class="collapse"
               aria-labelledby="heading9"
               data-parent="#accordion"
+              style="background-color:#E3E3E3"
             >
               <div class="card-body" style="text-align:left">
                 By law, your money will be held in a trust account while the transfer is being processed. This trust
@@ -240,6 +249,7 @@
               class="collapse"
               aria-labelledby="heading10"
               data-parent="#accordion"
+              style="background-color:#E3E3E3"
             >
               <div class="card-body" style="text-align:left">
                 Most definitely! Once the week has been transferred to you, you have a choice of membership with RCI
@@ -264,6 +274,7 @@
               class="collapse"
               aria-labelledby="heading"
               data-parent="#accordion"
+              style="background-color:#E3E3E3"
             >
               <div class="card-body" style="text-align:left">
                 Uni-Vate Properties (Pty) Ltd is affiliated to the Estate Agents Board (EAAB) as well as the Institute of
@@ -293,6 +304,7 @@
               class="collapse"
               aria-labelledby="heading12"
               data-parent="#accordion"
+              style="background-color:#E3E3E3"
             >
               <div class="card-body" style="text-align:left">
                 Both are equally viable. The difference is either the seller is the developer of a resort marketing
@@ -320,6 +332,7 @@
               class="collapse"
               aria-labelledby="heading13"
               data-parent="#accordion"
+              style="background-color:#E3E3E3"
             >
               <div class="card-body" style="text-align:left">
                 The selling price is always market related determined by five factors. Resort quality, season, sleeper
@@ -344,6 +357,7 @@
               class="collapse"
               aria-labelledby="heading14"
               data-parent="#accordion"
+              style="background-color:#E3E3E3"
             >
               <div class="card-body" style="text-align:left">
                 Levies are determined by the share block Board of Directors who are accountable to the shareholders. The

src/components/timeshare/resort/resortImage.vue

@@ -0,0 +1,76 @@
+<template>
+  <div class="outer">
+    <div id="mainImage">
+      <img class="img-fluid main-image" :src="imageX" alt="Resort Image" />
+    </div>
+    <div class="list-images">
+      <div class="scrolling-wrapper-flexbox row inner">
+        <div v-for="(image, i) in images" :key="i" :class="myClass">
+          <a @click="changeImage(i)">
+            <img class="small-image" :src="image" alt="Resort Image" />
+          </a>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+
+export default {
+  props: {
+    images: [],
+  },
+  data() {
+    return {
+      largeImg: 0,
+    };
+  },
+  computed: {
+    myClass() {
+      if (this.images && this.images.length === 3) {
+        return 'col-md-4';
+      }
+      return 'col-md-3 nopadding';
+    },
+    imageX() {
+      return this.images[this.largeImg];
+    },
+    ...mapState('resort', ['resort', 'description', 'images', 'layout']),
+  },
+  methods: {
+    changeImage(number) {
+      this.largeImg = number;
+    },
+  },
+};
+</script>
+<style scoped>
+.outer {
+  background-color: #efefef;
+  padding: 10px;
+}
+.inner {
+  padding-left: 15px;
+  padding-right: 15px;
+}
+.main-image {
+  max-width: 80%;
+  max-height: 412px;
+}
+.list-images {
+  padding: 5px;
+  float: left;
+  border-top: 1px solid #dedede;
+  border-right: 1px solid #dedede;
+  border-bottom: 1px solid #dedede;
+  background-color: white;
+  width: 100%;
+  text-align: center;
+}
+.small-image {
+  width: 100%;
+  height: 125px;
+}
+</style>

src/components/timeshare/resort/resortPage.vue

@@ -1,42 +1,16 @@
 <template>
   <!-- eslint-disable max-len -->
-  <section>
-    <div style="padding-left:200px;padding-right:200px;">
+  <section class="my-top">
+    <div class="my-container">
       <div class="row">
         <div class="col-md-12 col-lg-8">
           <div class="title-box-d">
-            <h1 class="title-d" style="text-align:left; font-size: 250%">{{resort.prName}}</h1>
+            <h1 class="title-d my-title">{{resort.prName}}</h1>
           </div>
           <br />
         </div>
-        <div class="col-md-6 col-lg-6" v-if="images && images.length > 0">
-          <div id="images" style="background-color:#efefef;padding:10px;">
-            <div style="float:left;width:100%;height:70%" id="mainImage">
-              <img
-                class="img-fluid"
-                :src="imageX"
-                alt="Resort Image"
-                style="width: inherit;max-width:550px;max-height:412px;"
-              />
-            </div>
-            <div
-              style="padding:5px;float:left;border-top:1px solid #dedede;border-right:1px solid #dedede;border-bottom:1px solid #dedede;background-color:white;width:100%;text-align:center;"
-            >
-              <div
-                style="float:left;margin-left:2px;cursor:pointer;cursor:hand;width:24%"
-                v-for="(image, i) in images"
-                :key="i"
-              >
-                <a @click="changeImage(i)">
-                  <img class="productThumbnail" :src="image" alt="Resort Image" />
-                </a>
-              </div>
-            </div>
-            <div style="clear:both"></div>
-          </div>
-          <div id="unit" style="display: none;">
-            <div id="unit" style="border: 1px solid #dbdbdb;background-color:#efefef;padding:10px;"></div>
-          </div>
+        <div class="col-md-6 col-lg-6">
+          <ResortImages :images="images" />
         </div>
         <div class="col-md-6">
           <ul class="nav nav-tabs" id="myTab" role="tablist">
@@ -99,6 +73,7 @@
         </div>
       </div>
     </div>
+    <hr />
     <div class="myMargin">
       <div class="row">
         <div class="col-md-4">
@@ -122,27 +97,21 @@
 import { mapState, mapActions } from 'vuex';
 import WeekList from '../buy/weekListComponent.vue';
 import FilterComponent from '../searchTimeshare.vue';
+import ResortImages from './resortImage.vue';
 
 export default {
   props: {
     resortCode: {},
   },
-  data() {
-    return {
-      largeImg: 0,
-    };
-  },
   components: {
     WeekList,
     FilterComponent,
+    ResortImages,
   },
   mounted() {
     this.initResort(this.resortCode);
   },
   computed: {
-    imageX() {
-      return this.images[this.largeImg];
-    },
     ...mapState('resort', ['resort', 'description', 'images', 'layout']),
     mapUrl() {
       return this.resort
@@ -155,13 +124,33 @@ export default {
     routerGoTo(goto) {
       this.$router.push(goto);
     },
-    changeImage(number) {
-      this.largeImg = number;
-    },
   },
 };
 </script>
 <style scoped>
+.my-top {
+  padding-top: 25px;
+}
+.my-container {
+  padding-left: 200px;
+  padding-right: 200px;
+}
+.my-title {
+  text-align: left;
+  font-size: 250%;
+}
+.scrolling-wrapper-flexbox {
+  display: flex;
+  flex-wrap: nowrap;
+  overflow-x: auto;
+}
+.scrolling-wrapper-flexbox .card {
+  flex: 0 0 auto;
+}
+.nopadding {
+  padding: 1px !important;
+  margin: 0 !important;
+}
 .myMargin {
   margin-left: 2%;
   margin-right: 2%;

src/components/timeshare/resort/unitPage.vue

@@ -1,163 +1,156 @@
 <template>
   <!-- eslint-disable max-len -->
-  <div class="container">
+  <div class="my-container my-top">
     <div class="row">
       <div class="col-md-12 col-lg-8">
         <div class="title-box-d">
-          <h1
-            class="title-d"
-            style="text-align:left; font-size: 250%"
-          >{{week ? week.resortName : ''}}</h1>
+          <h1 class="title-d my-title">{{week ? week.resortName : ''}}</h1>
         </div>
         <br />
       </div>
       <div class="row mb-4">
-        <div class="col-md-4">
-          <img class="img-fluid" :src="image1" alt="Resort Image" style="border-radius:10px" />
-        </div>
-        <div class="col-md-4">
-          <img class="img-fluid" :src="image2" alt="Resort Image" style="border-radius:10px" />
-        </div>
-        <div class="col-md-4">
-          <img class="img-fluid" :src="image3" alt="Resort Image" style="border-radius:10px" />
-        </div>
-      </div>
-    </div>
-    <br />
-    <div class="container col-md-12" style="text-align:left;">
-      <div class="row">
         <div class="col-md-6">
-          <div class="title-box-d">
-            <h3 class="title-d">Property Description</h3>
-          </div>
-          <p>{{description}}</p>
-          <div>
-            <div class="title-box-d">
-              <h3 class="title-d">Facilities</h3>
-            </div>
-            <div class="row" v-if="resort.prUnitFacilities">
-              <div
-                class="col-md-4"
-                v-for="(item, i) in resort.prUnitFacilities.split('\n')"
-                :key="i"
-              >{{item}}</div>
-            </div>
-          </div>
+          <ResortImages :images="images" />
         </div>
-        <div class="col-md-6" v-if="week">
-          <form
-            id="mainForm"
-            method="POST"
-            action="/interested-timeshare/"
-            accept-charset="UTF-8"
-            enctype="multipart/form-data"
-          >
-            <div class="title-box-d">
-              <h3 class="title-d">Summary</h3>
-            </div>
-            <div class="form-row">
-              <div class="col-md-6">
-                <label for="resortunit">Unit</label>
-                <div class="input-group mb-3">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text" style="color: #60CBEB">
-                      <b>U#</b>
-                    </span>
+        <div class="col-md-6">
+          <hr />
+          <div v-if="week">
+            <form
+              id="mainForm"
+              method="POST"
+              action="/interested-timeshare/"
+              accept-charset="UTF-8"
+              enctype="multipart/form-data"
+            >
+              <div class="title-box-d">
+                <h3 class="title-d">Summary</h3>
+              </div>
+              <div class="form-row">
+                <div class="col-md-6">
+                  <label for="resortunit">Unit</label>
+                  <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                      <span class="input-group-text" style="color: #60CBEB">
+                        <b>U#</b>
+                      </span>
+                    </div>
+                    <input
+                      class="form-control"
+                      type="text"
+                      id="resort"
+                      name="resortunit"
+                      :value="week ? week.unitNumber : ''"
+                      disabled
+                    />
                   </div>
-                  <input
-                    class="form-control"
-                    type="text"
-                    id="resort"
-                    name="resortunit"
-                    :value="week ? week.unitNumber : ''"
-                    disabled
-                  />
                 </div>
-              </div>
-              <div class="col-md-6">
-                <label for="resortWeek">Module / Week Number</label>
-                <div class="input-group mb-3">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text" style="color: #60CBEB">
-                      <b>M</b>
-                    </span>
+                <div class="col-md-6">
+                  <label for="resortWeek">Module / Week Number</label>
+                  <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                      <span class="input-group-text" style="color: #60CBEB">
+                        <b>M</b>
+                      </span>
+                    </div>
+                    <input
+                      class="form-control"
+                      type="text"
+                      id="week"
+                      name="resortWeek"
+                      :value="week ? week.weekNumber : ''"
+                      disabled
+                    />
                   </div>
-                  <input
-                    class="form-control"
-                    type="text"
-                    id="week"
-                    name="resortWeek"
-                    :value="week ? week.weekNumber : ''"
-                    disabled
-                  />
                 </div>
-              </div>
 
-              <div class="col-md-6">
-                <label for="resortModule">Current Year Levy</label>
-                <div class="input-group mb-3">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text" style="color: #60CBEB">
-                      <b>R</b>
-                    </span>
+                <div class="col-md-6">
+                  <label for="resortModule">Current Year Levy</label>
+                  <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                      <span class="input-group-text" style="color: #60CBEB">
+                        <b>R</b>
+                      </span>
+                    </div>
+                    <input
+                      class="form-control"
+                      type="text"
+                      id="levy"
+                      name="levy"
+                      :value="formatPrice(week ? week.levyAmount : 0)"
+                      disabled
+                    />
                   </div>
-                  <input
-                    class="form-control"
-                    type="text"
-                    id="levy"
-                    name="levy"
-                    :value="formatPrice(week ? week.levyAmount : 0)"
-                    disabled
-                  />
                 </div>
-              </div>
-              <div class="col-md-6">
-                <label for="price">Price</label>
-                <div class="property-price d-flex">
-                  <div class="price-border">
-                    <div class="price-label">
-                      <b>R {{ formatPrice(week ? week.sellPrice : 0) }}</b>
+                <div class="col-md-6">
+                  <label for="price">Price</label>
+                  <div class="property-price d-flex">
+                    <div class="price-border">
+                      <div class="price-label">
+                        <b>R {{ formatPrice(week ? week.sellPrice : 0) }}</b>
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
-            </div>
-            <br />
-          </form>
-          <br />
-          <div class="d-flex justify-content-between">
-            <div class="p-1">
-              <a class="btn btn-b-c even-width mr-auto" href="javascript:history.back()">Back</a>
-            </div>
-            <div class="p-1">
-              <button
-                type="button"
-                class="btn btn-lg btn-b-n even-width mr-auto"
-                data-toggle="modal"
-                data-target="#myModal"
-              >Make an Offer</button>
-              <div class="col-md-12">
-                <div id="myModal" class="modal fade" role="dialog">
-                  <div class="modal-dialog modal-lg">
-                    <!-- Modal content-->
-                    <div class="modal-content">
-                      <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal">&times;</button>
-                      </div>
-                      <div padding-left="20px">
-                        <makeOffer
-                          name="MakeOffer"
-                          :isMakeOffer="true"
-                          :isProperty="false"
-                          :item="week"
-                        />
+            </form>
+            <hr />
+            <div class="d-flex justify-content-between">
+              <div class="p-1">
+                <a class="btn btn-b-c even-width mr-auto" href="javascript:history.back()">Back</a>
+              </div>
+              <div class="p-1">
+                <button
+                  type="button"
+                  class="btn btn-lg btn-b-n even-width mr-auto"
+                  data-toggle="modal"
+                  data-target="#myModal"
+                >Make an Offer</button>
+                <div class="col-md-12">
+                  <div id="myModal" class="modal fade" role="dialog">
+                    <div class="modal-dialog modal-lg">
+                      <!-- Modal content-->
+                      <div class="modal-content">
+                        <div class="modal-header">
+                          <button type="button" class="close" data-dismiss="modal">&times;</button>
+                        </div>
+                        <div padding-left="20px">
+                          <makeOffer
+                            name="MakeOffer"
+                            :isMakeOffer="true"
+                            :isProperty="false"
+                            :item="week"
+                          />
+                        </div>
                       </div>
                     </div>
                   </div>
                 </div>
               </div>
             </div>
+            <hr />
+          </div>
+        </div>
+        <hr />
+        <div class="col-md-12">
+          <hr />
+        </div>
+        <div class="col-md-6">
+          <div class="title-box-d">
+            <h3 class="title-d">Facilities</h3>
           </div>
+          <div class="row" v-if="resort.prUnitFacilities">
+            <div
+              class="col-md-4"
+              v-for="(item, i) in resort.prUnitFacilities.split('\n')"
+              :key="i"
+            >{{item}}</div>
+          </div>
+        </div>
+        <div class="col-md-6">
+          <div class="title-box-d">
+            <h3 class="title-d">Property Description</h3>
+          </div>
+          <p>{{description}}</p>
         </div>
       </div>
     </div>
@@ -167,11 +160,13 @@
 <script>
 import { mapState, mapActions } from 'vuex';
 import makeOffer from '../../processFlow/makeOffer.vue';
+import ResortImages from './resortImage.vue';
 
 export default {
   name: 'unit',
   components: {
     makeOffer,
+    ResortImages,
   },
   props: {
     resortCode: {},
@@ -182,13 +177,7 @@ export default {
     this.initWeek(this.weekId);
   },
   computed: {
-    ...mapState('resort', [
-      'resort',
-      'description',
-      'image1',
-      'image2',
-      'image3',
-    ]),
+    ...mapState('resort', ['resort', 'description', 'images']),
     ...mapState('week', ['week']),
   },
   methods: {
@@ -205,6 +194,17 @@ export default {
 };
 </script>
 <style scoped>
+.my-top {
+  padding-top: 25px;
+}
+.my-container {
+  padding-left: 15%;
+  padding-right: 15%;
+}
+.my-title {
+  text-align: left;
+  font-size: 250%;
+}
 .btn.btn-b-c {
   background-color: #ffffff;
   color: #60cbeb;
@@ -215,6 +215,8 @@ export default {
   color: #ffffff;
 }
 .price-border {
+  background-color: #a9e0ff;
+  width: 100%;
   border: solid #60cbeb medium;
   padding: 0px 20px;
 }

src/store/modules/timeshare/resort.js

@@ -105,7 +105,11 @@ export default {
         .get(
           `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/${resortCode}/image/4`,
         )
-        .then(result => commit('addImage', result.data))
+        .then((result) => {
+          if (result.data && result.data.length > 0) {
+            commit('addImage', result.data);
+          }
+        })
         .catch(console.error);
     },
     getLayout({