Query: 41933 & Query: 41932

package-lock.json

@@ -3731,8 +3731,7 @@
     "deep-equal": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-      "dev": true
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
     },
     "deep-is": {
       "version": "0.1.3",
@@ -5020,6 +5019,11 @@
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
       "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
     },
+    "fast-diff": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
+      "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
+    },
     "fast-glob": {
       "version": "2.2.7",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
@@ -8492,6 +8496,11 @@
         "no-case": "^2.2.0"
       }
     },
+    "parchment": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
+      "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
+    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -9450,6 +9459,41 @@
       "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
       "dev": true
     },
+    "quill": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
+      "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
+      "requires": {
+        "clone": "^2.1.1",
+        "deep-equal": "^1.0.1",
+        "eventemitter3": "^2.0.3",
+        "extend": "^3.0.2",
+        "parchment": "^1.1.4",
+        "quill-delta": "^3.6.2"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
+        },
+        "eventemitter3": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
+          "integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo="
+        }
+      }
+    },
+    "quill-delta": {
+      "version": "3.6.3",
+      "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz",
+      "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
+      "requires": {
+        "deep-equal": "^1.0.1",
+        "extend": "^3.0.2",
+        "fast-diff": "1.1.2"
+      }
+    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -11892,6 +11936,14 @@
         "trix": "^1.1.1"
       }
     },
+    "vue2-editor": {
+      "version": "2.10.2",
+      "resolved": "https://registry.npmjs.org/vue2-editor/-/vue2-editor-2.10.2.tgz",
+      "integrity": "sha512-sjHTPdRoiB9VK9HLSOjFgubxBWHxRydvykqBCNaX7Sv+2KpdWu6AoyguvP5tyEp4ECX7z6PnbBluyD5M57QOng==",
+      "requires": {
+        "quill": "^1.3.6"
+      }
+    },
     "vuetify": {
       "version": "1.5.16",
       "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-1.5.16.tgz",

package.json

@@ -28,6 +28,7 @@
     "vue-excel-export": "^0.1.3",
     "vue-router": "^3.0.7",
     "vue-trix": "^1.0.0",
+    "vue2-editor": "^2.10.2",
     "vuetify": "^1.5.5",
     "vuex": "^3.1.1"
   },

src/components/property/propertyCard.vue

@@ -23,73 +23,75 @@
     </div>
     <div class="form-group row">
       <div class="col-md-4" v-for="currentProperty in properties" :key="currentProperty.id">
-        <div class="card-box-a card-shadow">
-          <div class="img-box-a">
-            <img
-              :src="currentProperty.displayImage"
-              alt
-              class="img-a img-fluid"
-              style="height:466px; width:350px; object-fit: cover;"
-            />
-          </div>
-          <div class="card-overlay">
-            <div class="card-overlay-a-content">
-              <div class="card-header-a">
-                <h4 class="card-title-a">
-                  <router-link
-                    :to="`/property/property/${currentProperty.id}`"
-                    class="link-a"
-                  >{{ currentProperty.shortDescription }}</router-link>
-                </h4>
-                <h4 class="card-title-c">
+        <router-link :to="`/property/property/${currentProperty.id}`">
+          <div class="card-box-a card-shadow">
+            <div class="img-box-a">
+              <img
+                :src="currentProperty.displayImage"
+                alt
+                class="img-a img-fluid"
+                style="height:466px; width:350px; object-fit: cover;"
+              />
+            </div>
+            <div class="card-overlay">
+              <div class="card-overlay-a-content">
+                <div class="card-header-a">
+                  <h4 class="card-title-a">
+                    <router-link
+                      :to="`/property/property/${currentProperty.id}`"
+                      class="link-a"
+                    >{{ currentProperty.shortDescription }}</router-link>
+                  </h4>
+                  <h4 class="card-title-c">
+                    <router-link :to="`/property/property/${currentProperty.id}`" class="link-a">
+                      {{ currentProperty.province }}
+                      <br />
+                      {{ currentProperty.city }}
+                      <br />
+                      {{ currentProperty.suburb }}
+                    </router-link>
+                  </h4>
+                </div>
+                <div class="card-body-a">
+                  <div class="price-box d-flex">
+                    <span
+                      v-if="currentProperty.isSale"
+                      class="price-a"
+                    >sale | {{ currentProperty.displayPrice }}</span>
+                    <span
+                      v-if="!currentProperty.isSale"
+                      class="price-a"
+                    >rent | {{ currentProperty.displayPrice }}</span>
+                  </div>
                   <router-link :to="`/property/property/${currentProperty.id}`" class="link-a">
