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

src/App.vue

@@ -6,7 +6,7 @@
     <div v-if="!isLandingPage" class="click-closed"></div>
     <NavBar v-if="!isLandingPage" @routerGoTo="routerGoTo" />
     <div v-if="!isLandingPage"></div>
-    <router-view @setLandingPage="setLandingPage" />
+    <router-view @setLandingPage="setLandingPage" style="margin-top:190px" />
     <FooterSection v-if="!isLandingPage" />
   </div>
 </template>
@@ -20,12 +20,12 @@ export default {
   name: "app",
   data() {
     return {
-      isLandingPage: false,
+      isLandingPage: false
     };
   },
   components: {
     NavBar,
-    FooterSection,
+    FooterSection
   },
 
   methods: {
@@ -34,8 +34,8 @@ export default {
     },
     setLandingPage(item) {
       this.isLandingPage = item;
-    },
-  },
+    }
+  }
 };
 </script>
 

src/components/home/carouselSection.vue

@@ -223,32 +223,35 @@ export default {
 /* Extra small devices (phones, 600px and down) */
 @media only screen and (max-width: 600px) {
   .introContentAdjust {
-    margin-top: -35px !important;
+    margin-top: 140px !important;
   }
 }
 
 /* Small devices (portrait tablets and large phones, 600px and up) */
 @media only screen and (min-width: 600px) {
   .introContentAdjust {
-    margin-top: -15px !important;
+    margin-top: 150px !important;
   }
 }
 
 /* Medium devices (landscape tablets, 768px and up) */
 @media only screen and (min-width: 768px) {
+  .introContentAdjust {
+    margin-top: 160px !important;
+  }
 }
 
 /* Large devices (laptops/desktops, 992px and up) */
 @media only screen and (min-width: 992px) {
   .introContentAdjust {
-    margin-top: 25px !important;
+    margin-top: 160px !important;
   }
 }
 
 /* Extra large devices (large laptops and desktops, 1200px and up) */
 @media only screen and (min-width: 1200px) {
   .introContentAdjust {
-    margin-top: 0px !important;
+    margin-top: 120px !important;
   }
 }
 </style>

src/components/property/commercial/createProperty/commercialCreate.vue

@@ -1,11 +1,10 @@
 <template>
   <div>
     <carouselSection :salesType="salesType" />
-
     <main id="main" style="margin-top:-20px">
       <div class="container pt-5 pb-5">
         <div class="row">
-          <div class="col-md-5">
+          <div class="col-md-6">
             <div v-if="!property.propertyName">
               <label for="propertyName" class="uniSelectLabel">PROPERTY NAME</label>
             </div>
@@ -16,7 +15,20 @@
               v-model="property.propertyName"
             />
           </div>
-          <div class="col-md-5">
+          <div class="col-md-6">
+            <div v-if="!property.propertyRef">
+              <label for="propertyName" class="uniSelectLabel">PROPERTY REFERENCE</label>
+            </div>
+            <input
+              class="form-control uniInput"
+              type="text"
+              name="propertyRef"
+              v-model="property.propertyRef"
+            />
+          </div>
+        </div>
+        <div class="row my-5">
+          <div class="col-md-6">
             <select
               class="form-control uniSelect"
               name="propertyType"

src/components/property/commercial/singleView/contentSection.vue

@@ -3,7 +3,7 @@
     <div class="container">
       <div class="row" id="resort-profile">
         <div class="col-md-4">
-          <div class="resPortfolioSection">
+          <div class="resPortfolioSection" style="margin-top:-5px">
             <div v-for="(image, i) in propertyImages" @click="index = i" :key="i">
               <div v-if="i < 3">
                 <img v-if="i === 0" style="width:100%; height:201px;object-fit: cover" :src="image" />

src/components/property/propertyCard.vue

@@ -15,7 +15,7 @@
                   <img :src="currentProperty.displayImage" alt="" />
                 </div>
                 <h1>{{ currentProperty.suburb }}</h1>
-                <a href="#"> </a>
+                <p><strong>Property Reference</strong> #{{ currentProperty.id }}</p>
               </div>
             </router-link>
           </div>
@@ -27,7 +27,7 @@
                   <img :src="currentProperty.displayImage" alt="" />
                 </div>
                 <h1>{{ currentProperty.suburb }}</h1>
-                <a href="#"> </a>
+                <p><strong>Property Reference</strong> #{{ currentProperty.id }}</p>
               </div>
             </router-link>
           </div>

src/components/property/residential/createProperty/residentialCreate.vue

@@ -5,7 +5,7 @@
     <main id="main" style="margin-top:-20px">
       <div class="container pt-5 pb-5">
         <div class="row">
-          <div class="col-md-5">
+          <div class="col-md-6">
             <div v-if="!property.propertyName">
               <label for="propertyName" class="uniSelectLabel">PROPERTY NAME</label>
             </div>
@@ -16,7 +16,20 @@
               v-model="property.propertyName"
             />
           </div>
-          <div class="col-md-5">
+          <div class="col-md-6">
+            <div v-if="!property.propertyRef">
+              <label for="propertyName" class="uniSelectLabel">PROPERTY REFERENCE</label>
+            </div>
+            <input
+              class="form-control uniInput"
+              type="text"
+              name="propertyRef"
+              v-model="property.propertyRef"
+            />
+          </div>
+        </div>
+        <div class="row my-5">
+          <div class="col-md-6">
             <select
               class="form-control uniSelect"
               name="propertyType"

src/components/property/residential/singleView/contentSection.vue

@@ -37,6 +37,13 @@
             v-if="property.showAddress"
           >{{ property.propertyName }} / {{ property.streetNumber }} {{ property.streetName }}</h2>
           <h2 v-else>{{ property.propertyName }}</h2>
+          <div class="container">
+            <div class="row">
+              <div class="col">
+                <p v-html="property.description"></p>
+              </div>
+            </div>
+          </div>
           <div>
             <!-- <table class="table table-striped">
               <thead>

src/components/property/residential/singleView/singleResidentialPage.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <carouselSection v-if="propertyImages.length > 0" :propertyImages="propertyImages" />
-    <main id="main" style="margin-top:-20px">
+    <main id="main">
       <contentSection
         v-if="propertyImages.length > 0"
         :property="property"

src/components/propertyManagement/rentalManagement/carouselSecitonNew.vue

@@ -1,61 +0,0 @@
-<template>
-  <section id="intro">
-    <div class="container">
-      <div class="row">
-        <div align="left" class="col-sm-12 col-md-8">
-          <div class="intro-content box">
-            <h2>Let us manage your property</h2>
-            <p>
-              At Uni-Vate we appreciate the significant and positive relationship between effective
-              Property Management and property prices. We understand that effective management not
-              only relies on administrative processes being intact, but also on a clear plan and
-              good communication with our clients based on respect, trust understanding, openness
-              and accountability. We have access to a comprehensive set of human and other resources
-              to ensure that your property is proactively managed to protect your investment and to
-              ensure the contentedness of occupants. We offer comprehensive property management
-              services, whether it being Sectional Title Management, HOA Management or Rental
-              Property Portfolio Management.
-            </p>
-            <a href="#" class="btn-solid-blue">LIST YOUR PROPERTY WITH UNI-VATE PROPERTIES</a>
-            <router-link v-if="!isLoggedIn" to="/user/login" class="btn-white-border"
-              >LOGIN TO OWNERS PORTAL</router-link
-            >
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <carousel
-      :nav="false"
-      :dots="false"
-      :items="1"
-      :autoplay="true"
-      :loop="true"
-      :autoHeight="true"
-      id="intro-carousel"
-      style="margin-top:-50px;"
-      :responsive="{ 0: { items: 1, nav: false }, 600: { items: 1, nav: false } }"
-    >
-      <img class="item" src="/img/intro-carousel/home-1.jpg" alt="" />
-      <img class="item" src="/img/intro-carousel/16.jpg" alt="" />
-      <img class="item" src="/img/intro-carousel/comm-1.jpg" alt="" />
-      <img class="item" src="/img/intro-carousel/comm-4.jpg" alt="" />
-      <img class="item" src="/img/intro-carousel/3.jpg" alt="" />
-      <img class="item" src="/img/intro-carousel/home-5.jpg" alt="" />
-    </carousel>
-
-    <div id="intro-carousel" class="owl-carousel"></div>
-  </section>
-</template>
-
-<script>
-/* eslint-disable */
-import carousel from "vue-owl-carousel";
-export default {
-  components: {
-    carousel
-  }
-};
-</script>
-
-<style lang="scss" scoped></style>

src/components/propertyManagement/rentalManagement/contentSection.vue

@@ -19,7 +19,12 @@
       <div class="row">
         <div class="col-md-6"></div>
         <div class="col-md-6">
-          <h4>Contact us for a quote</h4>
+          <h4
+            style="cursor:pointer"
+            @click="$vuetify.goTo('#contactFoot', { duration: 2000, easing: 'easeInOutCubic' })"
+          >
+            Contact us for a quote
+          </h4>
         </div>
       </div>
 

src/components/propertyManagement/sectionalTitle/ourServicesSection.vue

@@ -18,7 +18,12 @@
       <div class="row mt-2">
         <div class="col-md-6"></div>
         <div class="col-md-6">
-          <h4>Contact us for a quote</h4>
+          <h4
+            style="cursor:pointer"
+            @click="$vuetify.goTo('#contactFoot', { duration: 2000, easing: 'easeInOutCubic' })"
+          >
+            Contact us for a quote
+          </h4>
         </div>
       </div>
       <div class="row">

src/components/shared/footerSection.vue

@@ -18,16 +18,18 @@
               <a href="commercial.php">Rent Commercial Property</a><br />
               <a href="residential.php">Buy Residential Property</a><br />
               <a href="residential.php">Rent Residential Property</a><br /> -->
-              <router-link class="footerText" v-if="isLoggedIn" to="/properties"
+              <router-link v-if="isLoggedIn" class="footerText" to="/properties"
                 >Property Management</router-link
-              ><br />
+              ><br v-if="isLoggedIn" />
+              <router-link to="/property/residential">Residential Property</router-link><br />
+              <router-link to="/property/commercial">Commercial Property</router-link><br />
               <router-link class="footerText" to="/privacyPolicy">Privacy Policy</router-link><br />
               <router-link class="footerText" to="/websiteDisclaimer"
                 >Website Disclaimer</router-link
               ><br />
             </p>
           </div>
-          <div class="col-lg-9 section-header">
+          <div class="col-lg-9 section-header" id="contactFoot">
             <h2 align="left">Contact Us</h2>
             <div class="row">
               <div class="col-md-4">
@@ -88,9 +90,9 @@
           <div class="col-md-12">
             <div class="copyright-footer">
               <p class="copyright color-text-a">
-                &copy; Copyright
+                Copyright © {{ currentYear }} Copyright
                 <span class="color-a">
-                  <b>Univate Properties</b>
+                  <b>Uni-Vate Properties.</b>
                 </span>
                 All Rights Reserved.
               </p>
@@ -138,6 +140,10 @@ export default {
     // eslint-disable-next-line vue/return-in-computed-property
     Logout() {
       return this.logout();
+    },
+    currentYear() {
+      var d = new Date();
+      return d.getFullYear();
     }
   }
 };

