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

src/App.vue

@@ -1,5 +1,8 @@
 <template>
   <div id="app">
+    <a href="#" class="back-to-top">
+      <i class="fa fa-chevron-up"></i>
+    </a>
     <div class="click-closed"></div>
     <SearchTab />
     <NavBar @routerGoTo="routerGoTo" />

src/components/misc/privacyPolicyPage.vue

@@ -1,45 +1,53 @@
 <template>
   <!-- eslint-disable max-len -->
   <div class="container">
-    <section class="intro-single">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-12 col-lg-8">
-            <div class="title-single-box">
-              <h1 class="title-single" style="text-align:left;">Privacy Policy</h1>
-            </div>
-          </div>
+    <div class="row">
+      <div class="col-sm-12">
+        <div class="about-img-box">
+          <img
+            src="img/privacy.jpg"
+            alt="Privacy Policy"
+            class="img-fluid"
+            style="width:800px;height:400px;"
+          />
+        </div>
+        <div class="sinse-box">
+          <h3 class="sinse-title">
+            Privacy Policy
+            <span></span>
+          </h3>
         </div>
       </div>
-    </section>
-    <div class="col-md-12 text-left">
-      <h3>Privacy</h3>
-      <p>We respect your privacy. This Privacy Policy governs the manner in which we will treat your personal information collected when using our website.</p>
+      <div class="col-md-12 text-left">
+        <br />
+        <h3>Privacy</h3>
+        <p>We respect your privacy. This Privacy Policy governs the manner in which we will treat your personal information collected when using our website.</p>
 
-      <h3>How do we collect your personal information?</h3>
-      <p>Your personal information may be collected while using this website: when you contact us, when you complete an application form, when you check-in at your destination or when you make use of the services of one of our affiliated business partners. Personal information includes any information by which you can be identified and which relates to you as an identifiable individual, such as: your name, physical and postal addresses, email address, sex, age and internet address from the domain from which you are visiting.</p>
+        <h3>How do we collect your personal information?</h3>
+        <p>Your personal information may be collected while using this website: when you contact us, when you complete an application form, when you check-in at your destination or when you make use of the services of one of our affiliated business partners. Personal information includes any information by which you can be identified and which relates to you as an identifiable individual, such as: your name, physical and postal addresses, email address, sex, age and internet address from the domain from which you are visiting.</p>
 
-      <h3>User of your personal information</h3>
-      <p>We need to process your personal information when you make use of our service. We use your personal information in the ordinary course of our business and to send you marketing material relating to our service offering. You can unsubscribe at any time and we will thereafter no longer use your personal information. We will not disclose your personal information to third parties unless justifiable in terms of an agreement between us.</p>
+        <h3>User of your personal information</h3>
+        <p>We need to process your personal information when you make use of our service. We use your personal information in the ordinary course of our business and to send you marketing material relating to our service offering. You can unsubscribe at any time and we will thereafter no longer use your personal information. We will not disclose your personal information to third parties unless justifiable in terms of an agreement between us.</p>
 
-      <h3>Access to and correction of personal information</h3>
-      <p>You may access your personal information that we hold by sending an email to: info@univateproperties.co.za</p>
-      <p>In the event that you want to update or correct your personal information held by us, you can send an email to: info@univateproperties.co.za</p>
+        <h3>Access to and correction of personal information</h3>
+        <p>You may access your personal information that we hold by sending an email to: info@univateproperties.co.za</p>
+        <p>In the event that you want to update or correct your personal information held by us, you can send an email to: info@univateproperties.co.za</p>
 
-      <h3>Protection of your personal information</h3>
-      <p>We take reasonable steps and measures to keep your information secure from loss, misuse or unauthorised alteration. Our database has built-in safeguards to ensure the privacy and confidentiality of your information. We do not have control over the websites of affiliated parties or sites linked into from this site and you must therefore refer to the privacy policies of any such parties to see how they protect your personal information.</p>
+        <h3>Protection of your personal information</h3>
+        <p>We take reasonable steps and measures to keep your information secure from loss, misuse or unauthorised alteration. Our database has built-in safeguards to ensure the privacy and confidentiality of your information. We do not have control over the websites of affiliated parties or sites linked into from this site and you must therefore refer to the privacy policies of any such parties to see how they protect your personal information.</p>
 
