Merge files

package-lock.json

@@ -7793,6 +7793,11 @@
         }
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",

package.json

@@ -17,6 +17,7 @@
     "jquery": "^3.4.1",
     "lodash": "^4.17.15",
     "material-design-icons-iconfont": "^3.0.3",
+    "moment": "^2.24.0",
     "node-sass": "^4.12.0",
     "roboto-fontface": "*",
     "sass-loader": "^7.3.1",

src/components/admin/logs/SearchLogs.vue

@@ -0,0 +1,87 @@
+<template>
+  <!-- eslint-disable max-len -->
+  <div>
+    <div class="container">
+      <!-- <section class="intro-single"> -->
+      <div class="container">
+        <br />
+        <br />
+        <br />
+        <br />
+        <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%">Search Log</h1>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- </section> -->
+    </div>
+    <div class="container">
+      <table class="table table-bordered">
+        <thead>
+          <tr>
+            <th>Date</th>
+            <th>Time</th>
+            <th>User</th>
+            <th>Keyword</th>
+            <th>Sales Type</th>
+            <th>Property Usage Type</th>
+            <th>Property Type</th>
+            <th>Province</th>
+            <th>City</th>
+            <th>Suburb</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="(item, i) in propertySearch" :key="i">
+            <td>{{ formatDate(item.date) }}</td>
+            <td>{{ formatTime(item.date) }}</td>
+            <td v-if="item.user">{{ item.user }}</td>
+            <td v-else>No User</td>
+            <td>{{ item.keyword === 'All' ? '' : item.keyword }}</td>
+            <td>{{ item.salesType === 'All' ? '' : item.salesType }}</td>
+            <td>{{ item.propertyUsageType === 'All' ? '' : item.propertyUsageType }}</td>
+            <td>{{ item.propertyType === 'All' ? '' : item.propertyType }}</td>
+            <td>{{ item.province === 'All' ? '' : item.province }}</td>
+            <td>{{ item.city === 'All' ? '' : item.city }}</td>
+            <td>{{ item.suburb === 'All' ? '' : item.suburb }}</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <br />
+  </div>
+</template>
+
+<script>
+import { mapState, mapActions } from 'vuex';
+import moment from 'moment';
+import Vue from 'vue';
+import excel from 'vue-excel-export';
+
+Vue.use(excel);
+
+export default {
+  name: 'searchLog',
+  data() {
+    return {};
+  },
+  methods: {
+    ...mapActions('searchLog', ['getPropertySearchLogs']),
+    formatDate(value) {
+      return moment(String(value)).format('YYYY/MM/DD');
+    },
+    formatTime(value) {
+      return moment(String(value)).format('hh:mm');
+    },
+  },
+  mounted() {
+    this.getPropertySearchLogs();
+  },
+  computed: {
+    ...mapState('searchLog', ['propertySearch']),
+  },
+};
+</script>

src/components/admin/status/userManagementPage.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- <section class="intro-single"> -->
+  <!-- eslint-disable max-len -->
   <div class="container">
     <br />
     <br />
@@ -7,34 +7,116 @@
     <br />
     <div class="row">
       <div class="col-md-12 col-lg-8">
-        <!-- <div class="title-single-box"> -->
-        <!-- <h1 class="title-single" style="text-align:left;">User Management</h1> -->
-        <!-- </div> -->
         <div class="title-box-d">
           <h1 class="title-d" style="text-align:left; font-size: 250%">User Management</h1>
         </div>
         <br />
       </div>
     </div>
-    <div id="table" class="col-xs-12 table-responsive">
-      <datatable :columns="columns" :data="rows"></datatable>
+    <button @click="addNewAgent" type="button" class="btn btn-b-n">Add New Agent</button>
+    <br />
+    <br />
+    <div class="container">
+      <table class="table table-bordered">
+        <thead>
+          <tr>
+            <th>ID</th>
+            <th>Name</th>
+            <th>Surname</th>
+            <th>Cell Number</th>
+            <th>Telephone Number</th>
+            <th>Email</th>
+            <th>Role</th>
+            <th>Reset Password</th>
+            <th></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td colspan="10">
+              <h5>Private Users</h5>
+            </td>
+          </tr>
+          <tr v-for="(item, i) in individuals" :key="i">
+            <td>{{ item.id }}</td>
+            <td>{{ item.name }}</td>
+            <td>{{ item.surname }}</td>
+            <td>{{ item.cellNumber }}</td>
+            <td>{{ item.telephone }}</td>
+            <td>{{ item.email }}</td>
+            <td v-if="item.user">{{ item.user.role }}</td>
+            <td v-else></td>
+            <td></td>
+            <td>
+              <button
+                type="button"
+                @click="Edit(item)"
+                class="btn btn-b-n"
+                style="width: 85px; height:40px;"
+              >Edit</button>
+            </td>
+            <td>
+              <button type="button" class="btn btn-b-n" style="width: 85px; height:40px">Delete</button>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="10">
+              <h5>Agents</h5>
+            </td>
+          </tr>
+          <tr v-for="(item, i) in agents" :key="i">
+            <td>{{ item.id }}</td>
+            <td>{{ item.name }}</td>
+            <td>{{ item.surname }}</td>
+            <td>{{ item.cellNumber }}</td>
+            <td>{{ item.telephone }}</td>
+            <td>{{ item.email }}</td>
+            <td v-if="item.user">{{ item.user.role }}</td>
+            <td v-else></td>
+            <td></td>
+            <td>
+              <button
+                type="button"
+                @click="Edit(item)"
+                class="btn btn-b-n"
+                style="width: 85px; height:40px;"
+              >Edit</button>
+            </td>
+            <td>
+              <button type="button" class="btn btn-b-n" style="width: 85px; height:40px">Delete</button>
+            </td>
+          </tr>
+        </tbody>
+      </table>
     </div>
+    <br />
   </div>
-  <!-- </section> -->
 </template>
 <script>
 import { mapState, mapActions } from 'vuex';