src/components/shared/navBar.vue

@@ -3,7 +3,7 @@
     <!-- <button type="button" id="mobile-nav-toggle">
       <i class="fa fa-bars"></i>
     </button> -->
-    <div id="header-sticky-wrapper" class="sticky-wrapper is-sticky" style="min-height: 120px;">
+    <div>
       <header id="header" style="width: 100%; position: fixed; top:0px; z-index: 50;">
         <div class="container">
           <div class="row">
@@ -16,7 +16,7 @@
                   style="height:100px;"
               /></a>
             </div>
-            <div class="col-md-9" id="topbar">
+            <div id="topbar" class="col-md-9">
               <div class="container clearFix">
                 <div class="social-links  ">
                   <a href="mailto:info@univateproperties.co.za">
@@ -38,34 +38,9 @@
                   </a>
                 </div>
               </div>
-
               <nav id="nav-menu-container">
                 <ul class="nav-menu sf-js-enabled sf-arrows">
-                  <li class="menu-has-children">
-                    <div
-                      @mouseover="timeShareClass = 'ts-display'"
-                      @mouseleave="timeShareClass = 'no-display'"
-                    ></div>
-                    <a href="#" class="sf-with-ul">
-                      Timeshare
-                    </a>
-                    <ul style="margin-top:-10px;text-align:left" :class="timeShareClass">
-                      <li>
-                        <router-link to="/timeshare/buy">To Buy</router-link>
-                      </li>
-                      <li>
-                        <router-link to="/timeshare/sell">To Sell</router-link>
-                      </li>
-                      <li>
-                        <router-link to="/timeshare/faq">FAQ</router-link>
-                      </li>
-                      <li v-if="isLoggedIn">
-                        <hr />
-                        <router-link to="/timeshare/myWeeks">My Timeshare Weeks</router-link>
-                      </li>
-                    </ul>
-                  </li>
-                  <li class="menu-has-children">
+                  <li class="menu-has-children" style="margin-left:-20px">
                     <div
                       @mouseover="commercialClass = 'ts-display'"
                       @mouseleave="commercialClass = 'no-display'"