-      <h3>Cookies</h3>
-      <p>We may use cookies. Cookies are programmes that we transfer to your computer's hard drive to personalise your experience on this website. In this way, the next time you visit, we will know who you are and that you have visited this website before. This will enable us to enhance your browsing experience. You can set your browser to notify you if cookies are to be transferred or to reject cookies but this may prevent your use of some of the web pages.</p>
+        <h3>Cookies</h3>
+        <p>We may use cookies. Cookies are programmes that we transfer to your computer's hard drive to personalise your experience on this website. In this way, the next time you visit, we will know who you are and that you have visited this website before. This will enable us to enhance your browsing experience. You can set your browser to notify you if cookies are to be transferred or to reject cookies but this may prevent your use of some of the web pages.</p>
 
-      <h3>Email Monitoring</h3>
-      <p>We provide email addresses on the website which enable you to contact us. Forms that you complete via this website will also be transmitted via email. In order to check for viruses and to monitor service we reserve the right to monitor and inspect all material and information transmitted over our system.</p>
+        <h3>Email Monitoring</h3>
+        <p>We provide email addresses on the website which enable you to contact us. Forms that you complete via this website will also be transmitted via email. In order to check for viruses and to monitor service we reserve the right to monitor and inspect all material and information transmitted over our system.</p>
 
-      <h3>Changes to this privacy policy</h3>
-      <p>We reserve the right, in our sole discretion, to amend this Privacy Policy from time to time. You agree to review the Privacy Policy whenever you visit this website for any such amendments. The amended version of the Privacy Policy shall supersede and replace all previous versions thereof.</p>
+        <h3>Changes to this privacy policy</h3>
+        <p>We reserve the right, in our sole discretion, to amend this Privacy Policy from time to time. You agree to review the Privacy Policy whenever you visit this website for any such amendments. The amended version of the Privacy Policy shall supersede and replace all previous versions thereof.</p>
 
-      <h3>Which laws apply to your dealings with us?</h3>
-      <p>This policy will be governed and interpreted in accordance with the laws of South Africa. To the extent that a court has jurisdiction over any dispute which may arise out of or in connection with this Privacy Policy, we both submit to the jurisdiction of the South African Courts.</p>
+        <h3>Which laws apply to your dealings with us?</h3>
+        <p>This policy will be governed and interpreted in accordance with the laws of South Africa. To the extent that a court has jurisdiction over any dispute which may arise out of or in connection with this Privacy Policy, we both submit to the jurisdiction of the South African Courts.</p>
+      </div>
     </div>
   </div>
 </template>

src/components/property/propertySearchFields.vue

@@ -1,87 +1,129 @@
 <template>
   <div>
-    <div class="col-md-6 mb-2">
+    <div class="container text-left">
       <div class="form-group">
         <label for="city">For:</label>
-        <select
-          class="form-control form-control-lg form-control-a"
-          id="forSelector"
-          v-model="selectedType"
-          @change="TypeSelected"
-        >
-          <option value="Sale">Sale</option>
-          <option value="Rent">Rent</option>
-        </select>
+        <div class="input-group mb-3">
+          <div class="input-group-prepend">
+            <span class="input-group-text" style="color: #60CBEB">
+              <b>F</b>
+            </span>
+          </div>
+          <select
+            class="form-control form-control-lg form-control-a"
+            id="forSelector"
+            v-model="selectedType"
+            @change="TypeSelected"
+          >
+            <option value="Sale">Sale</option>
+            <option value="Rent">Rent</option>
+          </select>
+        </div>
       </div>
       <div class="form-group" v-if="propertyType === 'Residential'">