+import axios from 'axios';
 
 export default {
   name: 'userManagementPage',
-  created() {
-    this.getuserManagementPage();
-  },
-  computed: {
-    ...mapState('status', ['userManagementPage']),
+  data() {
+    return {};
   },
   methods: {
-    ...mapActions('status', ['getuserManagementPage']),
+    ...mapActions('registerIndividual', ['getIndividuals', 'getAgents']),
+    addNewAgent({ commit }) {
+      axios
+        .post('/api/agent')
+        .then(result => commit('saveAgent', result.data))
+        .catch(console.error);
+    },
+  },
+  mounted() {
+    this.getIndividuals();
+    this.getAgents();
+  },
+  computed: {
+    ...mapState('registerIndividual', ['individuals', 'agents']),
   },
 };
 </script>

src/components/home/newsSection.vue

@@ -21,23 +21,23 @@
           <div class="carousel-item-c">
             <div class="card-box-b card-shadow news-box">
               <div class="img-box-b">
-                <img src="img/post-2.jpg" alt class="img-b img-fluid" />
+                <img src="img/Tenant.jpg" alt class="img-b img-fluid" />
               </div>
               <div class="card-overlay">
                 <div class="card-header-b">
                   <div class="card-category-b">
-                    <a href="#" class="category-b">House</a>
+                    <a href="#" class="category-b">Article</a>
                   </div>
                   <div class="card-title-b">
                     <h2 class="title-2">
                       <a href="blog-single.html">
-                        House is comming
-                        <br />new
+                        Landlords, here’s how to spot a ‘bad’ tenant
+                        <br />
                       </a>
                     </h2>
                   </div>
                   <div class="card-date">
-                    <span class="date-b">18 Sep. 2017</span>
+                    <span class="date-b">31 Aug. 2019</span>
                   </div>
                 </div>
               </div>
@@ -46,23 +46,23 @@
           <div class="carousel-item-c">
             <div class="card-box-b card-shadow news-box">
               <div class="img-box-b">
-                <img src="img/post-5.jpg" alt class="img-b img-fluid" />
+                <img src="img/Poll.png" alt class="img-b img-fluid" />
               </div>
               <div class="card-overlay">
                 <div class="card-header-b">
                   <div class="card-category-b">
-                    <a href="#" class="category-b">Travel</a>
+                    <a href="#" class="category-b">Poll</a>
                   </div>
                   <div class="card-title-b">
                     <h2 class="title-2">
                       <a href="blog-single.html">
-                        Travel is comming
-                        <br />new
+                        Which would you rather?
+                        <br />
                       </a>
                     </h2>
                   </div>
                   <div class="card-date">
-                    <span class="date-b">18 Sep. 2017</span>
+                    <span class="date-b">23 Aug. 2019</span>
                   </div>
                 </div>
               </div>
@@ -71,23 +71,23 @@
           <div class="carousel-item-c">
             <div class="card-box-b card-shadow news-box">
               <div class="img-box-b">
-                <img src="img/post-7.jpg" alt class="img-b img-fluid" />
+                <img src="img/Purchasing.jpg" alt class="img-b img-fluid" />
               </div>
               <div class="card-overlay">
                 <div class="card-header-b">
                   <div class="card-category-b">
-                    <a href="#" class="category-b">Park</a>
+                    <a href="#" class="category-b">Article</a>
                   </div>
                   <div class="card-title-b">
                     <h2 class="title-2">
                       <a href="blog-single.html">
-                        Park is comming
-                        <br />new
+                        Six questions before purchasing
+                        <br />
                       </a>
                     </h2>
                   </div>
                   <div class="card-date">
-                    <span class="date-b">18 Sep. 2017</span>
+                    <span class="date-b">19 Aug. 2019</span>
                   </div>
                 </div>
               </div>
@@ -96,23 +96,23 @@
           <div class="carousel-item-c">
             <div class="card-box-b card-shadow news-box">
               <div class="img-box-b">
-                <img src="img/post-3.jpg" alt class="img-b img-fluid" />
+                <img src="img/Article.jpg" alt class="img-b img-fluid" />
               </div>
               <div class="card-overlay">
                 <div class="card-header-b">
                   <div class="card-category-b">
-                    <a href="#" class="category-b">Travel</a>
+                    <a href="#" class="category-b">Poll</a>
                   </div>
                   <div class="card-title-b">
                     <h2 class="title-2">
                       <a href="#">
-                        Travel is comming
-                        <br />new
+                        December holidays; a perfect family escape.
+                        <br />
                       </a>
                     </h2>
                   </div>
                   <div class="card-date">
-                    <span class="date-b">18 Sep. 2017</span>
+                    <span class="date-b">23 Aug. 2019</span>
                   </div>
                 </div>
               </div>

src/components/misc/address.vue

@@ -9,7 +9,7 @@
       <div class="form-group row"></div>
       <div class="row" style="text-align:left">
         <div class="col-md-6" style="margin-bottom: 1em">
-          <label>Street Number</label>
+          <label>Street Number *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="home-outline" fill="#60CBEB"></eva-icon>
@@ -23,7 +23,7 @@
           </div>
         </div>
         <div class="col-md-6" style="margin-bottom: 1em">
-          <label>Street Name</label>
+          <label>Street Name *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="home-outline" fill="#60CBEB"></eva-icon>
@@ -32,36 +32,70 @@
           </div>
         </div>
         <div class="col-md-6" style="margin-bottom: 1em">
-          <label>Suburb</label>
+          <label>Province *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="home-outline" fill="#60CBEB"></eva-icon>
             </span>
-            <input class="form-control" type="text" name="suburb" v-model="address.suburb" />
+            <select
+              class="form-control"
+              name="propertyType"
+              id="propertyType"
+              @change="ProvinceSelected"
+              v-model="address.provinceId"
+            >
+              <option value="0">Please select province</option>
+              <option
+                v-for="province in provinces"
+                :value="province.id"
+                :key="province.id"
+              >{{ province.description }}</option>
+            </select>
           </div>
         </div>
+
         <div class="col-md-6" style="margin-bottom: 1em">
-          <label>City</label>
+          <label>City *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="home-outline" fill="#60CBEB"></eva-icon>
             </span>
-            <input class="form-control" type="text" name="city" v-model="address.city" />
+            <select
+              class="form-control"
+              name="propertyType"
+              id="propertyType"
+              @change="CitySelected"
+              v-model="address.cityId"
+            >
+              <option value="0">Please select city</option>
+              <option v-for="city in cities" :value="city.id" :key="city.id">{{ city.description }}</option>
+            </select>
           </div>
         </div>
         <div class="col-md-6" style="margin-bottom: 1em">
-          <label>Province</label>
+          <label>Suburb *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="home-outline" fill="#60CBEB"></eva-icon>
             </span>
-            <select class="form-control" name="region" id="region" v-model="address.province">
-              <option v-for="(region, r) in regions" :key="r">{{region.regionName}}</option>
+            <select
+              class="form-control"
+              name="propertyType"
+              id="suburbselector"
+              v-model="address.suburbId"
+              @change="getPostalCode"
+            >
+              <option value="0">Please select suburb</option>
+              <option
+                v-for="suburb in suburbs"
+                :value="suburb.id"
+                :key="suburb.id"
+              >{{ suburb.description }}</option>
             </select>
           </div>
         </div>
         <div class="col-md-6" style="margin-bottom: 1em">
-          <label>Postal Code</label>
+          <label>Postal Code *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="home-outline" fill="#60CBEB"></eva-icon>
@@ -75,14 +109,51 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
+import { mapState, mapActions } from 'vuex';
 
 export default {
+  data() {
+    return {
+      propertyType: 'Residential',
+    };
+  },
   props: {
     address: {},
   },
   computed: {
-    ...mapState('timeshare', ['regions']),
+    ...mapState('searchTab', ['provinces', 'cities', 'suburbs']),
+  },
+  methods: {
+    ...mapActions('searchTab', ['getProvince', 'getCities', 'getSuburbs']),
+    ProvinceSelected(item) {
+      if (item.target.options.selectedIndex > 0) {
+        this.selectedProvince = this.provinces[
+          item.target.options.selectedIndex - 1
+        ].description;
+        this.getCities(Object.assign({}, { province: this.selectedProvince }));
+      }
+    },
+    CitySelected(item) {
+      if (item.target.options.selectedIndex > 0) {
+        this.selectedCity = this.cities[
+          item.target.options.selectedIndex - 1
+        ].description;
+        this.getSuburbs(
+          Object.assign(
+            {},
+            { province: this.selectedProvince, city: this.selectedCity },
+          ),
+        );
+      }
+    },
+    getPostalCode(item) {
+      this.address.postalCode = this.suburbs[
+        item.target.options.selectedIndex - 1
+      ].postalCode;
+    },
+  },
+  mounted() {
+    this.getProvince();
   },
 };
 </script>

src/components/property/propertyList.vue

@@ -49,7 +49,8 @@
             <td v-html="item.size" />
             <td>{{ item.price }}</td>
             <td>{{ item.type }}</td>
-            <td>{{ item.publish }}</td>
+            <!-- <td>{{ item.publish }}</td> -->
+            <td></td>
             <td>{{ item.status }}</td>
             <td>
               <button
@@ -57,10 +58,16 @@
                 @click="Edit(item)"
                 class="btn btn-b-n"
                 style="width: 85px; height:40px;"
+                disabled
               >Edit</button>
             </td>
             <td>
-              <button type="button" class="btn btn-b-n" style="width: 85px; height:40px;">Delete</button>
+              <button
+                type="button"
+                class="btn btn-b-n"
+                style="width: 85px; height:40px;"
+                disabled
+              >Delete</button>
             </td>
           </tr>
         </tbody>

src/components/property/propertyPage.vue

@@ -142,70 +142,7 @@
                       </div>
                     </div>
                   </div>
-                  <div class="row">
-                    <div class="col-md-12">
-                      <img src="img/agent-4.jpg" alt class="img-fluid" />
-                    </div>
-                  </div>
-                  <div class="row">
-                    <div class="col-md-12">
-                      <div class="property-agent">
-                        <h4 class="title-agent">Anabella Geller</h4>
-                        <p class="color-text-a">
-                          Nulla porttitor accumsan tincidunt. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet
-                          dui. Quisque velit nisi,
-                          pretium ut lacinia in, elementum id enim.
-                        </p>
-                        <ul class="list-unstyled">
-                          <li class="d-flex justify-content-between">
-                            <strong>Phone:</strong>
-                            <span class="color-text-a">(222) 4568932</span>
-                          </li>
-                          <li class="d-flex justify-content-between">
-                            <strong>Mobile:</strong>
-                            <span class="color-text-a">777 287 378 737</span>
-                          </li>
-                          <li class="d-flex justify-content-between">
-                            <strong>Email:</strong>
-                            <span class="color-text-a">annabella@example.com</span>
-                          </li>
-                          <li class="d-flex justify-content-between">
-                            <strong>Skype:</strong>
-                            <span class="color-text-a">Annabela.ge</span>
-                          </li>
-                        </ul>
-                        <div class="socials-a">
-                          <ul class="list-inline">
-                            <li class="list-inline-item">
-                              <a href="#">
-                                <i class="fa fa-facebook" aria-hidden="true"></i>
-                              </a>
-                            </li>
-                            <li class="list-inline-item">
-                              <a href="#">
-                                <i class="fa fa-twitter" aria-hidden="true"></i>
-                              </a>
-                            </li>
-                            <li class="list-inline-item">
-                              <a href="#">
-                                <i class="fa fa-instagram" aria-hidden="true"></i>
-                              </a>
-                            </li>
-                            <li class="list-inline-item">
-                              <a href="#">
-                                <i class="fa fa-pinterest-p" aria-hidden="true"></i>
-                              </a>
-                            </li>
-                            <li class="list-inline-item">
-                              <a href="#">
-                                <i class="fa fa-dribbble" aria-hidden="true"></i>
-                              </a>
-                            </li>
-                          </ul>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
+
                   <div class="row">
                     <div class="col-md-12">
                       <div class="property-contact">

src/components/property/propertySearchPage.vue

@@ -47,7 +47,12 @@
         </div>
         <div class="col-md-4">
           <p>
-            <img class="img-fluid" src="./../../../public/img/residential.jpg" alt="About Resale" style="border-radius:10px"/>
+            <img
+              class="img-fluid"
+              src="./../../../public/img/residential.jpg"
+              alt="About Resale"
+              style="border-radius:10px"
+            />
           </p>
         </div>
       </div>
@@ -130,7 +135,6 @@
   </div>
 </template>
 <script>
-import { mkdir } from 'fs';
 import { mapState, mapActions } from 'vuex';
 import propertyCard from './propertyCard.vue';
 
@@ -179,64 +183,33 @@ export default {
         suburb: 'All',
       };
 
-      if (typeof this.$route.params.propertyType === 'undefined') {
-        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-        this.propertySearch = this.$route.query;
-      } else {
+      if (Object.keys(this.$route.params).length > 0) {
+        if (this.$route.params.propertyUsageType) {
+          // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+          this.propertySearch.propertyUsageType = this.$route.params.propertyUsageType;
+        }
+      }
+      if (Object.keys(this.$route.query).length > 0) {
+        if (Object.keys(this.$route.query).length > 2) {
+          // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+          this.propertySearch = this.$route.query;
+        } else {
+          if (this.$route.query.salesType) {
+            // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+            this.propertySearch.salesType = this.$route.query.salesType;
+          }
+          if (this.$route.query.propertyUsageType) {
+            // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+            this.propertySearch.propertyUsageType = this.$route.query.propertyUsageType;
+          }
+        }
+      }
+      if (this.propertySearch.keyword === '') {
         // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-        this.propertySearch.propertyUsageType = this.$route.params.propertyType;
+        this.propertySearch.keyword = 'All';
       }
 
-      console.log(`PropertySearch = ${JSON.stringify(this.propertySearch)}`);
-
       this.searchProperties(this.propertySearch);
-      // this.type = this.$route.query.type;
-      // this.propertyType = this.$route.query.propertyType;
-      // this.province = this.$route.query.province;
-      // this.city = this.$route.query.city;
-      // this.suburb = this.$route.query.suburb;
-      // this.proptype = this.$route.query.propType;
-      // this.keyword = this.$route.query.keyword;
-      // if (typeof this.propertyType === 'undefined') {
-      //   this.propertyType = this.propertyTypeparam;
-      // }
-      // if (this.type === '') {
-      //   this.type = 'undefined';
-      // }
-      // if (this.propertyType === '') {
-      //   this.propertyType = 'undefined';
-      // }
-      // if (this.province === '') {
-      //   this.province = 'undefined';
-      // }
-      // if (this.city === '') {
-      //   this.city = 'undefined';
-      // }
-      // if (this.suburb === '') {
-      //   this.suburb = 'undefined';
-      // }
-      // if (this.proptype === '') {
-      //   this.propType = 'undefined';
-      // }
-      // if (typeof this.keyword === 'undefined' || this.keyword === '') {
-      //   this.searchPropertiesParams(
-      //     Object.assign(
-      //       {},
-      //       {
-      //         type: this.type,
-      //         propertyType: this.propertyType,
-      //         province: this.province,
-      //         city: this.city,
-      //         suburb: this.suburb,
-      //         propType: this.proptype,
-      //       },
-      //     ),
-      //   );
-      // } else {
-      //   this.searchPropertiesKeyword(
-      //     Object.assign({}, { keyword: this.keyword }),
-      //   );
-      // }
       return null;
     },
   },

