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

src/components/property/propertyeditPage.vue

@@ -38,7 +38,7 @@
                   id="propertyType"
                   v-model="property.propertyTypeId"
                 >
-                  <option value="0">Please Select</option>
+                  <option value="0">Please select type</option>
                   <option
                     v-for="item in propertyTypes"
                     :value="item.id"
@@ -74,6 +74,8 @@
                   class="form-control"
                   type="text"
                   name="address1"
+                  placeholder="Apartment, suite, unit, building, floor, Po Box etc."
+                  style="font-size: 50%"
                   id="address1"
                   v-model="property.addressLine1"
                 />
@@ -84,16 +86,20 @@
                   class="form-control"
                   type="text"
                   name="address2"
+                  placeholder="Complex, estate, company name, etc."
+                  style="font-size: 50%"
                   id="address2"
                   v-model="property.addressLine2"
                 />
               </div>
               <div class="col-md-4">
-                <label>Address Line 3</label>
+                <label>Street</label>
                 <input
                   class="form-control"
                   type="text"
                   name="address3"
+                  placeholder="Street or c/o name"
+                  style="font-size: 50%"
                   id="address3"
                   v-model="property.addressLine3"
                 />
@@ -109,7 +115,7 @@
                   @change="ProvinceSelected"
                   v-model="property.provinceId"
                 >
-                  <option value="0">Please select</option>
+                  <option value="0">Please select province</option>
                   <option
                     v-for="province in provinces"
                     :value="province.id"
@@ -126,7 +132,7 @@
                   @change="CitySelected"
                   v-model="property.cityId"
                 >
-                  <option value="0">Please Select</option>
+                  <option value="0">Please select city</option>
                   <option
                     v-for="city in cities"
                     :value="city.id"
@@ -142,7 +148,7 @@
                   id="suburbselector"
                   v-model="property.suburbId"
                 >
-                  <option value="0">Please Select</option>
+                  <option value="0">Please select suburb</option>
                   <option
                     v-for="suburb in suburbs"
                     :value="suburb.id"
@@ -155,14 +161,19 @@
               <div class="col-md-4">
                 <label v-if="salesType === 'Rental'">Rental Price</label>
                 <label v-if="salesType !== 'Rental'">Sales Price</label>
-                <input
-                  class="form-control"
-                  type="number"
-                  name="price"
-                  id="price"
-                  placeholder="R"
-                  v-model="property.price"
-                />
+                <div class="input-group-prepend">
+                  <span class="input-group-text" style="color: #60CBEB">
+                    <b>R</b>
+                  </span>
+                  <input
+                    class="form-control"
+                    type="number"
+                    name="price"
+                    id="price"
+                    placeholder="R"
+                    v-model="property.price"
+                  />
+                </div>
               </div>
               <div class="col-md-4" v-if="salesType === 'Rental'">
                 <label>Per</label>

src/components/timeshare/buy/weekListComponent.vue

@@ -0,0 +1,52 @@
+<template>
+  <div>
+    <table class="table table-bordered">
+      <thead>
+        <tr>
+          <th>Resort</th>
+          <th>Unit Number</th>
+          <th>Week Number</th>
+          <th>Module</th>
+          <th>Bedrooms</th>
+          <th>Season</th>
+          <th>Price</th>
+          <th>Status</th>
+          <th>Interested</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr v-for="(item, i) in weeks" :key="i">
+          <td>{{item.id}}</td>
+          <td>{{item.code}}</td>
+          <td>{{item.description}}</td>
+          <td>{{item.id}}</td>
+          <td>{{item.code}}</td>
+          <td>{{item.description}}</td>
+          <td>{{item.id}}</td>
+          <td>{{item.code}}</td>
+          <td>{{item.description}}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+<script>
+import { mapState, mapActions } from 'vuex';
+
+export default {
+  props: {
+    resortCode: undefined,
+  },
+  mounted() {
+    this.getWeeks(this.resortCode);
+  },
+  computed: {
+    ...mapState('weekList', ['weeks']),
+  },
+  methods: {
+    ...mapActions('weekList', ['getWeeks']),
+  },
+};
+</script>
+<style>
+</style>

src/components/timeshare/resort/resortPage.vue

@@ -87,34 +87,7 @@
             </div>
           </div>
           <div class="col-md-9">