-                    {{ currentProperty.province }}
-                    <br />
-                    {{ currentProperty.city }}
-                    <br />
-                    {{ currentProperty.suburb }}
+                    Click here to view
+                    <span class="ion-ios-arrow-forward"></span>
                   </router-link>
-                </h4>
-              </div>
-              <div class="card-body-a">
-                <div class="price-box d-flex">
-                  <span
-                    v-if="currentProperty.isSale"
-                    class="price-a"
-                  >sale | {{ currentProperty.displayPrice }}</span>
-                  <span
-                    v-if="!currentProperty.isSale"
-                    class="price-a"
-                  >rent | {{ currentProperty.displayPrice }}</span>
                 </div>
-                <router-link :to="`/property/property/${currentProperty.id}`" class="link-a">
-                  Click here to view
-                  <span class="ion-ios-arrow-forward"></span>
-                </router-link>
-              </div>
-              <div class="card-footer-a" v-if="currentProperty.showFooter">
-                <ul class="card-info d-flex justify-content-around">
-                  <li v-if="currentProperty.area !== null">
-                    <h4 class="card-info-title">Area</h4>
-                    <span v-html="currentProperty.area"></span>
-                  </li>
-                  <li v-if="currentProperty.beds !== null">
-                    <h4 class="card-info-title">Beds</h4>
-                    <span>{{ currentProperty.beds }}</span>
-                  </li>
-                  <li v-if="currentProperty.baths !== null">
-                    <h4 class="card-info-title">Baths</h4>
-                    <span>{{ currentProperty.baths }}</span>
-                  </li>
-                  <li v-if="currentProperty.garages !== null">
-                    <h4 class="card-info-title">Garages</h4>
-                    <span>{{ currentProperty.garages }}</span>
-                  </li>
-                </ul>
+                <div class="card-footer-a" v-if="currentProperty.showFooter">
+                  <ul class="card-info d-flex justify-content-around">
+                    <li v-if="currentProperty.area !== null">
+                      <h4 class="card-info-title">Area</h4>
+                      <span v-html="currentProperty.area"></span>
+                    </li>
+                    <li v-if="currentProperty.beds !== null">
+                      <h4 class="card-info-title">Beds</h4>
+                      <span>{{ currentProperty.beds }}</span>
+                    </li>
+                    <li v-if="currentProperty.baths !== null">
+                      <h4 class="card-info-title">Baths</h4>
+                      <span>{{ currentProperty.baths }}</span>
+                    </li>
+                    <li v-if="currentProperty.garages !== null">
+                      <h4 class="card-info-title">Garages</h4>
+                      <span>{{ currentProperty.garages }}</span>
+                    </li>
+                  </ul>
+                </div>
               </div>
             </div>
           </div>
-        </div>
+        </router-link>
         <br />
       </div>
     </div>

src/components/property/propertyImage.vue

@@ -5,6 +5,7 @@
         Upload
         <input
           type="file"
+          accept=".jpeg, .jpg, .gif, .png"
           value="Upload Photo"
           style="width: 0px;height: 0px;overflow: hidden;"
           name="images[]"

src/components/property/propertyList.vue

@@ -12,15 +12,11 @@
           <div class="col-md-12 col-lg-8">
             <div class="title-box-d">
               <h1
-                v-if="user !== 'All'"
+                v-if="showAdmin"
                 class="title-d"
                 style="text-align:left; font-size: 250%"
-              >My {{ propertyType }} Properties</h1>
-              <h1
-                v-else
-                class="title-d"
-                style="text-align:left; font-size: 250%"
-              >All {{ propertyType }} Properties</h1>
+              >Admin Properties</h1>
+              <h1 v-else class="title-d" style="text-align:left; font-size: 250%">My Properties</h1>
             </div>
           </div>
         </div>
@@ -35,7 +31,9 @@
             <th>Property ID</th>
             <th>Size</th>
             <th>Price</th>
+            <th>Usage Type</th>
             <th>Type</th>
+            <th>Sale Type</th>
             <th>Publish</th>
             <th>Status</th>
             <th></th>