@@ -86,7 +61,7 @@
                       </li>
                     </ul>
                   </li>
-                  <li class="menu-has-children">
+                  <li class="menu-has-children mx-1">
                     <div
                       @mouseover="residentialClass = 'ts-display'"
                       @mouseleave="residentialClass = 'no-display'"
@@ -107,6 +82,30 @@
                       </li>
                     </ul>
                   </li>
+                  <li class="menu-has-children mx-1">
+                    <div
+                      @mouseover="timeShareClass = 'ts-display'"
+                      @mouseleave="timeShareClass = 'no-display'"
+                    ></div>
+                    <a href="#" class="sf-with-ul">
+                      Timeshare
+                    </a>
+                    <ul style="margin-top:-10px;text-align:left" :class="timeShareClass">
+                      <li>
+                        <router-link to="/timeshare/buy">To Buy</router-link>
+                      </li>
+                      <li>
+                        <router-link to="/timeshare/sell">To Sell</router-link>
+                      </li>
+                      <li>
+                        <router-link to="/timeshare/faq">FAQ</router-link>
+                      </li>
+                      <li v-if="isLoggedIn">
+                        <hr />
+                        <router-link to="/timeshare/myWeeks">My Timeshare Weeks</router-link>
+                      </li>
+                    </ul>
+                  </li>
                   <!-- <li class="menu-has-children">
                     <div
                       @mouseover="propertiesClass = 'ts-display'"