-            <table class="table table-bordered">
-              <thead>
-                <tr>
-                  <th>Resort</th>
-                  <th>Unit Number</th>
-                  <th>Week Number</th>
-                  <th>Module</th>
-                  <th>Bedrooms</th>
-                  <th>Season</th>
-                  <th>Price</th>
-                  <th>Status</th>
-                  <th>Interested</th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr v-for="(item, i) in week" :key="i">
-                  <td>{{item.id}}</td>
-                  <td>{{item.code}}</td>
-                  <td>{{item.description}}</td>
-                  <td>{{item.id}}</td>
-                  <td>{{item.code}}</td>
-                  <td>{{item.description}}</td>
-                  <td>{{item.id}}</td>
-                  <td>{{item.code}}</td>
-                  <td>{{item.description}}</td>
-                </tr>
-              </tbody>
-            </table>
+            <WeekList :resortCode="resortCode" />
             <div>
               <div class="btn btn-b-n" @click="routerGoTo('/timeshare/buy')">Back to Region</div>
               <hr />
@@ -202,11 +175,15 @@
 </template>
 <script>
 import { mapState, mapActions } from 'vuex';
+import WeekList from '../buy/weekListComponent.vue';
 
 export default {
   props: {
     resortCode: {},
   },
+  components: {
+    WeekList,
+  },
   mounted() {
     this.initResort(this.resortCode);
   },
@@ -221,11 +198,7 @@ export default {
     ]),
     mapUrl() {
       return this.resort
-        ? 'http://maps.google.com/maps?q='
-            + this.resort.prLatitude
-            + ', '
-            + this.resort.prLongitude
-            + '&z=15&output=embed'
+        ? `http://maps.google.com/maps?q=${this.resort.prLatitude},${this.resort.prLongitude}&z=15&output=embed`
         : '';
     },
   },

src/components/timeshare/sell/sellPage.vue

@@ -129,23 +129,11 @@
           <div class="form-group row">
             <div class="col-md-6">
               <label for="Module">Module</label>
-              <input
-                class="form-control"
-                placeholder="Module"
-                type="text"
-                name="module"
-                v-model="sellItem.module"
-              />
+              <input class="form-control" type="text" name="module" v-model="sellItem.module" />
             </div>
             <div class="col-md-6">
               <label for="Week number">Week Number</label>
-              <input
-                class="form-control"
-                placeholder="Week Number"
-                type="text"
-                name="week"
-                v-model="sellItem.weekNumber"
-              />
+              <input class="form-control" type="text" name="week" v-model="sellItem.weekNumber" />
             </div>
           </div>
           <div class="form-group row">
@@ -165,23 +153,11 @@
           <div class="form-group row">
             <div class="col-md-6">
               <label for="Unit number">Unit Number</label>
-              <input
-                class="form-control"
-                placeholder="Unit Number"
-                type="text"
-                name="unit"
-                v-model="sellItem.unitNumber"
-              />
+              <input class="form-control" type="text" name="unit" v-model="sellItem.unitNumber" />
             </div>
             <div class="col-md-6">
               <label for="Owner">Owner</label>
-              <input
-                class="form-control"
-                placeholder="Owner"
-                type="text"
-                name="owner"
-                v-model="sellItem.owner"
-              />
+              <input class="form-control" type="text" name="owner" v-model="sellItem.owner" />
             </div>
           </div>
           <div class="form-group row">
@@ -189,7 +165,6 @@
               <label for="Levy">Levy Amount</label>
               <input
                 class="form-control"
-                placeholder="Levy"
                 type="number"
                 step="any"
                 name="levy"

src/components/user/loginPage.vue

@@ -12,7 +12,7 @@
               <div class="input-group mb-3">
                 <div class="input-group-prepend">
                   <span class="input-group-text">
-                    <eva-icon name="person" fill="#60CBEB"></eva-icon>
+                    <eva-icon name="person-outline" fill="#60CBEB"></eva-icon>
                   </span>
                   <input
                     class="form-control"
@@ -26,7 +26,7 @@
               <div class="input-group mb-3">
                 <div class="input-group-prepend">
                   <span class="input-group-text">
-                    <eva-icon name="lock" fill="#60CBEB"></eva-icon>
+                    <eva-icon name="lock-outline" fill="#60CBEB"></eva-icon>
                   </span>
                   <input
                     class="form-control"
@@ -41,11 +41,11 @@
                     <span class="input-group-text">
                       <eva-icon
                         v-if="!showPassword"
-                        name="eye-off"
+                        name="eye-off-outline"
                         fill="#60CBEB"
                         @click="togglePassword()"
                       ></eva-icon>
-                      <eva-icon v-else name="eye" fill="#60CBEB" @click="passwordToggled()"></eva-icon>
+                      <eva-icon v-else name="eye-outline" fill="#60CBEB" @click="passwordToggled()"></eva-icon>
                     </span>
                   </div>
                 </div>
@@ -65,7 +65,7 @@
             <div class="row">
               <div class="input-group-prepend">
                 <span class="input-group-text">
-                  <eva-icon name="email" fill="#60CBEB"></eva-icon>
+                  <eva-icon name="email-outline" fill="#60CBEB"></eva-icon>
                 </span>
                 <input class="form-control" placeholder="Your Email" type="text" name="email" value />
               </div>

