Property Search & save fix

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/router/index.js

@@ -45,180 +45,181 @@ import Offer from '../components/processFlow/offers.vue';
 Vue.use(Router);
 
 export default new Router({
-  scrollBehavior (to, from, savedPosition) {
-    return { x: 0, y: 0 }
-  },
-  routes: [{
-    path: '/',
-    name: 'Home',
-    component: HomePage,
-  },
-  {
-    path: '/about/us',
-    name: 'aboutus',
-    component: AboutUs,
-  },
-  {
-    path: '/about/timeshare',
-    name: 'abouttimeshare',
-    component: AboutTimeshare,
-  },
-  {
-    path: '/timeshare/sell',
-    name: 'TimeshareSell',
-    component: TimeshareSell,
-  },
-  {
-    path: '/timeshare/buy',
-    name: 'TimeshareBuy',
-    component: TimeshareBuy,
-  },
-  {
-    path: '/timeshare/faq',
-    name: 'TimeshareFAQ',
-    component: TimeshareFAQ,
-  },
-  {
-    path: '/user/login',
-    name: 'Login',
-    component: Login,
-  },
-  {
-    path: '/user/register',
-    name: 'PrivateIndividual',
-    component: PrivateIndividual,
-  },
-  {
-    path: '/user/registeragency',
-    name: 'Agency',
-    component: Agency,
-  },
-  {
-    path: '/property/property/:id',
-    name: 'PropertyPage',
-    component: PropertyPage,
-  },
-  {
-    path: '/property/:propertyType/search',
-    name: 'PropertySearch',
-    component: PropertySearch,
-  },
-  {
-    path: '/property/search',
-    name: 'PropertySearchTab',
-    component: PropertySearch,
-  },
-  {
-    path: '/property/:propType/:saleType',
-    name: 'PropertyNew',
-    component: PropertyEdit,
-  },
-  {
-    path: '/property/edit/:id/:propType/:saleType',
-    name: 'PropertyEdit',
-    component: PropertyEdit,
-  },
-  {
-    path: '/property/list/:propertyType/:user',
-    name: 'PropertyList',
-    component: PropertyList,
-  },
-  {
-    path: '/propertyTypes/list',
-    name: 'PropertyTypeList',
-    component: PropertyTypeList,
-  },
-  {
-    path: '/propertyType/new',
-    name: 'PropertyTypeNew',
-    component: PropertyType,
-  },
-  {
-    path: '/propertyType/:id',
-    name: 'PropertyTypeEdit',
-    component: PropertyType,
-  },
-  {
-    path: '/userDefinedGroups/list',
-    name: 'UserDefinedGroupsList',
-    component: UserDefinedGroups,
-  },
-  {
-    path: '/userDefinedGroups/userDefinedGroup/:id',
-    name: 'UserDefinedGroupEdit',
-    component: UserDefinedGroup,
-  },
-  {
-    path: '/userDefinedGroups/userDefinedGroup',
-    name: 'UserDefinedGroupNew',
-    component: UserDefinedGroup,
-  },
-  {
-    path: '/status/list',
-    name: 'StatusList',
-    component: Status,
-  },
-  {
-    path: '/status/timeshareAdmin',
-    name: 'TimeshareAdmin',
-    component: timeshareAdminPage,
-  },
-  {
-    path: '/status/tenderWeekAdmin',
-    name: 'TenderWeekAdmin',
-    component: tenderWeekAdminPage,
-  },
-  {
-    path: '/status/userManagementPage',
-    name: 'userManagementPage',
-    component: userManagementPage,
-  },
-  {
-    path: '/status/changeLogPage',
-    name: 'changeLogPage',
-    component: changeLogPage,
-  },
-  {
-    path: '/unitConfiguration/list',
-    name: 'UnitConfiguration',
-    component: UnitConfiguration,
-  },
-  {
-    path: '/contactus',
-    name: 'ContactUs',
-    component: ContactUs,
-  },
-  {
-    path: '/privacypolicy',
-    name: 'PrivacyPolicy',
-    component: PrivacyPolicy,
-  },
-  {
-    path: '/resort/:resortCode',
-    name: 'ResortPage',
-    component: ResortPage,
-    props: true,
-  },
-  {
-    path: '/resort/:resortCode/:weekId',
-    name: 'UnitPage',
-    component: UnitPage,
-    props: true,
-  },
-  {
-    path: '/MakeOffer',
-    name: 'MakeOffer',
-    component: MakeOffer,
-  },
-  {
-    path: '/Offers',
-    name: 'Offers',
-    component: Offer,
-  },
-  {
-    path: '/timeshare/search',
-    name: 'TimeshareSearch',
-    component: TimeshareSearch,
-  },
+  scrollBehavior(to, from, savedPosition) {
+    return { x: 0, y: 0 };
+  },
+  routes: [
+    {
+      path: '/',
+      name: 'Home',
+      component: HomePage,
+    },
+    {
+      path: '/about/us',
+      name: 'aboutus',
+      component: AboutUs,
+    },
+    {
+      path: '/about/timeshare',
+      name: 'abouttimeshare',
+      component: AboutTimeshare,
+    },
+    {
+      path: '/timeshare/sell',
+      name: 'TimeshareSell',
+      component: TimeshareSell,
+    },
+    {
+      path: '/timeshare/buy',
+      name: 'TimeshareBuy',
+      component: TimeshareBuy,
+    },
+    {
+      path: '/timeshare/faq',
+      name: 'TimeshareFAQ',
+      component: TimeshareFAQ,
+    },
+    {
+      path: '/user/login',
+      name: 'Login',
+      component: Login,
+    },
+    {
+      path: '/user/register',
+      name: 'PrivateIndividual',
+      component: PrivateIndividual,
+    },
+    {
+      path: '/user/registeragency',
+      name: 'Agency',
+      component: Agency,
+    },
+    {
+      path: '/property/property/:id',
+      name: 'PropertyPage',
+      component: PropertyPage,
+    },
+    {
+      path: '/property/:propertyUsageType/search',
+      name: 'PropertySearch',
+      component: PropertySearch,
+    },
+    {
+      path: '/property/search',
+      name: 'PropertySearchTab',
+      component: PropertySearch,
+    },
+    {
+      path: '/property/:propType/:saleType',
+      name: 'PropertyNew',
+      component: PropertyEdit,
+    },
+    {
+      path: '/property/edit/:id/:propType/:saleType',
+      name: 'PropertyEdit',
+      component: PropertyEdit,
+    },
+    {
+      path: '/property/list/:propertyType/:user',
+      name: 'PropertyList',
+      component: PropertyList,
+    },
+    {
+      path: '/propertyTypes/list',
+      name: 'PropertyTypeList',
+      component: PropertyTypeList,
+    },
+    {
+      path: '/propertyType/new',
+      name: 'PropertyTypeNew',
+      component: PropertyType,
+    },
+    {
+      path: '/propertyType/:id',
+      name: 'PropertyTypeEdit',
+      component: PropertyType,
+    },
+    {
+      path: '/userDefinedGroups/list',
+      name: 'UserDefinedGroupsList',
+      component: UserDefinedGroups,
+    },
+    {
+      path: '/userDefinedGroups/userDefinedGroup/:id',
+      name: 'UserDefinedGroupEdit',
+      component: UserDefinedGroup,
+    },
+    {
+      path: '/userDefinedGroups/userDefinedGroup',
+      name: 'UserDefinedGroupNew',
+      component: UserDefinedGroup,
+    },
+    {
+      path: '/status/list',
+      name: 'StatusList',
+      component: Status,
+    },
+    {
+      path: '/status/timeshareAdmin',
+      name: 'TimeshareAdmin',
+      component: timeshareAdminPage,
+    },
+    {
+      path: '/status/tenderWeekAdmin',
+      name: 'TenderWeekAdmin',
+      component: tenderWeekAdminPage,
+    },
+    {
+      path: '/status/userManagementPage',
+      name: 'userManagementPage',
+      component: userManagementPage,
+    },
+    {
+      path: '/status/changeLogPage',
+      name: 'changeLogPage',
+      component: changeLogPage,
+    },
+    {
+      path: '/unitConfiguration/list',
+      name: 'UnitConfiguration',
+      component: UnitConfiguration,
+    },
+    {
+      path: '/contactus',
+      name: 'ContactUs',
+      component: ContactUs,
+    },
+    {
+      path: '/privacypolicy',
+      name: 'PrivacyPolicy',
+      component: PrivacyPolicy,
+    },
+    {
+      path: '/resort/:resortCode',
+      name: 'ResortPage',
+      component: ResortPage,
+      props: true,
+    },
+    {
+      path: '/resort/:resortCode/:weekId',
+      name: 'UnitPage',
+      component: UnitPage,
+      props: true,
+    },
+    {
+      path: '/MakeOffer',
+      name: 'MakeOffer',
+      component: MakeOffer,
+    },
+    {
+      path: '/Offers',
+      name: 'Offers',
+      component: Offer,
+    },
+    {
+      path: '/timeshare/search',
+      name: 'TimeshareSearch',
+      component: TimeshareSearch,
+    },
   ],
 });

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/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);
     },