@@ -131,7 +130,7 @@
                       </li>
                     </ul>
                   </li> -->
-                  <li class="menu-has-children">
+                  <li class="menu-has-children mx-1">
                     <div
                       @mouseover="propManClass = 'ts-display'"
                       @mouseleave="propManClass = 'no-display'"
@@ -152,7 +151,7 @@
                       </li>
                     </ul>
                   </li>
-                  <li class="menu-has-children">
+                  <li class="menu-has-children mx-1">
                     <div
                       @mouseover="aboutClass = 'ts-display'"
                       @mouseleave="aboutClass = 'no-display'"
@@ -169,10 +168,10 @@
                       </li>
                     </ul>
                   </li>
-                  <li>
+                  <li class="mx-1">
                     <router-link to="/share/contact">Contact Us</router-link>
                   </li>
-                  <li v-if="isLoggedIn" class="menu-has-children">
+                  <li v-if="isLoggedIn" class="menu-has-children mx-1">
                     <div
                       @mouseover="userClass = 'ts-display'"
                       @mouseleave="userClass = 'no-display'"
@@ -235,14 +234,17 @@
                         <router-link to="/landingPages">Landing Pages / Campaignes</router-link>
                       </li>
                       <li>
-                        <a class="btn-white-border p-2" @click="logout(routerGoTo('/user/login'))"
-                          >Logout</a
+                        <router-link class="btn-white-border p-2" to="/user/login"
+                          >Logout</router-link
                         >
                       </li>
                     </ul>
                   </li>
+
                   <li v-if="!isLoggedIn">
-                    <router-link class="btn-white-border p-2" to="/user/login">Login</router-link>
+                    <router-link class="btn-white-border p-2 ml-1 mr-1" to="/user/login"
+                      >Login</router-link
+                    >
                   </li>
 
                   <li v-if="!isLoggedIn" class="menu-has-children">
@@ -250,10 +252,10 @@
                       @mouseover="registerClass = 'ts-display'"
                       @mouseleave="registerClass = 'no-display'"
                     ></div>
-                    <a href="#" class="sf-with-ul btn-solid-blue pt-2 pb-1" style="height:39px">
+                    <a href="#" class="sf-with-ul btn-solid-blue pt-2 pb-1" style="height:39px;">
                       Register
                     </a>
-                    <ul style="margin-top:-10px;text-align:left" :class="registerClass">
+                    <ul style="margin-top:-10px;" :class="registerClass">
                       <li>
                         <router-link to="/user/register">Register</router-link>
                       </li>
@@ -343,7 +345,10 @@ export default {
     },
     // eslint-disable-next-line vue/return-in-computed-property
     Logout() {
-      return this.logout();
+      this.logout().then(res => {
+        console.log("something");
+      });
+      //return this.logout();
     }
   }
 };
@@ -377,7 +382,7 @@ export default {
   }
 
   #header {
-    min-height: 145px;
+    min-height: 120px;
   }
 }
 
@@ -391,15 +396,21 @@ export default {
 /* Medium devices (landscape tablets, 768px and up) */
 @media only screen and (min-width: 768px) {
   #header {
-    min-height: 120px;
+    height: 170px;
   }
 }
 
 /* Large devices (laptops/desktops, 992px and up) */
 @media only screen and (min-width: 992px) {
+  #header {
+    height: 165px;
+  }
 }
 
 /* Extra large devices (large laptops and desktops, 1200px and up) */
 @media only screen and (min-width: 1200px) {
+  #header {
+    height: 120px;
+  }
 }
 </style>