src/components/shared/bankAccount.vue

@@ -9,7 +9,7 @@
       <div class="form-group row"></div>
       <div class="row" style="text-align:left">
         <div class="col-md-6" style="margin-bottom: 1em">
-          <label>Bank</label>
+          <label>Bank *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="behance-outline" fill="#60CBEB"></eva-icon>
@@ -18,7 +18,7 @@
           </div>
         </div>
         <div class="col-md-6" style="margin-bottom: 1em">
-          <label>Account Number</label>
+          <label>Account Number *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="navigation-outline" fill="#60CBEB"></eva-icon>
@@ -32,7 +32,7 @@
           </div>
         </div>
         <div class="col-md-6" style="margin-bottom: 1em">
-          <label>Account Holder</label>
+          <label>Account Holder *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="person-done-outline" fill="#60CBEB"></eva-icon>

src/components/shared/navBar.vue

@@ -134,7 +134,7 @@
               </div>
             </li>
 
-            <li class="nav-item dropdown">
+            <li v-if="showLogout" class="nav-item dropdown">
               <a
                 class="nav-link dropdown-toggle"
                 href="#"
@@ -174,6 +174,11 @@
                   class="dropdown-item cursor-pointer"
                   @click="routerGoTo('/propertyTypes/list')"
                 >Property Types</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/searchLog')"