src/components/user/registerAgencySection.vue

@@ -5,47 +5,49 @@
       <div class="reg-page">
         <div class="regform" style="text-align:left">
           <h4>Agency Details</h4>
-          <div class="row" style="text-align:left">
-            <div class="col-md-8" style="margin-bottom: 1em">
-              <div class="input-group-prepend">
-                <span class="input-group-text">
-                  <eva-icon name="people" fill="#60CBEB"></eva-icon>
-                </span>
-                <input
-                  class="form-control"
-                  type="text"
-                  name="agencyname"
-                  placeholder="Agency Name"
-                  v-model="registerAgency.name"
-                />
+          <div class="row">
+            <div class="row" style="text-align:left">
+              <div class="col-md-8" style="margin-bottom: 1em">
+                <div class="input-group-prepend">
+                  <span class="input-group-text">
+                    <eva-icon name="people-outline" fill="#60CBEB"></eva-icon>
+                  </span>
+                  <input
+                    class="form-control"
+                    type="text"
+                    name="agencyname"
+                    placeholder="Agency Name"
+                    v-model="registerAgency.name"
+                  />
+                </div>
               </div>
-            </div>
-            <div class="col-md-8" style="margin-bottom: 1em">
-              <div class="input-group-prepend">
-                <span class="input-group-text">
-                  <eva-icon name="book" fill="#60CBEB"></eva-icon>
-                </span>
-                <input
-                  class="form-control"
-                  type="text"
-                  name="eaabffcnumber"
-                  placeholder="EAAB FFC Number"
-                  v-model="registerAgency.eaabeffcNumber"
-                />
+              <div class="col-md-8" style="margin-bottom: 1em">
+                <div class="input-group-prepend">
+                  <span class="input-group-text">
+                    <eva-icon name="book-outline" fill="#60CBEB"></eva-icon>
+                  </span>
+                  <input
+                    class="form-control"
+                    type="text"
+                    name="eaabffcnumber"
+                    placeholder="EAAB FFC Number"
+                    v-model="registerAgency.eaabeffcNumber"
+                  />
+                </div>
               </div>
-            </div>
-            <div class="col-md-8">
-              <div class="input-group-prepend">
-                <span class="input-group-text">
-                  <eva-icon name="clipboard" fill="#60CBEB"></eva-icon>
-                </span>
-                <input
-                  class="form-control"
-                  type="text"
-                  name="companyregnumber"
-                  placeholder="Company Registration Number"
-                  v-model="registerAgency.companyRegNumber"
-                />
+              <div class="col-md-8">
+                <div class="input-group-prepend">
+                  <span class="input-group-text">
+                    <eva-icon name="clipboard-outline" fill="#60CBEB"></eva-icon>
+                  </span>
+                  <input
+                    class="form-control"
+                    type="text"
+                    name="companyregnumber"
+                    placeholder="Company Registration Number"
+                    v-model="registerAgency.companyRegNumber"
+                  />
+                </div>
               </div>
             </div>
           </div>
@@ -56,7 +58,7 @@
               <div class="input-group mb-3">
                 <div class="input-group-prepend">
                   <span class="input-group-text">
-                    <eva-icon name="person" fill="#60CBEB"></eva-icon>
+                    <eva-icon name="person-outline" fill="#60CBEB"></eva-icon>
                   </span>
                   <input
                     class="form-control"
@@ -71,7 +73,7 @@
               <div class="input-group mb-3">
                 <div class="input-group-prepend">
                   <span class="input-group-text">
-                    <eva-icon name="person" fill="#60CBEB"></eva-icon>
+                    <eva-icon name="person-outline" fill="#60CBEB"></eva-icon>
                   </span>
                   <input
                     class="form-control"
@@ -88,7 +90,7 @@
               <div class="input-group mb-3">
                 <div class="input-group-prepend">
                   <span class="input-group-text">
-                    <eva-icon name="email" fill="#60CBEB"></eva-icon>
+                    <eva-icon name="email-outline" fill="#60CBEB"></eva-icon>
                   </span>
                   <input
                     class="form-control"
@@ -103,7 +105,7 @@
               <div class="input-group mb-3">
                 <div class="input-group-prepend">
                   <span class="input-group-text">
-                    <eva-icon name="smartphone" fill="#60CBEB"></eva-icon>
+                    <eva-icon name="smartphone-outline" fill="#60CBEB"></eva-icon>
                   </span>
                   <input
                     class="form-control"
@@ -134,7 +136,7 @@
               <div class="input-group mb-3">
                 <div class="input-group-prepend">
                   <span class="input-group-text">
-                    <eva-icon name="person" fill="#60CBEB"></eva-icon>
+                    <eva-icon name="person-outline" fill="#60CBEB"></eva-icon>
                   </span>
                   <input
                     class="form-control"