-        <label for="city">Property Type</label>
-        <select
-          class="form-control form-control-lg form-control-a"
-          id="forSelector"
-          v-model="selectedPropertyTypeRes"
-          @change="PropertyTypeSelected"
-        >
-          <option>All</option>
-          <option
-            v-for="(propertyType, i) in propertyTypesRes"
-            :key="i"
-          >{{ propertyType.description }}</option>
-        </select>
+        <label for="propertytype">Property Type</label>
+        <div class="input-group mb-3">
+          <div class="input-group-prepend">
+            <span class="input-group-text" style="color: #60CBEB">
+              <b>T</b>
+            </span>
+          </div>
+          <select
+            class="form-control form-control-lg form-control-a"
+            id="forSelector"
+            v-model="selectedPropertyTypeRes"
+            @change="PropertyTypeSelected"
+          >
+            <option>All</option>
+            <option
+              v-for="(propertyType, i) in propertyTypesRes"
+              :key="i"
+            >{{ propertyType.description }}</option>
+          </select>
+        </div>
       </div>
       <div v-else class="form-group">
-        <label for="city">Property Type</label>
-        <select
-          class="form-control form-control-lg form-control-a"
-          id="forSelector"
-          v-model="selectedPropertyTypeCom"
-          @change="PropertyTypeSelected"
-        >
-          <option>All</option>
-          <option
-            v-for="(propertyType, i) in propertyTypesCom"
-            :key="i"
-          >{{ propertyType.description }}</option>
-        </select>
+        <label for="propertytype">Property Type</label>
+        <div class="input-group mb-3">
+          <div class="input-group-prepend">
+            <span class="input-group-text" style="color: #60CBEB">
+              <b>T</b>
+            </span>
+          </div>
+          <select
+            class="form-control form-control-lg form-control-a"
+            id="forSelector"
+            v-model="selectedPropertyTypeCom"
+            @change="PropertyTypeSelected"
+          >
+            <option>All</option>
+            <option
+              v-for="(propertyType, i) in propertyTypesCom"
+              :key="i"
+            >{{ propertyType.description }}</option>
+          </select>
+        </div>
       </div>
       <div class="form-group">
-        <label for="city">Province</label>
-        <select
-          class="form-control form-control-lg form-control-a"
-          id="provinceselector"
-          @change="ProvinceSelected"
-          v-model="selectedProvince"
-        >
-          <option>All</option>
-          <option v-for="(province, i) in provinces" :key="i">{{ province.description }}</option>
-        </select>
+        <label for="province">Province</label>
+        <div class="input-group mb-3">
+          <div class="input-group-prepend">
+            <span class="input-group-text" style="color: #60CBEB">
+              <b>P</b>
+            </span>
+          </div>
+          <select
+            class="form-control form-control-lg form-control-a"
+            id="provinceselector"
+            @change="ProvinceSelected"
+            v-model="selectedProvince"
+          >
+            <option>All</option>
+            <option v-for="(province, i) in provinces" :key="i">{{ province.description }}</option>
+          </select>
+        </div>
       </div>
     </div>
-    <div class="col-md-6 mb-2">
+    <div class="container text-left">
       <div class="form-group">
         <label for="city">City</label>
-        <select
-          class="form-control form-control-lg form-control-a"
-          id="cityselector"
-          @change="CitySelected"
-          v-model="selectedCity"
-        >
-          <option>All</option>
-          <option v-for="(city, i) in cities" :key="i">{{ city.description }}</option>
-        </select>
+        <div class="input-group mb-3">
+          <div class="input-group-prepend">
+            <span class="input-group-text" style="color: #60CBEB">
+              <b>C</b>
+            </span>
+          </div>
+          <select
+            class="form-control form-control-lg form-control-a"
+            id="cityselector"
+            @change="CitySelected"
+            v-model="selectedCity"
+          >
+            <option>All</option>
+            <option v-for="(city, i) in cities" :key="i">{{ city.description }}</option>
+          </select>
+        </div>
       </div>
     </div>