src/components/timeshare/buy/latestWeeks.vue

@@ -3,14 +3,15 @@
     <div class="container">
       <div v-if="boolLoaded" class="row">
         <div v-for="week in latestWeeks" :key="week.id" class="col-lg-3 col-md-4 col-sm-6">
-          <div class="portfolio-item justify-content-md-center" style="min-height:430px">
-            <img :src="week.image" alt="" />
+          <div class="portfolio-item justify-content-md-center my-3" style="min-height:430px">
+            <img :src="week.image" alt="" style="max-height: 250px" />
             <div class="my-3">
               <h4>{{ week.resort.resortName }}</h4>
               <p>
                 <strong>Week</strong> {{ week.weekNumber }} &nbsp;|&nbsp;
                 <strong>Season</strong> Peak <br />
-                <strong>Levy</strong> R{{ week.levyAmount }}
+                <strong>Levy</strong> R{{ week.levyAmount }} &nbsp;|&nbsp;
+                <strong>Week Reference</strong> #{{ week.id }}
               </p>
               <h4>R{{ week.sellPrice }}</h4>
               <router-link :to="'/resort/' + week.resort.resortCode" class="btn-white-border"

src/components/timeshare/buy/weekListComponent.vue

@@ -4,6 +4,7 @@
       <table class="table table-striped table-responsive">
         <thead>
           <tr>
+            <th scope="col">Reference</th>
             <th scope="col">Unit</th>
             <th scope="col">Module</th>
             <th scope="col">Bedrooms</th>
@@ -14,6 +15,7 @@
         </thead>
         <tbody>
           <tr v-for="(item, i) in filteredWeeks" :key="i">
+            <td>#{{ item.id }}</td>
             <td>{{ item.unitNumber }}</td>
             <td>{{ item.weekNumber }}</td>
             <td>{{ item.bedrooms }}</td>
@@ -66,15 +68,15 @@ import { mapState, mapActions, mapGetters } from "vuex";
 export default {
   props: {
     resortCode: undefined,
-    userId: undefined,
+    userId: undefined
   },
   components: {},
   computed: {
     ...mapState("weekList", ["weeks", "status"]),
     ...mapGetters({
       filteredWeeks: "weekList/filteredWeeks",
-      getRegions: "weekList/getRegions",
-    }),
+      getRegions: "weekList/getRegions"
+    })
   },
   mounted() {
     if (this.resortCode) {
@@ -86,8 +88,8 @@ export default {
     View(item) {
       this.$router.push(`/resort/${item.resort.resortCode}/${item.unitNumber}`);
     },
-    ...mapActions("weekList", ["getWeeks", "applyResortFilter"]),
-  },
+    ...mapActions("weekList", ["getWeeks", "applyResortFilter"])
+  }
 };
 </script>
 

src/components/timeshare/resort/unit/summarySection.vue

@@ -8,12 +8,14 @@
       </div>
     </div>
     <div class="row mt-5">
-      <div class="col-md-6">
+      <div class="col-md-12 col-lg-4">
         <gallerySection :images="images" />
       </div>
-      <div class="col-md-6 summarySection">
+      <div class="col-md-12 col-lg-8 summarySection">
         <h3>Summary</h3>
-
+        <div class="row">
+          <div align="center" class="col-md-12">#{{ week.id }}</div>
+        </div>
         <div class="row mb-3">
           <div align="center" class="col">
             <label for="unit">Unit: </label>
@@ -35,13 +37,11 @@
             <h5>R {{ formatPrice(week ? week.sellPrice : 0) }}</h5>
           </div>
         </div>
-
-        <div class="row mt-5"></div>
-        <div class="row mt-3">
-          <div class="col">
+        <div class="row mt-5">
+          <div align="center" class="col-md-6">
             <a href="javascript:history.back()" class="btn-white-border">Back</a>
           </div>
-          <div class="col">
+          <div align="center" class="col-md-6">
             <button
               class="btn-solid-blue"
               style="color:white"

src/components/timeshare/sell/contentSection.vue

@@ -19,9 +19,7 @@
                   @change="changeRef"
                 />
                 <label class="custom-control-label" for="customSwitch1">
-                  {{
-                  refAgent ? "Yes" : "No"
-                  }}
+                  {{ refAgent ? "Yes" : "No" }}
                 </label>
                 <div class="refbyAgent" :class="{ 'refbyAgent--clicked': refAgent }">
                   <div class="col-md-6" v-if="refAgent">