+                >Search Logs</a>
+                <a class="dropdown-item cursor-pointer" @click="routerGoTo('/Offers')">Offers</a>
               </div>
             </li>
             <li class="nav-item dropdown">

src/components/timeshare/buy/weekListComponent.vue

@@ -4,15 +4,15 @@
       <table class="table table-bordered">
         <thead>
           <tr>
-            <th>Region</th>
+            <th>Province</th>
             <th>Resort</th>
-            <th>Unit Number</th>
-            <th>Week Number</th>
-            <th>Arrival Date</th>
-            <th>Departure Date</th>
+            <th>Unit</th>
+            <th>Week</th>
+            <th>Arrival</th>
+            <th>Departure</th>
             <th>Bedrooms</th>
-            <th>Price</th>
-            <th>Status</th>
+            <th style="width:15%">Price</th>
+            <!-- <th>Status</th> -->
             <th>Interested</th>
           </tr>
         </thead>
@@ -26,7 +26,7 @@
             <td>{{item.departureDate | toDate}}</td>
             <td>{{item.bedrooms}}</td>
             <td>{{item.sellPrice | toCurrency}}</td>
-            <td>{{item.status ? item.status.description : ''}}</td>
+            <!-- <td>{{item.status ? item.status.description : ''}}</td> -->
             <td>
               <div class="col-md-12">
                 <button

src/components/timeshare/faqPage.vue

@@ -19,365 +19,342 @@
         <div class="container col-md-10">
           <br />
           <div id="accordion">
-            <div class="card">
-              <div class="card-header" id="heading1" style="text-align:left">
-                <h5 class="mb-0 color-text-a">
-                  <button
-                    class="btn btn-link font-weight-bold color-b"
-                    data-toggle="collapse"
-                    data-target="#collapse1"
-                    aria-expanded="true"
-                    aria-controls="collapse1"
-                  >What is timeshare vacation ownership?</button>
-                </h5>
-              </div>
-              <div
-                id="collapse1"
-                class="collapse show color-text-a"
-                aria-labelledby="heading1"
-                data-parent="#accordion"
-              >
-                <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
-                  increments are sold per week and usually this means Friday to Friday depending on the specific resorts
-                  calendar. In specific resorts it could also mean midweek or weekend modules.
-                </div>
-              </div>
+            <!-- <div class="card"> -->
+            <div class="card" id="heading1">
+              <!-- <h5 class="mb-0 color-text-a"> -->
+              <button
+                class="btn btn-link font-weight-bold color-b text-left"
+                data-toggle="collapse"
+                data-target="#collapse1"
+                aria-expanded="true"
+                aria-controls="collapse1"
+              >What is timeshare vacation ownership?</button>
+              <!-- </h5> -->
             </div>
-            <div class="card">
-              <div class="card-header" id="heading2" style="text-align:left">
-                <h5 class="mb-0">
-                  <button
-                    class="btn btn-link font-weight-bold color-b"
-                    data-toggle="collapse"
-                    data-target="#collapse2"
-                    aria-expanded="false"
-                    aria-controls="collapse2"
-                  >What is included in my timeshare?</button>
-                </h5>
-              </div>
-              <div
-                id="collapse2"
-                class="collapse"
-                aria-labelledby="heading2"
-                data-parent="#accordion"
-              >
-                <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
-                  not be required to pay for your accommodation week other than a maintenance levy which is charged by the
-                  resort. Some resorts do charge a key or breakage deposit but these are usually refundable.
-                </div>
+            <div
+              id="collapse1"
+              class="collapse show color-text-a"
+              aria-labelledby="heading1"
+              data-parent="#accordion"
+            >
+              <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
+                increments are sold per week and usually this means Friday to Friday depending on the specific resorts
+                calendar. In specific resorts it could also mean midweek or weekend modules.
               </div>
             </div>
-            <div class="card">
-              <div class="card-header" id="heading3" style="text-align:left">
-                <h5 class="mb-0">
-                  <button
-                    class="btn btn-link font-weight-bold color-b"
-                    data-toggle="collapse"
-                    data-target="#collapse3"
-                    aria-expanded="false"
-                    aria-controls="collapse3"
-                  >What is timeshare resale?</button>
-                </h5>
-              </div>
-              <div
-                id="collapse3"
-                class="collapse"
-                aria-labelledby="heading3"
-                data-parent="#accordion"
-              >
-                <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
-                  member of VOASA, Uni-Vate Properties are accredited agents who facilitate this process for the seller and
-                  prospective buyer, ensuring sound and ethical business practice for all transactions.
-                </div>
-              </div>
+
+            <!-- <div class="card"> -->
+            <div class="card" id="heading2">
+              <!-- <h5 class="mb-0"> -->
+              <button
+                class="btn btn-link font-weight-bold color-b text-left"
+                data-toggle="collapse"
+                data-target="#collapse2"
+                aria-expanded="false"
+                aria-controls="collapse2"
+              >What is included in my timeshare?</button>
+              <!-- </h5> -->
             </div>