@@ -148,7 +150,7 @@
               <div class="input-group mb-3">
                 <div class="input-group-prepend">
                   <span class="input-group-text">
-                    <eva-icon name="lock" fill="#60CBEB"></eva-icon>
+                    <eva-icon name="lock-outline" fill="#60CBEB"></eva-icon>
                   </span>
                   <input
                     class="form-control"
@@ -164,7 +166,7 @@
               <div class="input-group mb-3">
                 <div class="input-group-prepend">
                   <span class="input-group-text">
-                    <eva-icon name="lock" fill="#60CBEB"></eva-icon>
+                    <eva-icon name="lock-outline" fill="#60CBEB"></eva-icon>
                   </span>
                   <input
                     class="form-control"
@@ -181,11 +183,11 @@
                   <span class="input-group-text">
                     <eva-icon
                       v-if="!showPassword"
-                      name="eye-off"
+                      name="eye-off-outline"
                       fill="#60CBEB"
                       @click="togglePassword()"
                     ></eva-icon>
-                    <eva-icon v-else name="eye" fill="#60CBEB" @click="passwordToggled()"></eva-icon>
+                    <eva-icon v-else name="eye-outline" fill="#60CBEB" @click="passwordToggled()"></eva-icon>
                   </span>
                 </div>
               </div>

src/components/user/registerPage.vue

@@ -83,7 +83,7 @@
             <div class="col-md-8" style="margin-bottom: 1em">
               <div class="input-group-prepend">
                 <span class="input-group-text">
-                  <eva-icon name="person" fill="#60CBEB"></eva-icon>
+                  <eva-icon name="person-outline" fill="#60CBEB"></eva-icon>
                 </span>
                 <input
                   class="form-control"
@@ -97,7 +97,7 @@
             <div class="col-md-8" style="margin-bottom: 1em">
               <div class="input-group-prepend">
                 <span class="input-group-text">
-                  <eva-icon name="lock" fill="#60CBEB"></eva-icon>
+                  <eva-icon name="lock-outline" fill="#60CBEB"></eva-icon>
                 </span>
                 <input
                   class="form-control"
@@ -113,7 +113,7 @@
             <div class="col-md-8" style="margin-bottom: 1em">
               <div class="input-group-prepend">
                 <span class="input-group-text">
-                  <eva-icon name="lock" fill="#60CBEB"></eva-icon>
+                  <eva-icon name="lock-outline" fill="#60CBEB"></eva-icon>
                 </span>
                 <input
                   class="form-control"
@@ -129,11 +129,11 @@
                     <span class="input-group-text">
                       <eva-icon
                         v-if="!showPassword"
-                        name="eye-off"
+                        name="eye-off-outline"
                         fill="#60CBEB"
                         @click="togglePassword()"
                       ></eva-icon>
-                      <eva-icon v-else name="eye" fill="#60CBEB" @click="passwordToggled()"></eva-icon>
+                      <eva-icon v-else name="eye-outline" fill="#60CBEB" @click="passwordToggled()"></eva-icon>
                     </span>
                   </div>
                 </div>

src/store/index.js

@@ -14,6 +14,7 @@ import PropertyAdminModule from './modules/property/propertyAdmin';
 import PropertyList from './modules/property/propertyLists';
 import PropertyTypes from './modules/property/propertyTypes';
 import Register from './modules/user/register';
+import WeekList from './modules/timeshare/weekList';
 
 Vue.use(Vuex);
 /* eslint no-param-reassign: ["error", { "props": false }] */
@@ -33,5 +34,6 @@ export default new Vuex.Store({
     propertyTypes: PropertyTypes,
     registerIndividual: Register,
     registerAgency: Register,
+    weekList: WeekList,
   },
 });

src/store/modules/timeshare/weekList.js

@@ -0,0 +1,26 @@
+/* eslint-disable no-restricted-syntax */
+/* eslint-disable guard-for-in */
+import axios from 'axios';
+
+export default {
+  namespaced: true,
+  state: {
+    weeks: [],
+  },
+  mutations: {
+    setWeeks(state, weeks) {
+      state.weeks = weeks;
+    },
+  },
+  getters: {},
+  actions: {
+    getWeeks({
+      commit,
+    }, resortCode) {
+      axios
+        .get(`/api/timeshare/GetByResortCode/${resortCode}`)
+        .then(result => commit('setStatusList', result.data))
+        .catch(console.error);
+    },
+  },
+};

vue.config.js

@@ -2,7 +2,7 @@ module.exports = {
   devServer: {
     proxy: {
       '/api': {
-        target: 'http://192.168.6.188:5000',
+        target: 'http://localhost:57260',
         changeOrigin: true,
       },
     },