@@ -32,11 +30,9 @@
                       name="agency"
                       v-model="sellItem.agencyId"
                     >
-                      <option
-                        v-for="(item, i) in agencies"
-                        :key="i"
-                        :value="item.id"
-                      >{{ item.agencyName }}</option>
+                      <option v-for="(item, i) in agencies" :key="i" :value="item.id">{{
+                        item.agencyName
+                      }}</option>
                     </select>
                   </div>
                   <div class="col-md-6" v-if="refAgent">
@@ -68,11 +64,9 @@
             <div class="form-row">
               <div class="form-group col-md-6">
                 <div class="input-group">
-                  <label
-                    v-if="!sellItem.region"
-                    class="uniSelectLabel"
-                    for="weekInfoRegionSelect"
-                  >REGION</label>
+                  <label v-if="!sellItem.region" class="uniSelectLabel" for="weekInfoRegionSelect"
+                    >REGION</label
+                  >
 
                   <select
                     id="weekInfoRegionSelect"
@@ -82,9 +76,7 @@
                     style="font-size: 15px"
                   >
                     <option v-for="(region, r) in regions" :key="r" :value="region">
-                      {{
-                      region.regionName
-                      }}
+                      {{ region.regionName }}
                     </option>
                   </select>
                 </div>
@@ -102,11 +94,9 @@
               </div>
               <div class="form-group col-md-6">
                 <div class="input-group">
-                  <label
-                    v-if="!sellItem.resort"
-                    class="uniSelectLabel"
-                    for="weekInfoResortSelect"
-                  >RESORT NAME</label>
+                  <label v-if="!sellItem.resort" class="uniSelectLabel" for="weekInfoResortSelect"
+                    >RESORT NAME</label
+                  >
 
                   <select
                     id="weekInfoResortSelect"
@@ -116,9 +106,7 @@
                   >
                     <option value="Other">Other</option>
                     <option v-for="(resort, r) in filteredResort" :key="r" :value="resort">
-                      {{
-                      resort.resortName
-                      }}
+                      {{ resort.resortName }}
                     </option>
                   </select>
                 </div>
@@ -196,7 +184,9 @@
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6">
-                <label v-if="!sellItem.bedrooms" class="uniSelectLabel" for="region">BEDROOM/S</label>
+                <label v-if="!sellItem.bedrooms" class="uniSelectLabel" for="region"
+                  >BEDROOM/S</label
+                >
 
                 <select
                   class="form-control uniSelect"
@@ -209,7 +199,9 @@
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6">
-                <label v-if="!sellItem.maxSleep" class="uniSelectLabel" for="region">SLEEP MAX</label>
+                <label v-if="!sellItem.maxSleep" class="uniSelectLabel" for="region"
+                  >SLEEP MAX</label
+                >
 
                 <select
                   class="form-control uniSelect"
@@ -247,19 +239,16 @@
                   @change="changeCurrentBanked"
                 />
                 <label class="custom-control-label" for="customSwitch2">
-                  {{
-                  sellItem.currentYearBanked ? "Yes" : "No"
-                  }}
+                  {{ sellItem.currentYearBanked ? "Yes" : "No" }}
                 </label>
                 <div
                   class="spacebanked1"
                   :class="{ 'spacebanked1--clicked': sellItem.currentYearBanked }"
                 >
                   <div class="col-md-6">
-                    <label
-                      for="If yes, please confirm with whom"
-                      v-if="sellItem.currentYearBanked"
-                    >Please confirm with whom</label>
+                    <label for="If yes, please confirm with whom" v-if="sellItem.currentYearBanked"
+                      >Please confirm with whom</label
+                    >
                     <select
                       class="form-control uniSelect"
                       name="spacebankOwner"
@@ -493,7 +482,8 @@
                     v-if="!indiv.bankingDetails.bank"
                     class="uniSelectLabel"
                     for="weekInfoRegionSelect"
-                  >BANK</label>
+                    >BANK</label
+                  >
 
                   <select
                     id="weekInfoRegionSelect"
@@ -503,9 +493,7 @@
                     v-model="indiv.bankingDetails.bank"
                   >
                     <option v-for="bank in banks" :key="bank.id" :value="bank">
-                      {{
-                      bank.name
-                      }}
+                      {{ bank.name }}
                     </option>
                   </select>
                 </div>
@@ -551,9 +539,9 @@
                 class="form-group col-md-12"
                 style="border:solid;border-width:2px; border-color:rgb(27, 117, 187); border-radius: 3px"
               >