-            <div class="card">
-              <div class="card-header" id="heading4" style="text-align:left">
-                <h5 class="mb-0">
-                  <button
-                    class="btn btn-link font-weight-bold color-b"
-                    data-toggle="collapse"
-                    data-target="#collapse4"
-                    aria-expanded="false"
-                    aria-controls="collapse4"
-                  >Can Uni-Vate Properties sell my points?</button>
-                </h5>
-              </div>
-              <div
-                id="collapse4"
-                class="collapse"
-                aria-labelledby="heading4"
-                data-parent="#accordion"
-              >
-                <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
-                  advise on points sales.
-                </div>
+            <div
+              id="collapse2"
+              class="collapse"
+              aria-labelledby="heading2"
+              data-parent="#accordion"
+            >
+              <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
+                not be required to pay for your accommodation week other than a maintenance levy which is charged by the
+                resort. Some resorts do charge a key or breakage deposit but these are usually refundable.
               </div>
             </div>
-            <div class="card">
-              <div class="card-header" id="heading5" style="text-align:left">
-                <h5 class="mb-0">
-                  <button
-                    class="btn btn-link font-weight-bold color-b"
-                    data-toggle="collapse"
-                    data-target="#collapse5"
-                    aria-expanded="false"
-                    aria-controls="collapse5"
-                  >How do I list my week with Uni-Vate Properties?</button>
-                </h5>
-              </div>
-              <div
-                id="collapse5"
-                class="collapse"
-                aria-labelledby="heading5"
-                data-parent="#accordion"
-              >
-                <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
-                  fee payable of R380 including VAT. The details submitted will go through a verification process. Subject
-                  to there being no complications, the listing will be processed and published.
-                </div>
-              </div>
+            <!-- </div> -->
+            <div class="card" id="heading3">
+              <!-- <h5 class="mb-0"> -->
+              <button
+                class="btn btn-link font-weight-bold color-b text-left"
+                data-toggle="collapse"
+                data-target="#collapse3"
+                aria-expanded="false"
+                aria-controls="collapse3"
+              >What is timeshare resale?</button>
+              <!-- </h5> -->
             </div>
-            <div class="card">
-              <div class="card-header" id="heading6" style="text-align:left">
-                <h5 class="mb-0">
-                  <button
-                    class="btn btn-link font-weight-bold color-b"
-                    data-toggle="collapse"
-                    data-target="#collapse6"
-                    aria-expanded="false"
-                    aria-controls="collapse6"
-                  >Is timeshare an investment?</button>
-                </h5>
-              </div>
-              <div
-                id="collapse6"
-                class="collapse"
-                aria-labelledby="heading6"
-                data-parent="#accordion"
-              >
-                <div class="card-body" style="text-align:left">
-                  Timeshare is not an appreciating property investment but it is an investment into your vacation lifestyle.
-                  It will improve your lifestyle and the quality and variety of your family holidays both locally and
-                  internationally while saving you money. The memories gained and the time spent with loved ones is
-                  priceless.
-                </div>
+            <div
+              id="collapse3"
+              class="collapse"
+              aria-labelledby="heading3"
+              data-parent="#accordion"
+            >
+              <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
+                member of VOASA, Uni-Vate Properties are accredited agents who facilitate this process for the seller and
+                prospective buyer, ensuring sound and ethical business practice for all transactions.
               </div>
             </div>
-            <div class="card">
-              <div class="card-header" id="heading7" style="text-align:left">
-                <h5 class="mb-0">
-                  <button
-                    class="btn btn-link font-weight-bold color-b"
-                    data-toggle="collapse"
-                    data-target="#collapse7"
-                    aria-expanded="false"
-                    aria-controls="collapse7"
-                  >How is my week sold?</button>
-                </h5>
-              </div>
-              <div
-                id="collapse7"
-                class="collapse"
-                aria-labelledby="heading7"
-                data-parent="#accordion"
-              >
-                <div class="card-body" style="text-align:left">
-                  Through Uni-Vate Properties your week will be marketed extensively to all of their available channels.
-                  Uni-Vate will only charge a listing Fee of R380 including VAT which is due when listing.
-                </div>
-              </div>
+            <div class="card" id="heading4">
+              <!-- <h5 class="mb-0"> -->
+              <button
+                class="btn btn-link font-weight-bold color-b text-left"
+                data-toggle="collapse"
+                data-target="#collapse4"
+                aria-expanded="false"
+                aria-controls="collapse4"
+              >Can Uni-Vate Properties sell my points?</button>
+              <!-- </h5> -->
             </div>
-            <div class="card">
-              <div class="card-header" id="heading8" style="text-align:left">
-                <h5 class="mb-0">
-                  <button
-                    class="btn btn-link font-weight-bold color-b"
-                    data-toggle="collapse"
-                    data-target="#collapse8"
-                    aria-expanded="false"
-                    aria-controls="collapse8"
-                  >How do I buy a week?</button>
-                </h5>
-              </div>
-              <div
-                id="collapse8"
-                class="collapse"
-                aria-labelledby="heading8"
-                data-parent="#accordion"
-              >
-                <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
-                  week that suits your holiday need and price, click on “Enquire Now” and complete your details to conclude
-                  the initiation of the transaction.
-                </div>
+            <div
+              id="collapse4"
+              class="collapse"
+              aria-labelledby="heading4"
+              data-parent="#accordion"
+            >
+              <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
+                advise on points sales.
               </div>
             </div>
-            <div class="card">
-              <div class="card-header" id="heading9" style="text-align:left">
-                <h5 class="mb-0">
-                  <button
-                    class="btn btn-link font-weight-bold color-b"
-                    data-toggle="collapse"
-                    data-target="#collapse9"
-                    aria-expanded="false"
-                    aria-controls="collapse9"
-                  >Is my money safe?</button>
-                </h5>
-              </div>
-              <div
-                id="collapse9"
-                class="collapse"
-                aria-labelledby="heading9"
-                data-parent="#accordion"
-              >
-                <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
-                  account is a specification of any company registered as an estate agency with the EAAB.
-                </div>
-              </div>
+            <div class="card" id="heading5">
+              <!-- <h5 class="mb-0"> -->
+              <button
+                class="btn btn-link font-weight-bold color-b text-left"
+                data-toggle="collapse"
+                data-target="#collapse5"
+                aria-expanded="false"
+                aria-controls="collapse5"
+              >How do I list my week with Uni-Vate Properties?</button>
+              <!-- </h5> -->
             </div>
