Added list property to shortNav

src/components/property/ListProperty/listPropertyPage.vue

@@ -9,9 +9,24 @@
 <script>
 /* eslint-disable */
 import contentSection from "./contentSection";
+import Log from "../../../assets/Log";
+
 export default {
   components: {
     contentSection
+  },
+  created() {
+    if (!Log.getPerson().name) {
+      this.$router.push({
+        name: "Login",
+        params: {
+          page: {
+            pageRedirect: "/property/list",
+            text: "Please Login or Register to add a property"
+          }
+        }
+      });
+    }
   }
 };
 </script>

src/components/shared/navBar.vue

@@ -36,6 +36,10 @@
                     <i class="fa fa-calculator" aria-hidden="true"></i>
                     <span class="bondCalculatorDetail">Bond Calculator</span>
                   </a>
+                  <router-link to="/property/list">
+                    <i class="fa fa-home"></i>
+                    <span class="listProp">List Property</span>
+                  </router-link>
                 </div>
               </div>
               <nav id="nav-menu-container">
@@ -487,6 +491,10 @@ export default {
   margin-left: 3px;
 }
 
+.listProp {
+  margin-left: 3px;
+}
+
 /* Extra small devices (phones, 600px and down) */
 @media only screen and (max-width: 600px) {
   .phoneIconDetail {
@@ -497,6 +505,10 @@ export default {
     display: none;
   }
 
+  .listProp {
+    display: none;
+  }
+
   #header {
     min-height: 120px;
   }

src/components/timeshare/buy/carouselSection.vue

@@ -12,7 +12,9 @@
             <div class="row">
               <div class="form-group col-md-6">
                 <div class="input-group">
-                  <label v-if="!searchParams.region" class="uniSelectLabel" for="region">REGION</label>
+                  <label v-if="!searchParams.region" class="uniSelectLabel" for="region"
+                    >REGION</label
+                  >
                   <select
                     class="form-control uniSelect"
                     name="region"
@@ -40,7 +42,8 @@
                     v-if="!searchParams.resort"
                     class="uniSelectLabel"
                     for="weekInfoResortSelect"
-                  >RESORT</label>
+                    >RESORT</label
+                  >
                   <select
                     id="weekInfoResortSelect"
                     class="form-control uniSelect"
@@ -52,9 +55,7 @@
                       :value="resort"
                       @change="resortChange"
                     >
-                      {{
-                      resort.resortName
-                      }}
+                      {{ resort.resortName }}
                     </option>
                   </select>
                 </div>
@@ -107,7 +108,7 @@ import carousel from "vue-owl-carousel";
 import { mapState, mapActions, mapGetters } from "vuex";
 export default {
   components: {
-    carousel,
+    carousel
   },
   data() {
     return {
@@ -116,17 +117,17 @@ export default {
       region: "",
       resort: "",
       priceMin: undefined,
-      priceMax: undefined,
+      priceMax: undefined
     };
   },
   methods: {
     ...mapActions("timeshare", ["initTimeshare", "onResortChange", "saveWeek"]),
     regionChange(item) {
-      let reg = this.regions.find((r) => r.regionName === item.target.value);
+      let reg = this.regions.find(r => r.regionName === item.target.value);
       this.regionObj = reg;
     },
     resortChange(item) {
-      let res = this.resorts.find((r) => r.resortName === item.target.value);
+      let res = this.resorts.find(r => r.resortName === item.target.value);
       this.resortObj = res;
     },
     Search() {
@@ -140,10 +141,10 @@ export default {
       if (!this.searchParams.resort) {
         this.searchParams.regionObj = this.regionObj;
         this.$router.push("/timeshareToByResults");
+      } else {
+        this.$router.push(`/resort/${this.searchParams.resort.resortCode}`);
       }
-
-      this.$router.push(`/resort/${this.searchParams.resort.resortCode}`);
-    },
+    }
   },
   computed: {
     ...mapState("timeshare", ["resorts", "regions", "detailedRegion"]),
@@ -152,7 +153,7 @@ export default {
       let list = [];
       if (this.searchParams.region && this.searchParams.region !== "") {
         const item = this.detailedRegion.find(
-          (region) => region.region.regionCode === this.regionObj.regionCode
+          region => region.region.regionCode === this.regionObj.regionCode
         );
         if (item) {
           list = item.children;
@@ -160,8 +161,8 @@ export default {
       } else {
         list = this.resorts;
       }
-      return _.sortBy(list, (x) => x.resortName);
-    },
+      return _.sortBy(list, x => x.resortName);
+    }
   },
   created() {
     this.initTimeshare(this.weekId);
@@ -171,7 +172,7 @@ export default {
     this.searchParams.resort = null;
     this.filter.date = null;
     this.filter.ddate = null;
-  },
+  }
 };
 </script>
 

src/components/timeshare/buy/searchResults.vue

@@ -17,14 +17,12 @@
               src="../../../../public/img/blankImg.png"
               alt
             />
-            <p
-              v-if="resort.weeksAvailable == 1"
-              class="normalText"
-            >{{ resort.weeksAvailable }} Week Available</p>
-            <p
-              v-else-if="resort.weeksAvailable > 1"
-              class="normalText"
-            >{{ resort.weeksAvailable }} Weeks Available</p>
+            <p v-if="resort.weeksAvailable == 1" class="normalText">
+              {{ resort.weeksAvailable }} Week Available
+            </p>
+            <p v-else-if="resort.weeksAvailable > 1" class="normalText">
+              {{ resort.weeksAvailable }} Weeks Available
+            </p>
             <p v-else class="noWeeks">No Weeks Available</p>
             <h4 class="mt-3">{{ resort.resortName }}</h4>
             <!-- <p>
@@ -37,7 +35,8 @@
               class="btn-white-border"
               :to="`/resort/${resort.resortCode}`"
               :disable="resort.resortCode && resort.resortCode != ''"
-            >VIEW</router-link>
+              >VIEW</router-link
+            >
           </div>
         </div>
       </div>
@@ -48,7 +47,7 @@
         <img src="img/no-homes.png" />
         <br />
         <br />
-        <p>Sorry no listing where found matching your search</p>
+        <p>Sorry no listings were found matching your search.</p>
       </div>
     </div>
   </section>
@@ -57,7 +56,7 @@
 <script>
 export default {
   props: {
-    resorts: [],
-  },
+    resorts: {}
+  }
 };
-</script>
+</script>

src/components/timeshare/buy/toBuySearchResults.vue

@@ -43,7 +43,7 @@
             <searchPanal :resorts="Available" />
           </div>
           <div class="tab-pane fade" id="directions" role="tabpanel" aria-labelledby="profile-tab">
-            <searchPanal :resorts="resorts" />
+            <searchPanal v-if="resorts.length > 0" :resorts="resorts" />
           </div>
         </div>
         <div v-if="wait" id="preloader"></div>
@@ -60,15 +60,15 @@ import _ from "lodash";
 export default {
   name: "ToBuySearchResults",
   components: {
-    searchPanal,
+    searchPanal
   },
   data() {
     return {
-      wait: false,
+      wait: false
     };
   },
   methods: {
-    ...mapActions("resort", ["getResorts", "getImage1"]),
+    ...mapActions("resort", ["getResorts", "getImage1"])
     //methods
   },
   computed: {
@@ -76,21 +76,19 @@ export default {
     ...mapState("resort", ["resorts"]),
     Available() {
       let resortList = this.resorts;
-      resortList = _.filter(resortList, (x) => x.weeksAvailable > 0);
+      resortList = _.filter(resortList, x => x.weeksAvailable > 0);
       return resortList;
-    },
+    }
   },
   mounted() {
     this.wait = true;
     this.getResorts(this.searchParams.regionObj.regionCode)
-      .then((fulfilled) => {
+      .then(fulfilled => {
         this.wait = false;
       })
-      .catch((error) => {
+      .catch(error => {
         this.wait = false;
       });
-  },
+  }
 };
 </script>
-
-

src/components/user/loginPage.vue

@@ -16,6 +16,9 @@
                         :type="'ERROR'"
                       />
                     </div>
+                    <div v-if="page">
+                      <alert :text="page.text" :type="'INFO'" />
+                    </div>
                     <div class="form-label-group">
                       <input
                         type="text"
@@ -87,6 +90,9 @@ export default {
     carousel,
     alert
   },
+  props: {
+    page: {}
+  },
   data() {
     return {
       username: "",
@@ -119,11 +125,15 @@ export default {
     Login() {
       this.login({ username: this.username, password: this.password })
         .then(() => {
-          console.log(Log.getUser());
-          if (!Log.getUser().loginPasswordChange) {
-            this.$router.push("/");
+          // console.log(Log.getUser());
+          if (!this.page) {
+            if (!Log.getUser().loginPasswordChange) {
+              this.$router.push("/");
+            } else {
+              this.$router.push("/user/changePasswordOnLogin");
+            }
           } else {
-            this.$router.push("/user/changePasswordOnLogin");
+            this.$router.push(this.page.pageRedirect);
           }
         })
         .catch(err => {

src/router/index.js

@@ -151,6 +151,9 @@ export default new Router({
     {
       path: "/user/login",
       name: "Login",
+      props: route => ({
+        ...route.params
+      }),
       component: Login
     },
     {