-                <p
-                  style="text-align: left; margin:auto; padding:10px"
-                >1. With respect to my timeshare module/week, I confirm that:</p>
+                <p style="text-align: left; margin:auto; padding:10px">
+                  1. With respect to my timeshare module/week, I confirm that:
+                </p>
                 <div class="validation"></div>
               </div>
             </div>
@@ -572,9 +560,7 @@
                     @change="changeLeviesPaidInFull"
                   />
                   <label class="custom-control-label" for="customSwitch3">
-                    {{
-                    sellItem.leviesPaidInFull ? "Yes" : "No"
-                    }}
+                    {{ sellItem.leviesPaidInFull ? "Yes" : "No" }}
                   </label>
                 </div>
                 <div class="validation"></div>
@@ -595,9 +581,7 @@
                     @change="changeWeekPlacedForRental"
                   />
                   <label class="custom-control-label" for="customSwitch4">
-                    {{
-                    sellItem.weekPlacedForRental ? "Yes" : "No"
-                    }}
+                    {{ sellItem.weekPlacedForRental ? "Yes" : "No" }}
                   </label>
                 </div>
                 <div class="validation"></div>
@@ -716,11 +700,15 @@
               </div>
             </div>
             <div class="text-center col-12">
-              <button class="btn-solid-blue" v-if="!sellItem.id" @click="submitSale()">SUBMIT</button>
+              <button class="btn-solid-blue" v-if="!sellItem.id" @click="submitSale()">
+                SUBMIT
+              </button>
               <button class="btn-solid-blue" v-else @click="newSale()">NEW WEEK</button>
             </div>
             <div class="text-center col-12">
-              <button class="btn-solid-blue" v-if="sellItem.id > 0" @click="paygateTest()">PayGate</button>
+              <button class="btn-solid-blue" @click="paygateRedirect()">
+                PayGate
+              </button>
             </div>
             <br />
             <br />