-            <div class="card">
-              <div class="card-header" id="heading10" style="text-align:left">
-                <h5 class="mb-0">
-                  <button
-                    class="btn btn-link font-weight-bold color-b"
-                    data-toggle="collapse"
-                    data-target="#collapse10"
-                    aria-expanded="false"
-                    aria-controls="collapse10"
-                  >Can I exchange my timeshare for other destinations?</button>
-                </h5>
+            <div
+              id="collapse5"
+              class="collapse"
+              aria-labelledby="heading5"
+              data-parent="#accordion"
+            >
+              <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
+                fee payable of R380 including VAT. The details submitted will go through a verification process. Subject
+                to there being no complications, the listing will be processed and published.
               </div>
-              <div
-                id="collapse10"
-                class="collapse"
-                aria-labelledby="heading10"
-                data-parent="#accordion"
-              >
-                <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
-                  and/or DAE, two of the worlds largest exchange companies that will gladly exchange your week for you
-                  anywhere in the world with friendly and professional service. We will gladly put you in touch with them
-                  and the entire world will be available to you for holidays.
-                </div>
+            </div>
+            <div class="card" id="heading6">
+              <!-- <h5 class="mb-0"> -->
+              <button
+                class="btn btn-link font-weight-bold color-b text-left"
+                data-toggle="collapse"
+                data-target="#collapse6"
+                aria-expanded="false"
+                aria-controls="collapse6"
+              >Is timeshare an investment?</button>
+              <!-- </h5> -->
+            </div>
+            <div
+              id="collapse6"
+              class="collapse"
+              aria-labelledby="heading6"
+              data-parent="#accordion"
+            >
+              <div class="card-body" style="text-align:left">
+                Timeshare is not an appreciating property investment but it is an investment into your vacation lifestyle.
+                It will improve your lifestyle and the quality and variety of your family holidays both locally and
+                internationally while saving you money. The memories gained and the time spent with loved ones is
+                priceless.
               </div>
             </div>
-            <div class="card">
-              <div class="card-header" id="heading11" style="text-align:left">
-                <h5 class="mb-0">
-                  <button
-                    class="btn btn-link font-weight-bold color-b"
-                    data-toggle="collapse"
-                    data-target="#collapse11"
-                    aria-expanded="false"
-                    aria-controls="collapse11"
-                  >There are so many agents and scam artists out there. Why Uni-Vate Properties?</button>
-                </h5>
+            <div class="card" id="heading7">
+              <!-- <h5 class="mb-0"> -->
+              <button
+                class="btn btn-link font-weight-bold color-b text-left"
+                data-toggle="collapse"
+                data-target="#collapse7"
+                aria-expanded="false"
+                aria-controls="collapse7"
+              >How is my week sold?</button>
+              <!-- </h5> -->
+            </div>
+            <div
+              id="collapse7"
+              class="collapse"
+              aria-labelledby="heading7"
+              data-parent="#accordion"
+            >
+              <div class="card-body" style="text-align:left">
+                Through Uni-Vate Properties your week will be marketed extensively to all of their available channels.
+                Uni-Vate will only charge a listing Fee of R380 including VAT which is due when listing.
               </div>
-              <div
-                id="collapse11"
-                class="collapse"
-                aria-labelledby="heading"
-                data-parent="#accordion"
-              >
-                <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
-                  Estate Agents South Africa (IEASA) and are obliged to comply with the Estate Agents Code of Conduct. We
-                  are also proud members of Vacation Ownership Association South Africa (VOASA) and are obliged to comply
-                  with their code too. This assures our clients of professional, ethical and fair service at all times. We
-                  also have 25 years’ experience in the Timeshare industry in SA and to date the team have processed many
-                  sales in the residential, share block and commercial arenas within South Africa and are currently involved
-                  in the rental and management of 40 commercial and 15 residential properties. The Uni-Vate resale support
-                  team consists of three highly qualified and experienced staff, who have thirteen years’ joint experience
-                  in the timeshare resales industry.
-                </div>
+            </div>
+            <div class="card" id="heading8">
+              <!-- <h5 class="mb-0"> -->
+              <button
+                class="btn btn-link font-weight-bold color-b text-left"
+                data-toggle="collapse"
+                data-target="#collapse8"
+                aria-expanded="false"
+                aria-controls="collapse8"
+              >How do I buy a week?</button>
+              <!-- </h5> -->
+            </div>
+            <div
+              id="collapse8"
+              class="collapse"
+              aria-labelledby="heading8"
+              data-parent="#accordion"
+            >
+              <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
+                week that suits your holiday need and price, click on “Enquire Now” and complete your details to conclude
+                the initiation of the transaction.
               </div>
             </div>
-            <div class="card">
-              <div class="card-header" id="heading12" style="text-align:left">
-                <h5 class="mb-0">
-                  <button
-                    class="btn btn-link font-weight-bold color-b"
-                    data-toggle="collapse"
-                    data-target="#collapse12"
-                    aria-expanded="false"
-                    aria-controls="collapse12"
-                  >Why would I buy a resale week rather than a new week?</button>
-                </h5>
+            <div class="card" id="heading9">
+              <!-- <h5 class="mb-0"> -->
+              <button
+                class="btn btn-link font-weight-bold color-b text-left"
+                data-toggle="collapse"
+                data-target="#collapse9"
+                aria-expanded="false"
+                aria-controls="collapse9"
+              >Is my money safe?</button>
+              <!-- </h5> -->
+            </div>
+            <div
+              id="collapse9"
+              class="collapse"
+              aria-labelledby="heading9"
+              data-parent="#accordion"
+            >
+              <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
+                account is a specification of any company registered as an estate agency with the EAAB.
               </div>
-              <div
-                id="collapse12"
-                class="collapse"
-                aria-labelledby="heading12"
-                data-parent="#accordion"
-              >
-                <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
-                  directly to the public and offering finance options on the purchase, or an individual who wants to sell
-                  their week for a variety of reasons. Often when purchasing from an individual the price can be negotiated
-                  as it is a cash sale with no financing options.
-                  Its all about finding the resort and time of your choice that fits your pocket so that you can have many
-                  years of happy holidays. Uni-Vate Properties are highly qualified in offering sound advice and assisting
-                  you in what can be a tricky decision.
-                </div>
+            </div>
+            <div class="card" id="heading10">
+              <!-- <h5 class="mb-0"> -->
+              <button
+                class="btn btn-link font-weight-bold color-b text-left"
+                data-toggle="collapse"
+                data-target="#collapse10"
+                aria-expanded="false"
+                aria-controls="collapse10"
+              >Can I exchange my timeshare for other destinations?</button>
+              <!-- </h5> -->
+            </div>
+            <div
+              id="collapse10"
+              class="collapse"
+              aria-labelledby="heading10"
+              data-parent="#accordion"
+            >
+              <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
+                and/or DAE, two of the worlds largest exchange companies that will gladly exchange your week for you
+                anywhere in the world with friendly and professional service. We will gladly put you in touch with them
+                and the entire world will be available to you for holidays.
               </div>
             </div>