-    <div class="col-md-6 mb-2">
+    <div class="container text-left">
       <div class="form-group">
-        <label for="city">Suburb</label>
-        <select
-          class="form-control form-control-lg form-control-a"
-          id="suburbselector"
-          v-model="selectedSuburb"
-          @change="SuburbSelected"
-        >
-          <option>All</option>
-          <option v-for="(suburb, i) in suburbs" :key="i">{{ suburb.description }}</option>
-        </select>
+        <label for="suburb">Suburb</label>
+        <div class="input-group mb-3">
+          <div class="input-group-prepend">
+            <span class="input-group-text" style="color: #60CBEB">
+              <b>S</b>
+            </span>
+          </div>
+          <select
+            class="form-control form-control-lg form-control-a"
+            id="suburbselector"
+            v-model="selectedSuburb"
+            @change="SuburbSelected"
+          >
+            <option>All</option>
+            <option v-for="(suburb, i) in suburbs" :key="i">{{ suburb.description }}</option>
+          </select>
+        </div>
       </div>
     </div>
   </div>

src/components/shared/footerSection.vue

@@ -112,14 +112,14 @@
             </div>
             <div class="credits">
               Site created by
-              <router-link to="https://provision-sa.com">
+              <a href="http://www.provision-sa.co.za/">
                 <img
                   src="img/logos/provision-logocropped.png"
                   alt
                   class="Provision Logo"
                   style="width: 250px; height:15px;"
                 />
-              </router-link>
+              </a>
             </div>
           </div>
         </div>

src/components/shared/navBar.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- eslint-disable max-len -->
   <nav class="navbar navbar-default navbar-trans navbar-expand-lg fixed-top">
-    <div class="container">
+    <div class="container-fluid">
       <button
         class="navbar-toggler collapsed"
         type="button"
@@ -16,6 +16,12 @@
         <span></span>
       </button>
       <a class="navbar-brand text-brand" @click="routerGoTo('/')">
+        <img
+          class="img-fluid"
+          src="/img/logos/UVProp.png"
+          alt="Voasa Logo"
+          style="width:90px;height:45px;"
+        />
         Uni-Vate
         <span class="color-b">Properties</span>
       </a>

src/components/shared/searchTab.vue

@@ -2,14 +2,14 @@
   <!-- eslint-disable max-len -->
   <div class="box-collapse">
     <div class="title-box-d">
-      <h3 class="title-d">Search</h3>
+      <h3 class="title-d" style="text-align:left">Search</h3>
     </div>
     <span class="close-box-collapse right-boxed ion-ios-close"></span>
     <div class="box-collapse-wrap">
       <form class="form-a">
         <div class="row">
           <div class="col-md-12 mb-2">
-            <div class="form-group">
+            <div class="form-group" style="text-align:left">
               <label for="Type">Keyword</label>
               <input
                 type="text"

src/components/timeshare/buy/weekListPage.vue

@@ -1,13 +1,32 @@
 <template>
-  <div>
-    <br />
-    <br />
+  <!-- eslint-disable max-len -->
+  <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 Results</h1>
+        </div>
+        <br />
+      </div>
+      <!-- <div class="row mb-4">
+        <div class="col-md-4">
+          <img />
+        </div>
+        <div class="col-md-4">
+          <img />
+        </div>
+        <div class="col-md-4">
+          <img />
+        </div>
+      </div>-->
+    </div>
     <br />
     <WeekListComponent />
+    <br />
   </div>
 </template>
 <script>

src/store/modules/property/property.js

@@ -36,7 +36,7 @@ export default {
   },
   mutations: {
     setProperty(state, property) {
-      state.property = property;
+      state.properties.push(property);
     },
     setPropertyImages(state, images) {
       state.propertyImages = images;
@@ -57,7 +57,7 @@ export default {
       state.propertyFields = fields;
     },
     updateCurrentProperty(state, property) {
-      state.property = property;
+      state.properties.push(property);
     },
     updateSearch(state, propertySearch) {
       state.properties = propertySearch;