@@ -746,18 +734,18 @@ export default {
   name: "TimeshareToSell",
   props: {
     weekId: {
-      default: 0,
-    },
+      default: 0
+    }
   },
   data() {
     return {
       wait: false,
-      userLoggedIn: Log.isLoggedIn(),
+      userLoggedIn: Log.isLoggedIn()
     };
   },
   components: {
     addressAutoComplete,
-    Alert,
+    Alert
   },
   mounted() {
     if (this.sellItem.id) {
@@ -783,13 +771,13 @@ export default {
       "sellItem",
       "agencies",
       "agents",
-      "getTemplate",
+      "getTemplate"
     ]),
     ...mapState("individual", ["indiv"]),
     ...mapState("authentication", ["isLoggedIn"]),
     ...mapGetters({
       user: "authentication/getUser",
-      person: "authentication/getPerson",
+      person: "authentication/getPerson"
     }),
     ...mapState("bank", ["banks"]),
     refAgent() {
@@ -797,14 +785,9 @@ export default {
     },
     filteredResort() {
       let list = [];
-      if (
-        this.sellItem &&
-        this.sellItem.region &&
-        this.sellItem.region.regionCode
-      ) {
+      if (this.sellItem && this.sellItem.region && this.sellItem.region.regionCode) {
         const item = this.detailedRegion.find(
-          (region) =>
-            region.region.regionCode === this.sellItem.region.regionCode
+          region => region.region.regionCode === this.sellItem.region.regionCode
         );
         if (item) {
           list = item.children;
@@ -812,14 +795,14 @@ export default {
       } else {
         list = this.resorts;
       }
-      return _.sortBy(list, (x) => x.resortName);
+      return _.sortBy(list, x => x.resortName);
     },
     isLoggedIn() {
       return this.user && this.person;
     },
     displayNotDeletedAgents() {
       var notDeletedArr = [];
-      this.agents.forEach((agent) => {
+      this.agents.forEach(agent => {
         if (!agent.isDeleted) {
           if (agent.agencyId === this.sellItem.agencyId) {
             notDeletedArr.push(agent);
@@ -827,16 +810,11 @@ export default {
         }
       });
       return notDeletedArr;
-    },
+    }
   },
   methods: {
     ...mapActions("individual", ["getIndividual"]),
-    ...mapActions("timeshare", [
-      "initTimeshare",
-      "onResortChange",
-      "saveWeek",
-      "getBlankWeek",
-    ]),
+    ...mapActions("timeshare", ["initTimeshare", "onResortChange", "saveWeek", "getBlankWeek"]),
     ...mapActions("payment", ["addPayment"]),
     ...mapActions("bank", ["getBanks"]),
     newSale() {
@@ -846,28 +824,30 @@ export default {
     submitSale() {
       if (this.userLoggedIn) {
         this.sellItem.ownerObject = this.indiv;
-        this.saveWeek(this.sellItem).then((fulfilled) => {
-          this.paygateTest();
-        });
+        console.log(this.sellItem);
+
+        // this.saveWeek(this.sellItem).then(fulfilled => {
+        //   this.paygateRedirect();
+        // });
       } else this.$router.push("/user/login");
     },
-    paygateTest() {
+    paygateRedirect() {
       var paymentObj = {
-        timeshareWeekId: 3, // this.sellItem.Id,
+        timeshareWeekId: this.sellItem.id, // this.sellItem.Id,
         propertyId: 0,
-        creatydById: 14, //Log.getUser().id,
+        creatydById: Log.getUser().id, //Log.getUser().id,
         amount: 380.0,
         paymentStatus: "",
-        paymentToken: "",
+        paymentToken: ""
       };
 
-      this.addPayment(paymentObj).then((res) => {
+      this.addPayment(paymentObj).then(res => {
         this.$router.push({
           name: "PaymentGateway",
           params: {
             paymentReqId: res.PAY_REQUEST_ID,
-            checksum: res.CHECKSUM,
-          },
+            checksum: res.CHECKSUM
+          }
         });
       });
     },
@@ -892,7 +872,7 @@ export default {
     resortChange() {
       this.onResortChange({
         resortName: this.sellItem.resort.resortName,
-        resortCode: this.sellItem.resort.resortCode,
+        resortCode: this.sellItem.resort.resortCode
       });
 
       if (this.sellItem && this.sellItem.resort === "Other") {
@@ -904,9 +884,7 @@ export default {
       }
     },
     regionChange() {
-      this.sellItem.regionId = this.sellItem.region
-        ? this.sellItem.region.id
-        : 1;
+      this.sellItem.regionId = this.sellItem.region ? this.sellItem.region.id : 1;
     },
     UpdateAddress(address) {
       this.indiv.address.streetNumber = address.streetNumber;
@@ -915,8 +893,8 @@ export default {
       this.indiv.address.city = address.city;
       this.indiv.address.suburb = address.suburb;
       this.indiv.address.postalCode = address.postalCode;
-    },
-  },
+    }
+  }
 };
 </script>
 

src/components/user/loginPage.vue

@@ -79,6 +79,7 @@
 /* eslint-disable */
 import { mapActions, mapState } from "vuex";
 import alert from "../shared/alert.vue";
+import Log from "../../assets/Log";
 import carousel from "vue-owl-carousel";
 export default {
   name: "Login",
@@ -105,8 +106,11 @@ export default {
   computed: {
     ...mapState("authentication", ["token", "status"])
   },
+  mounted() {
+    this.checkUserStatus();
+  },
   methods: {
-    ...mapActions("authentication", ["login", "init"]),
+    ...mapActions("authentication", ["login", "init", "logout"]),
     ToggleTrouble() {
       if (this.troubleToggle) {
         this.troubleToggle = false;
@@ -121,6 +125,12 @@ export default {
           this.error = true;
         });
     },
+    checkUserStatus() {
+      if (Log.isLoggedIn()) {
+        this.logout();
+        this.$router.go();
+      }
+    },
     togglePassword() {
       this.showPassword = true;
       this.isPasswordShown = "text";

src/main.js

@@ -7,8 +7,10 @@ import App from "./App.vue";
 import router from "./router";
 import store from "./store";
 import * as VueGoogleMaps from "vue2-google-maps";
+import Vuetify from "vuetify";
 
 Vue.use(EvaIcons);
+Vue.use(Vuetify);
 Vue.use(VueGoogleMaps, {
   load: {
     key: "AIzaSyD8k_Kwml_C8IDfs-gX8JFV8acli3L9cAE",
@@ -23,8 +25,8 @@ Vue.use(VueGoogleMaps, {
 });
 Vue.config.productionTip = false;
 //axios.defaults.baseURL = "http://localhost:57260";
-axios.defaults.baseURL = "http://training.provision-sa.com:82";
-//axios.defaults.baseURL = "http://localhost:8080/";
+//axios.defaults.baseURL = "http://training.provision-sa.com:82";
+axios.defaults.baseURL = "http://localhost:8080/";
 
 Vue.prototype.$axios = axios;
 

vue.config.js

@@ -2,8 +2,8 @@ module.exports = {
   devServer: {
     proxy: {
       "/api": {
-        //target: "http://localhost:57260/",
-        target: "http://training.provision-sa.com:82",
+        target: "http://localhost:57260/",
+        //target: "http://training.provision-sa.com:82",
         changeOrigin: true
       },
       "/nph-srep": {