-            <div class="card">
-              <div class="card-header" id="heading13" style="text-align:left">
-                <h5 class="mb-0">
-                  <button
-                    class="btn btn-link font-weight-bold color-b"
-                    data-toggle="collapse"
-                    data-target="#collapse13"
-                    aria-expanded="false"
-                    aria-controls="collapse13"
-                  >How is the price of the week determined?</button>
-                </h5>
+            <div class="card" id="heading11">
+              <!-- <h5 class="mb-0"> -->
+              <button
+                class="btn btn-link font-weight-bold color-b text-left"
+                data-toggle="collapse"
+                data-target="#collapse11"
+                aria-expanded="false"
+                aria-controls="collapse11"
+              >There are so many agents and scam artists out there. Why Uni-Vate Properties?</button>
+              <!-- </h5> -->
+            </div>
+            <div
+              id="collapse11"
+              class="collapse"
+              aria-labelledby="heading"
+              data-parent="#accordion"
+            >
+              <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
+                Estate Agents South Africa (IEASA) and are obliged to comply with the Estate Agents Code of Conduct. We
+                are also proud members of Vacation Ownership Association South Africa (VOASA) and are obliged to comply
+                with their code too. This assures our clients of professional, ethical and fair service at all times. We
+                also have 25 years’ experience in the Timeshare industry in SA and to date the team have processed many
+                sales in the residential, share block and commercial arenas within South Africa and are currently involved
+                in the rental and management of 40 commercial and 15 residential properties. The Uni-Vate resale support
+                team consists of three highly qualified and experienced staff, who have thirteen years’ joint experience
+                in the timeshare resales industry.
               </div>
-              <div
-                id="collapse13"
-                class="collapse"
-                aria-labelledby="heading13"
-                data-parent="#accordion"
-              >
-                <div class="card-body" style="text-align:left">
-                  The selling price is always market related determined by five factors. Resort quality, season, sleeper
-                  size of the unit, location of the resort and lastly, supply and demand.
-                  Uni-Vate Properties offer transparent advice on all pricing ensuring that both buyer and seller receive
-                  the best value for their money.
-                </div>
+            </div>
+            <div class="card" id="heading12">
+              <!-- <h5 class="mb-0"> -->
+              <button
+                class="btn btn-link font-weight-bold color-b text-left"
+                data-toggle="collapse"
+                data-target="#collapse12"
+                aria-expanded="false"
+                aria-controls="collapse12"
+              >Why would I buy a resale week rather than a new week?</button>
+              <!-- </h5> -->
+            </div>
+            <div
+              id="collapse12"
+              class="collapse"
+              aria-labelledby="heading12"
+              data-parent="#accordion"
+            >
+              <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
+                directly to the public and offering finance options on the purchase, or an individual who wants to sell
+                their week for a variety of reasons. Often when purchasing from an individual the price can be negotiated
+                as it is a cash sale with no financing options.
+                Its all about finding the resort and time of your choice that fits your pocket so that you can have many
+                years of happy holidays. Uni-Vate Properties are highly qualified in offering sound advice and assisting
+                you in what can be a tricky decision.
               </div>
             </div>
-            <div class="card">
-              <div class="card-header" id="heading14" style="text-align:left">
-                <h5 class="mb-0">
-                  <button
-                    class="btn btn-link font-weight-bold color-b"
-                    data-toggle="collapse"
-                    data-target="#collapse14"
-                    aria-expanded="false"
-                    aria-controls="collapse14"
-                  >How are levies determined?</button>
-                </h5>
+            <div class="card" id="heading13">
+              <!-- <h5 class="mb-0"> -->
+              <button
+                class="btn btn-link font-weight-bold color-b text-left"
+                data-toggle="collapse"
+                data-target="#collapse13"
+                aria-expanded="false"
+                aria-controls="collapse13"
+              >How is the price of the week determined?</button>
+              <!-- </h5> -->
+            </div>
+            <div
+              id="collapse13"
+              class="collapse"
+              aria-labelledby="heading13"
+              data-parent="#accordion"
+            >
+              <div class="card-body" style="text-align:left">
+                The selling price is always market related determined by five factors. Resort quality, season, sleeper
+                size of the unit, location of the resort and lastly, supply and demand.
+                Uni-Vate Properties offer transparent advice on all pricing ensuring that both buyer and seller receive
+                the best value for their money.
               </div>
-              <div
-                id="collapse14"
-                class="collapse"
-                aria-labelledby="heading14"
-                data-parent="#accordion"
-              >
-                <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
-                  managing agents of the resort are always available to assist with any queries that owners may have.
-                </div>
+            </div>
+            <div class="card" id="heading14">
+              <!-- <h5 class="mb-0"> -->
+              <button
+                class="btn btn-link font-weight-bold color-b text-left"
+                data-toggle="collapse"
+                data-target="#collapse14"
+                aria-expanded="false"
+                aria-controls="collapse14"
+              >How are levies determined?</button>
+              <!-- </h5> -->
+            </div>
+            <div
+              id="collapse14"
+              class="collapse"
+              aria-labelledby="heading14"
+              data-parent="#accordion"
+            >
+              <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
+                managing agents of the resort are always available to assist with any queries that owners may have.
               </div>
             </div>
+            <!-- </div> -->
           </div>
         </div>
       </div>

src/components/timeshare/searchTimeshare.vue

@@ -34,10 +34,7 @@
             </span>
           </div>
           <select class="form-control" name="resort" id="resort" v-model="filter.resort">
-            <option v-for="(item, i) in filteredResorts" :key="i" :value="item">
-              {
-              {item.resortName}}
-            </option>
+            <option v-for="(item, i) in filteredResorts" :key="i" :value="item">{{item.resortName}}</option>
           </select>
           <div class="input-group-append" @click="clearFilter('resort')">
             <span class="input-group-text cursor-pointer" style="color: #60CBEB">

src/components/user/timeshareIndividual.vue

@@ -10,7 +10,7 @@
       <div class="form-group row"></div>
       <div class="row" style="text-align:left">
         <div class="col-md-6">
-          <label>Name</label>
+          <label>Name *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="person-outline" fill="#60CBEB"></eva-icon>
@@ -19,7 +19,7 @@
           </div>
         </div>
         <div class="col-md-6" style="margin-bottom: 1em">
-          <label>Surname</label>
+          <label>Surname *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="book-outline" fill="#60CBEB"></eva-icon>
@@ -28,7 +28,7 @@
           </div>
         </div>
         <div class="col-md-6" style="margin-bottom: 1em">
-          <label>ID Number</label>
+          <label>ID Number *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="archive" fill="#60CBEB"></eva-icon>
@@ -37,7 +37,7 @@
           </div>
         </div>
         <div class="col-md-6" style="margin-bottom: 1em">
-          <label>Company Reg Number</label>
+          <label>Company Reg Number *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="npm-outline" fill="#60CBEB"></eva-icon>
@@ -51,7 +51,7 @@
           </div>
         </div>
         <div class="col-md-6" style="margin-bottom: 1em">