@@ -48,7 +46,9 @@
             <td>{{ item.id }}</td>
             <td v-html="item.size" />
             <td>{{ item.price }}</td>
+            <td>{{ item.usageType }}</td>
             <td>{{ item.type }}</td>
+            <td>{{ item.saleType }}</td>
             <!-- <td>{{ item.publish }}</td> -->
             <td></td>
             <td>{{ item.status }}</td>
@@ -58,7 +58,6 @@
                 @click="Edit(item)"
                 class="btn btn-b-n"
                 style="width: 85px; height:40px;"
-                disabled
               >Edit</button>
             </td>
             <td>
@@ -86,6 +85,7 @@ export default {
     return {
       propertyType: '',
       user: '',
+      showAdmin: false,
     };
   },
   methods: {
@@ -99,18 +99,21 @@ export default {
     },
   },
   mounted() {
-    this.propertyType = this.$route.params.propertyType;
-    this.user = this.$route.params.user;
-
-    if (this.user === 'MyListings') {
-      this.user = 'GeorgeW';
+    if (this.$route.params.by === 'my') {
+      // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+      this.showAdmin = false;
+    } else {
+      // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+      this.showAdmin = true;
     }
 
+    this.user = 28; // user id
+
     this.getProperties(
       Object.assign(
         {},
         {
-          propertyType: this.propertyType,
+          propertyType: this.showAdmin ? 'Admin' : 'My',
           user: this.user,
         },
       ),
@@ -118,26 +121,29 @@ export default {
   },
   computed: {
     ...mapState('propertyList', ['properties']),
-    TypeChanged() {
-      // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-      this.propertyType = this.$route.params.propertyType;
-      // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-      this.user = this.$route.params.user;
+    UserChanged() {
+      if (this.$route.params.by === 'my') {
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+        this.showAdmin = false;
+      } else {
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+        this.showAdmin = true;
+      }
       this.getProperties(
         Object.assign(
           {},
           {
-            propertyType: this.$route.params.propertyType,
-            user: this.$route.params.user,
+            propertyType: this.showAdmin ? 'Admin' : 'My',
+            user: this.user,
           },
         ),
       );
-      return this.propertyType;
+      return this.user;
     },
   },
   watch: {
-    TypeChanged() {
-      console.log(this.propertyType);
+    UserChanged() {
+      console.log(this.user);
     },
   },
 };

src/components/property/propertyPage.vue

@@ -127,7 +127,7 @@
                             name="MakeOffer"
                             :isMakeOffer="true"
                             :isProperty="true"
-                            :item="{id: property.id, shortDescription: property.shortDescription, description: property.description, price: property.price}"
+                            :item="{id: property.id, shortDescription: property.shortDescription, description: property.description, sellPrice: property.price}"
                           />
                         </div>
                       </div>

src/components/property/propertySearchPage.vue

@@ -1,6 +1,15 @@
 <template>
   <!-- eslint-disable max-len -->
   <div class="container">
+    <br />
+    <div class="row">
+      <div class="col-md-2 offset-4">
+        <button type="button" @click="SetType('Residential')" class="btn btn-b-n">Residential</button>
+      </div>
+      <div class="col-md-2">
+        <button type="button" @click="SetType('Commercial')" class="btn btn-b-n">Commercial</button>
+      </div>
+    </div>
     <div class="container col-md-12" v-if="propertySearch.propertyUsageType === 'Residential'">
       <div class="col-sm-12">
         <div class="about-img-box">
@@ -38,11 +47,11 @@
           </p>
           <p>
             Wish to RENT your property?
-            <router-link to="/property/Residential/Rental">Click Here</router-link>
+            <router-link to="/property/new/Residential/Rental">Click Here</router-link>
           </p>
           <p>
             Wish to SELL your property?
-            <router-link to="/property/Residential/Sale">Click Here</router-link>
+            <router-link to="/property/new/Residential/Sale">Click Here</router-link>
           </p>
         </div>
         <div class="col-md-4">
@@ -59,7 +68,7 @@
       <div>
         <propertyCard v-if="properties.length > 0" name="propertyholder" :properties="properties" />
         <div v-if="properties.length === 0">
-          <img src="../../../public/img/no-homes.gif" />
+          <img src="../../../public/img/no-homes.png" />
           <br />
           <br />
           <p>Sorry no listing where found matching your search</p>
@@ -103,11 +112,11 @@
           </p>
           <p>
             Wish to RENT your property?
-            <router-link to="/property/Commercial/Rental">Click Here</router-link>
+            <router-link to="/property/new/Commercial/Rental">Click Here</router-link>
           </p>
           <p>
             Wish to SELL your property?
-            <router-link to="/property/Commercial/Sale">Click Here</router-link>
+            <router-link to="/property/new/Commercial/Sale">Click Here</router-link>
           </p>
         </div>
         <div class="col-md-4">
@@ -124,7 +133,7 @@
       <div>
         <propertyCard v-if="properties.length > 0" name="propertyholder" :properties="properties" />
         <div v-if="properties.length === 0">
-          <img src="../../../public/img/no-homes.gif" />
+          <img src="../../../public/img/no-homes.png" />
           <br />
           <br />
           <p>Sorry no listing where found matching your search</p>
@@ -158,16 +167,24 @@ export default {
       },
     };
   },
+  mounted() {
+    if (typeof this.propertySearch.propertyUsageType === 'undefined') {
+      this.propertySearch.propertyUsageType = 'Residential';
+    }
+  },
   methods: {
     ...mapActions('propertySearch', ['searchProperties']),
+    SetType(item) {
+      this.propertySearch.propertyUsageType = item;
+    },
   },
   computed: {
     ...mapState('propertySearch', ['properties']),
     ParamsChanged() {
-      if (Object.keys(this.$route.params).length > 0) {
-        if (this.$route.params.propertyUsageType) {
+      if (Object.keys(this.$route.query).length === 0) {
+        if (this.propertySearch.propertyUsageType === 'All') {
           // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-          this.propertySearch.propertyUsageType = this.$route.params.propertyUsageType;
+          this.propertySearch.propertyUsageType = 'Residential';
           // eslint-disable-next-line vue/no-side-effects-in-computed-properties
           this.propertySearch.keyword = 'All';
           // eslint-disable-next-line vue/no-side-effects-in-computed-properties
@@ -193,7 +210,6 @@ export default {
         // eslint-disable-next-line vue/no-side-effects-in-computed-properties
         this.propertySearch.keyword = 'All';
       }
-
       this.searchProperties(this.propertySearch);
       return null;
     },

src/components/property/propertyeditPage.vue

@@ -3,6 +3,7 @@
   <div>
     <div class="container">
       <div class="col-sm-12">
+        <br />
         <div class="tobuy-img-box">
           <img
             v-if="propertyType === 'Commercial'"
@@ -34,6 +35,26 @@
       <div class="row mb-3">
         <div class="container col-md-10" style="text-align:left">
           <form id="mainForm">
+            <div class="form-goup row">
+              <div class="col-md-4">
+                <label>Usage Type</label>
+                <div class="input-group-prepend">
+                  <span class="input-group-text" style="color: #60CBEB">
+                    <b>U</b>
+                  </span>
+                  <select
+                    class="form-control"
+                    name="propertyUsageType"
+                    id="propertyUsageType"
+                    v-model="propertyType"
+                    @change="TypeChanged"
+                  >
+                    <option value="Residential">Residential</option>
+                    <option value="Commercial">Commercial</option>
+                  </select>
+                </div>
+              </div>
+            </div>
             <div class="form-group row">
               <div class="col-md-4">
                 <label>Property Type</label>
@@ -240,12 +261,7 @@
             <div class="form-group row">
               <div class="col-md-12">
                 <label for="Property Description">Description</label>
-                <TextEditor
-                  name="description"
-                  v-model="property.description"
-                  id="description"
-                  style="text-align:left"
-                />
+                <vue-editor v-model="property.description" :editor-toolbar="customToolbar" />
                 <br />
                 <p>* A listing fee of R380 including VAT is payable to list your Property on the Uni-Vate website</p>
               </div>
@@ -258,7 +274,7 @@
               :id="1"
             ></UserField>
             <div class="form-group row" />
-            <div v-for="(item, i) in propertyFields" :key="item.id">
+            <div v-for="item in propertyFields" :key="item.id">
               <div class="row">
                 <div class="col-sm-12">
                   <div class="title-box-d">
@@ -302,7 +318,7 @@
 
 <script>
 import { mapState, mapActions } from 'vuex';
-import TextEditor from 'vue-trix';
+import { VueEditor } from 'vue2-editor';
 import { setTimeout } from 'timers';
 import UserField from './propertyUserField.vue';
 import ImageLoad from './propertyImage.vue';
@@ -312,7 +328,7 @@ export default {
   components: {
     UserField,
     ImageLoad,
-    TextEditor,
+    VueEditor,
   },
   data() {
     return {
@@ -324,6 +340,19 @@ export default {
       propertyFieldValues: [],
       defaultImage: 0,
       wait: false,
+      customToolbar: [
+        [{ header: [false, 1, 2, 3, 4, 5, 6] }],
+        ['bold', 'italic', 'underline', 'strike'],
+        [
+          { align: '' },
+          { align: 'center' },
+          { align: 'right' },
+          { align: 'justify' },
+        ],
+        [{ list: 'ordered' }, { list: 'bullet' }, { list: 'check' }],
+        [{ script: 'sub' }, { script: 'super' }],
+        [{ indent: '-1' }, { indent: '+1' }],
+      ],
     };
   },
   methods: {
@@ -342,6 +371,7 @@ export default {
       'getPropertySavedFields',
       'getSavedPropertyData',
     ]),
+    TypeChanged() {},
     SubmitData() {
       this.wait = true;
       if (this.salesType === 'Sale') {
@@ -363,7 +393,7 @@ export default {
 
       setTimeout(
         () => this.$router.push({
-            path: '/property/search',
+            path: '/property/Search',
             query: {
               salesType: this.salesType,
               propertyUsageType: this.propertyType,
@@ -434,10 +464,12 @@ export default {
       this.property.description = '';
     }
 
-    this.propertyType = this.$route.params.propType;
+    if (this.$route.params.propertyUsageType) {
+      this.propertyType = this.$route.params.propertyUsageType;
+    }
     this.salesType = this.$route.params.saleType;
 
-    this.getPropertyTypes(this.$route.params.propType);
+    this.getPropertyTypes(this.propertyType);
 
     this.getProvince();
     if (this.$route.query.id) {
@@ -447,7 +479,7 @@ export default {
       );
     } else {
       this.getPropertyOverviewFields();
-      this.getPropertyFields(this.$route.params.propType);
+      this.getPropertyFields(this.propertyType);
     }
     // if (this.$route.params.id) {
     //   this.getPropertyEditDisplay(4); // (this.$route.params.id);
@@ -483,12 +515,12 @@ export default {
     ]),
     SalesTypeChanged() {
       // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-      this.propertyType = this.$route.params.propType;
+      // this.propertyType = this.$route.params.propType;
       // eslint-disable-next-line vue/no-side-effects-in-computed-properties
       this.salesType = this.$route.params.saleType;
       if (!this.$route.query.id) {
-        this.getPropertyTypes(this.$route.params.propType);
-        this.getPropertyFields(this.$route.params.propType);
+        this.getPropertyTypes(this.propertyType);
+        this.getPropertyFields(this.propertyType);
       }
 
       return this.propertyType;

src/components/shared/navBar.vue

@@ -81,41 +81,22 @@
               <div class="dropdown-menu" aria-labelledby="navbarDropdown">
                 <a
                   class="dropdown-item cursor-pointer"
-                  @click="routerGoTo('/property/Commercial/Search')"
-                >Search Commercial Properties</a>
+                  @click="routerGoTo('/property/Search')"
+                >Search</a>
                 <a
                   class="dropdown-item cursor-pointer"
-                  @click="routerGoTo('/property/Commercial/Sale')"
-                >To Sell Commercial Properties</a>
-                <a
-                  class="dropdown-item cursor-pointer"
-                  @click="routerGoTo('/property/Commercial/Rental')"
-                >To Rent Commercial Properties</a>
-                <hr />
-
-                <a
-                  class="dropdown-item cursor-pointer"
-                  @click="routerGoTo('/property/Residential/Search')"
-                >Search Residential Properties</a>
-                <a
-                  class="dropdown-item cursor-pointer"
-                  @click="routerGoTo('/property/Residential/Sale')"
-                >To Sell Residential Properties</a>
+                  @click="routerGoTo('/property/new/Sale')"
+                >To Sell</a>
                 <a
                   class="dropdown-item cursor-pointer"
-                  @click="routerGoTo('/property/Residential/Rental')"
-                >To Rent Residential Properties</a>
+                  @click="routerGoTo('/property/new/Rental')"
+                >To Rent</a>
                 <hr v-if="showLogout" />
                 <a
                   v-if="showLogout"
                   class="dropdown-item cursor-pointer"
-                  @click="routerGoTo('/property/list/Commercial/MyListings')"
-                >My Commercial Properties</a>
-                <a
-                  v-if="showLogout"
-                  class="dropdown-item cursor-pointer"
-                  @click="routerGoTo('/property/list/Residential/MyListings')"
-                >My Residential Properties</a>
+                  @click="routerGoTo('/property/admin/list/my')"
+                >My Properties</a>
               </div>
             </li>
 

src/router/index.js

@@ -114,18 +114,23 @@ export default new Router({
       component: PropertySearch,
     },
     {
-      path: '/property/:propType/:saleType',
+      path: '/property/new/:saleType',
       name: 'PropertyNew',
       component: PropertyEdit,
     },
+    {
+      path: '/property/new/:propertyUsageType/:saleType',
+      name: 'PropertyNewFromSearch',
+      component: PropertyEdit,
+    },
     {
       path: '/property/edit/:id/:propType/:saleType',
       name: 'PropertyEdit',
       component: PropertyEdit,
     },
     {
-      path: '/property/list/:propertyType/:user',
-      name: 'PropertyList',
+      path: '/property/admin/list/:by',
+      name: 'PropertyListAdmin',
       component: PropertyList,
     },
     {

src/store/modules/property/propertyLists.js

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

src/store/modules/property/propertySearch.js

@@ -35,62 +35,6 @@ export default {
       state.propertySearch[filter] = 'All';
     },
   },
-  // getters: {
-  //   filterProperties: (state) => {
-  //     let list = state.properties;
-  //     const { propertySearch } = state;
-  //     if (propertySearch) {
-  //       if (propertySearch.salesType === 'Sale') {
-  //         list = _.filter(list, x => x.isSale);
-  //       } else {
-  //         list = _.filter(list, x => !x.isSale);
-  //       }
-  //       if (propertySearch.propertyUsageType && propertySearch.propertyUsageType !== 'All') {
-  //         list = _.filter(list, x => x.propertyUsageType
-  //             .toUpperCase()
-  //             // eslint-disable-next-line comma-dangle
-  //             .includes(propertySearch.propertyUsageType.toUpperCase()));
-  //       }
-  //       if (propertySearch.propertyType && propertySearch.propertyType !== 'All') {
-  //         list = _.filter(list, x => x.propertyType
-  //             .toUpperCase()
-  //             // eslint-disable-next-line comma-dangle
-  //             .includes(propertySearch.propertyType.toUpperCase()));
-  //       }
-  //       if (propertySearch.province && propertySearch.province !== 'All') {
-  //         list = _.filter(list, x => x.province
-  //             .toUpperCase()
-  //             // eslint-disable-next-line comma-dangle
-  //             .includes(propertySearch.province.toUpperCase()));
-  //       }
-  //       if (propertySearch.city && propertySearch.city !== 'All') {
-  //         list = _.filter(list, x => x.city
-  //             .toUpperCase()
-  //             // eslint-disable-next-line comma-dangle
-  //             .includes(propertySearch.city.toUpperCase()));
-  //       }
-  //       if (propertySearch.suburb && propertySearch.suburb !== 'All') {
-  //         list = _.filter(list, x => x.suburb
-  //             .toUpperCase()
-  //             // eslint-disable-next-line comma-dangle
-  //             .includes(propertySearch.suburb.toUpperCase()));
-  //       }
-  //       if (propertySearch.suburb && propertySearch.suburb !== 'All') {
-  //         list = _.filter(list, x => x.suburb
-  //             .toUpperCase()
-  //             // eslint-disable-next-line comma-dangle
-  //             .includes(propertySearch.suburb.toUpperCase()));
-  //       }
-  //       if (propertySearch.minPrice) {
-  //         list = _.filter(list, x => x.price >= propertySearch.minPrice);
-  //       }
-  //       if (propertySearch.maxPrice) {
-  //         list = _.filter(list, x => x.price <= propertySearch.maxPrice);
-  //       }
-  //     }
-  //     return list;
-  //   },
-  // },
   actions: {
     clearFilter({ commit }, filter) {
       commit('onClearFilter', filter);