-          <label>Marital Status</label>
+          <label>Marital Status *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="people-outline" fill="#60CBEB"></eva-icon>
@@ -62,7 +62,7 @@
           </div>
         </div>
         <div class="col-md-6" style="margin-bottom: 1em">
-          <label>Email Address</label>
+          <label>Email Address *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="email-outline" fill="#60CBEB"></eva-icon>
@@ -71,7 +71,7 @@
           </div>
         </div>
         <div class="col-md-6" style="margin-bottom: 1em">
-          <label>Cell Number</label>
+          <label>Cell Number *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="smartphone-outline" fill="#60CBEB"></eva-icon>
@@ -80,7 +80,7 @@
           </div>
         </div>
         <div class="col-md-6" style="margin-bottom: 1em">
-          <label>Landline Number</label>
+          <label>Landline Number *</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
               <eva-icon name="phone-outline" fill="#60CBEB"></eva-icon>

src/router/index.js

@@ -40,13 +40,17 @@ import PrivacyPolicy from '../components/misc/privacyPolicyPage.vue';
 
 import MakeOffer from '../components/processFlow/makeOffer.vue';
 import Offer from '../components/processFlow/offers.vue';
+import searchLog from '../components/admin/logs/SearchLogs.vue';
 // import store from '../store';
 
 Vue.use(Router);
 
 export default new Router({
   scrollBehavior(to, from, savedPosition) {
-    return { x: 0, y: 0 };
+    return {
+      x: 0,
+      y: 0,
+    };
   },
   routes: [{
     path: '/',
@@ -99,7 +103,7 @@ export default new Router({
     component: PropertyPage,
   },
   {
-    path: '/property/:propertyType/search',
+    path: '/property/:propertyUsageType/search',
     name: 'PropertySearch',
     component: PropertySearch,
   },
@@ -220,5 +224,10 @@ export default new Router({
     name: 'TimeshareSearch',
     component: TimeshareSearch,
   },
+  {
+    path: '/searchLog',
+    name: 'SearchLog',
+    component: searchLog,
+  },
   ],
 });

src/store/index.js

@@ -18,6 +18,7 @@ import WeekList from './modules/timeshare/weekList';
 import Bid from './modules/processFlow/bid';
 import Authentication from './modules/user/authentication';
 import PropertySearch from './modules/property/propertySearch';
+import SearchLog from './modules/logs/searchLog';
 
 Vue.use(Vuex);
 /* eslint no-param-reassign: ["error", { "props": false }] */
@@ -41,5 +42,6 @@ export default new Vuex.Store({
     bid: Bid,
     authentication: Authentication,
     propertySearch: PropertySearch,
+    searchLog: SearchLog,
   },
 });

src/store/modules/logs/searchLog.js

@@ -0,0 +1,24 @@
+// api/searchLog/property
+import axios from 'axios';
+
+export default {
+  namespaced: true,
+  state: {
+    propertySearch: {},
+  },
+  mutations: {
+    updateSearch(state, data) {
+      state.propertySearch = [];
+      state.propertySearch = data;
+    },
+  },
+  getters: {},
+  actions: {
+    getPropertySearchLogs({ commit }) {
+      axios
+        .get('/api/searchLog/property')
+        .then(result => commit('updateSearch', result.data))
+        .catch(console.error);
+    },
+  },
+};

src/store/modules/property/property.js

@@ -55,7 +55,9 @@ export default {
       state.propertyFields = fields;
     },
     updateCurrentProperty(state, property) {
-      state.properties.push(property);
+      if (state.properties) {
+        state.properties.push(property);
+      }
     },
     clearProperty(state) {
       state.property = {

src/store/modules/property/propertyLists.js

@@ -14,7 +14,7 @@ export default {
   actions: {
     getProperties({ commit }, item) {
       axios
-        .get(`/api/property/${item.propertyType}/${item.user}`)
+        .get(`/api/property/${item.propertyType}/All`) // .get(`/api/property/${item.propertyType}/${item.user}`)
         .then(result => commit('setProperties', result.data))
         .catch(console.error);
     },

src/store/modules/property/propertySearch.js

@@ -39,7 +39,7 @@ export default {
     getPropertySearchObject({ commit }) {
       const search = {
         userID: 0,
-        keyword: '',
+        keyword: 'All',
         salesType: 'Sale',
         propertyUsageType: 'All',
         propertyType: 'All',
@@ -50,8 +50,13 @@ export default {
       commit('setPropertySearch', search);
     },
     searchProperties({ commit }, item) {
+      if (item.keyword === '') {
+        item.keyword = 'All';
+      }
       axios
-        .post('/api/Property/Search', item)
+        .get(
+          `/api/Property/Search/${item.userID}/${item.keyword}/${item.salesType}/${item.propertyUsageType}/${item.propertyType}/${item.province}/${item.city}/${item.suburb}`,
+        )
         .then(result => commit('updateSearch', result.data))
         .catch(console.error);
     },

src/store/modules/user/register.js

@@ -3,6 +3,8 @@ import axios from 'axios';
 export default {
   namespaced: true,
   state: {
+    individuals: [],
+    agents: [],
     registerIndividual: {
       name: '',
       surname: '',
@@ -29,6 +31,12 @@ export default {
     setIndividual(state, type) {
       state.registerIndividual = type;
     },
+    setIndividuals(state, type) {
+      state.individuals = type;
+    },
+    setAgents(state, type) {
+      state.agents = type;
+    },
     setAgency(state, type) {
       state.registerAgency = type;
     },
@@ -38,6 +46,9 @@ export default {
     addAgency(state, type) {
       state.registerAgency = type;
     },
+    addAgent(state, type) {
+      state.registerIndividual = type;
+    },
     updateIndividual(state, type) {
       state.registerIndividual.find(item => item.id === type.id).username = type.username;
       state.registerIndividual.find(item => item.id === type.id).password = type.password;
@@ -82,14 +93,22 @@ export default {
   },
   getters: {},
   actions: {
-    // getIndividual({
-    //   commit,
-    // }, id) {
-    //   axios
-    //     .get(`/api/user/${id}`)
-    //     .then(result => commit('setIndividual', result.data))
-    //     .catch(console.error);
-    // },
+    getIndividuals({
+      commit,
+    }) {
+      axios
+        .get('/api/individual')
+        .then(result => commit('setIndividuals', result.data))
+        .catch(console.error);
+    },
+    getAgents({
+      commit,
+    }) {
+      axios
+        .get('/api/agent')
+        .then(result => commit('setAgents', result.data))
+        .catch(console.error);
+    },
     // getAgency({
     //   commit,
     // }, id) {
@@ -115,6 +134,14 @@ export default {
         .then(result => commit('addAgency', result.data))
         .catch(console.error);
     },
+    saveAgent({
+      commit,
+    }, item) {
+      axios
+        .post('/api/agent', item)
+        .then(result => commit('addAgent', result.data))
+        .catch(console.error);
+    },
     // updateIndividual({
     //   commit,
     // }, item) {