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

src/components/admin/status/userManagementPage.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- <section class="intro-single"> -->
+  <!-- eslint-disable max-len -->
   <div class="container">
     <br />
     <br />
@@ -7,34 +7,116 @@
     <br />
     <div class="row">
       <div class="col-md-12 col-lg-8">
-        <!-- <div class="title-single-box"> -->
-        <!-- <h1 class="title-single" style="text-align:left;">User Management</h1> -->
-        <!-- </div> -->
         <div class="title-box-d">
           <h1 class="title-d" style="text-align:left; font-size: 250%">User Management</h1>
         </div>
         <br />
       </div>
     </div>
-    <div id="table" class="col-xs-12 table-responsive">
-      <datatable :columns="columns" :data="rows"></datatable>
+    <button @click="addNewAgent" type="button" class="btn btn-b-n">Add New Agent</button>
+    <br />
+    <br />
+    <div class="container">
+      <table class="table table-bordered">
+        <thead>
+          <tr>
+            <th>ID</th>
+            <th>Name</th>
+            <th>Surname</th>
+            <th>Cell Number</th>
+            <th>Telephone Number</th>
+            <th>Email</th>
+            <th>Role</th>
+            <th>Reset Password</th>
+            <th></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td colspan="10">
+              <h5>Private Users</h5>
+            </td>
+          </tr>
+          <tr v-for="(item, i) in individuals" :key="i">
+            <td>{{ item.id }}</td>
+            <td>{{ item.name }}</td>
+            <td>{{ item.surname }}</td>
+            <td>{{ item.cellNumber }}</td>
+            <td>{{ item.telephone }}</td>
+            <td>{{ item.email }}</td>
+            <td v-if="item.user">{{ item.user.role }}</td>
+            <td v-else></td>
+            <td></td>
+            <td>
+              <button
+                type="button"
+                @click="Edit(item)"
+                class="btn btn-b-n"
+                style="width: 85px; height:40px;"
+              >Edit</button>
+            </td>
+            <td>
+              <button type="button" class="btn btn-b-n" style="width: 85px; height:40px">Delete</button>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="10">
+              <h5>Agents</h5>
+            </td>
+          </tr>
+          <tr v-for="(item, i) in agents" :key="i">
+            <td>{{ item.id }}</td>
+            <td>{{ item.name }}</td>
+            <td>{{ item.surname }}</td>
+            <td>{{ item.cellNumber }}</td>
+            <td>{{ item.telephone }}</td>
+            <td>{{ item.email }}</td>
+            <td v-if="item.user">{{ item.user.role }}</td>
+            <td v-else></td>
+            <td></td>
+            <td>
+              <button
+                type="button"
+                @click="Edit(item)"
+                class="btn btn-b-n"
+                style="width: 85px; height:40px;"
+              >Edit</button>
+            </td>
+            <td>
+              <button type="button" class="btn btn-b-n" style="width: 85px; height:40px">Delete</button>
+            </td>
+          </tr>
+        </tbody>
+      </table>
     </div>
+    <br />
   </div>
-  <!-- </section> -->
 </template>
 <script>
 import { mapState, mapActions } from 'vuex';
+import axios from 'axios';
 
 export default {
   name: 'userManagementPage',
-  created() {
-    this.getuserManagementPage();
-  },
-  computed: {
-    ...mapState('status', ['userManagementPage']),
+  data() {
+    return {};
   },
   methods: {
-    ...mapActions('status', ['getuserManagementPage']),
+    ...mapActions('registerIndividual', ['getIndividuals', 'getAgents']),
+    addNewAgent({ commit }) {
+      axios
+        .post('/api/agent')
+        .then(result => commit('saveAgent', result.data))
+        .catch(console.error);
+    },
+  },
+  mounted() {
+    this.getIndividuals();
+    this.getAgents();
+  },
+  computed: {
+    ...mapState('registerIndividual', ['individuals', 'agents']),
   },
 };
 </script>

src/components/home/newsSection.vue

@@ -21,23 +21,23 @@
           <div class="carousel-item-c">
             <div class="card-box-b card-shadow news-box">
               <div class="img-box-b">
-                <img src="img/post-2.jpg" alt class="img-b img-fluid" />
+                <img src="img/Tenant.jpg" alt class="img-b img-fluid" />
               </div>
               <div class="card-overlay">
                 <div class="card-header-b">
                   <div class="card-category-b">
-                    <a href="#" class="category-b">House</a>
+                    <a href="#" class="category-b">Article</a>
                   </div>
                   <div class="card-title-b">
                     <h2 class="title-2">
                       <a href="blog-single.html">
-                        House is comming
-                        <br />new
+                        Landlords, here’s how to spot a ‘bad’ tenant
+                        <br />
                       </a>
                     </h2>
                   </div>
                   <div class="card-date">
-                    <span class="date-b">18 Sep. 2017</span>
+                    <span class="date-b">31 Aug. 2019</span>
                   </div>
                 </div>
               </div>
@@ -46,23 +46,23 @@
           <div class="carousel-item-c">
             <div class="card-box-b card-shadow news-box">
               <div class="img-box-b">
-                <img src="img/post-5.jpg" alt class="img-b img-fluid" />
+                <img src="img/Poll.png" alt class="img-b img-fluid" />
               </div>
               <div class="card-overlay">
                 <div class="card-header-b">
                   <div class="card-category-b">
-                    <a href="#" class="category-b">Travel</a>
+                    <a href="#" class="category-b">Poll</a>
                   </div>
                   <div class="card-title-b">
                     <h2 class="title-2">
                       <a href="blog-single.html">
-                        Travel is comming
-                        <br />new
+                        Which would you rather?
+                        <br />
                       </a>
                     </h2>
                   </div>
                   <div class="card-date">
-                    <span class="date-b">18 Sep. 2017</span>
+                    <span class="date-b">23 Aug. 2019</span>
                   </div>
                 </div>
               </div>
@@ -71,23 +71,23 @@
           <div class="carousel-item-c">
             <div class="card-box-b card-shadow news-box">
               <div class="img-box-b">
-                <img src="img/post-7.jpg" alt class="img-b img-fluid" />
+                <img src="img/Purchasing.jpg" alt class="img-b img-fluid" />
               </div>
               <div class="card-overlay">
                 <div class="card-header-b">
                   <div class="card-category-b">
-                    <a href="#" class="category-b">Park</a>
+                    <a href="#" class="category-b">Article</a>
                   </div>
                   <div class="card-title-b">
                     <h2 class="title-2">
                       <a href="blog-single.html">
-                        Park is comming
-                        <br />new
+                        Six questions before purchasing
+                        <br />
                       </a>
                     </h2>
                   </div>
                   <div class="card-date">
-                    <span class="date-b">18 Sep. 2017</span>
+                    <span class="date-b">19 Aug. 2019</span>
                   </div>
                 </div>
               </div>
@@ -96,23 +96,23 @@
           <div class="carousel-item-c">
             <div class="card-box-b card-shadow news-box">
               <div class="img-box-b">
-                <img src="img/post-3.jpg" alt class="img-b img-fluid" />
+                <img src="img/Article.jpg" alt class="img-b img-fluid" />
               </div>
               <div class="card-overlay">
                 <div class="card-header-b">
                   <div class="card-category-b">
-                    <a href="#" class="category-b">Travel</a>
+                    <a href="#" class="category-b">Poll</a>
                   </div>
                   <div class="card-title-b">
                     <h2 class="title-2">
                       <a href="#">
-                        Travel is comming
-                        <br />new
+                        December holidays; a perfect family escape.
+                        <br />
                       </a>
                     </h2>
                   </div>
                   <div class="card-date">
-                    <span class="date-b">18 Sep. 2017</span>
+                    <span class="date-b">23 Aug. 2019</span>
                   </div>
                 </div>
               </div>

src/components/property/propertyPage.vue

@@ -142,70 +142,7 @@
                       </div>
                     </div>
                   </div>
-                  <div class="row">
-                    <div class="col-md-12">
-                      <img src="img/agent-4.jpg" alt class="img-fluid" />
-                    </div>
-                  </div>
-                  <div class="row">
-                    <div class="col-md-12">
-                      <div class="property-agent">
-                        <h4 class="title-agent">Anabella Geller</h4>
-                        <p class="color-text-a">
-                          Nulla porttitor accumsan tincidunt. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet
-                          dui. Quisque velit nisi,
-                          pretium ut lacinia in, elementum id enim.
-                        </p>
-                        <ul class="list-unstyled">
-                          <li class="d-flex justify-content-between">
-                            <strong>Phone:</strong>
-                            <span class="color-text-a">(222) 4568932</span>
-                          </li>
-                          <li class="d-flex justify-content-between">
-                            <strong>Mobile:</strong>
-                            <span class="color-text-a">777 287 378 737</span>
-                          </li>
-                          <li class="d-flex justify-content-between">
-                            <strong>Email:</strong>
-                            <span class="color-text-a">annabella@example.com</span>
-                          </li>
-                          <li class="d-flex justify-content-between">
-                            <strong>Skype:</strong>
-                            <span class="color-text-a">Annabela.ge</span>
-                          </li>
-                        </ul>
-                        <div class="socials-a">
-                          <ul class="list-inline">
-                            <li class="list-inline-item">
-                              <a href="#">
-                                <i class="fa fa-facebook" aria-hidden="true"></i>
-                              </a>
-                            </li>
-                            <li class="list-inline-item">
-                              <a href="#">
-                                <i class="fa fa-twitter" aria-hidden="true"></i>
-                              </a>
-                            </li>
-                            <li class="list-inline-item">
-                              <a href="#">
-                                <i class="fa fa-instagram" aria-hidden="true"></i>
-                              </a>
-                            </li>
-                            <li class="list-inline-item">
-                              <a href="#">
-                                <i class="fa fa-pinterest-p" aria-hidden="true"></i>
-                              </a>
-                            </li>
-                            <li class="list-inline-item">
-                              <a href="#">
-                                <i class="fa fa-dribbble" aria-hidden="true"></i>
-                              </a>
-                            </li>
-                          </ul>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
+
                   <div class="row">
                     <div class="col-md-12">
                       <div class="property-contact">

src/components/shared/navBar.vue

@@ -134,7 +134,7 @@
               </div>
             </li>
 
-            <li class="nav-item dropdown">
+            <li v-if="showLogout" class="nav-item dropdown">
               <a
                 class="nav-link dropdown-toggle"
                 href="#"

src/components/timeshare/buy/weekListComponent.vue

@@ -4,15 +4,15 @@
       <table class="table table-bordered">
         <thead>
           <tr>
-            <th>Region</th>
+            <th>Province</th>
             <th>Resort</th>
-            <th>Unit Number</th>
-            <th>Week Number</th>
-            <th>Arrival Date</th>
-            <th>Departure Date</th>
+            <th>Unit</th>
+            <th>Week</th>
+            <th>Arrival</th>
+            <th>Departure</th>
             <th>Bedrooms</th>
-            <th>Price</th>
-            <th>Status</th>
+            <th style="width:15%">Price</th>
+            <!-- <th>Status</th> -->
             <th>Interested</th>
           </tr>
         </thead>
@@ -26,7 +26,7 @@
             <td>{{item.departureDate | toDate}}</td>
             <td>{{item.bedrooms}}</td>
             <td>{{item.sellPrice | toCurrency}}</td>
-            <td>{{item.status ? item.status.description : ''}}</td>
+            <!-- <td>{{item.status ? item.status.description : ''}}</td> -->
             <td>
               <div class="col-md-12">
                 <button

src/components/timeshare/searchTimeshare.vue

@@ -34,10 +34,7 @@
             </span>
           </div>
           <select class="form-control" name="resort" id="resort" v-model="filter.resort">
-            <option v-for="(item, i) in filteredResorts" :key="i" :value="item">
-              {
-              {item.resortName}}
-            </option>
+            <option v-for="(item, i) in filteredResorts" :key="i" :value="item">{{item.resortName}}</option>
           </select>
           <div class="input-group-append" @click="clearFilter('resort')">
             <span class="input-group-text cursor-pointer" style="color: #60CBEB">

src/store/modules/user/register.js

@@ -3,6 +3,8 @@ import axios from 'axios';
 export default {
   namespaced: true,
   state: {
+    individuals: [],
+    agents: [],
     registerIndividual: {
       name: '',
       surname: '',
@@ -29,6 +31,12 @@ export default {
     setIndividual(state, type) {
       state.registerIndividual = type;
     },
+    setIndividuals(state, type) {
+      state.individuals = type;
+    },
+    setAgents(state, type) {
+      state.agents = type;
+    },
     setAgency(state, type) {
       state.registerAgency = type;
     },
@@ -38,6 +46,9 @@ export default {
     addAgency(state, type) {
       state.registerAgency = type;
     },
+    addAgent(state, type) {
+      state.registerIndividual = type;
+    },
     updateIndividual(state, type) {
       state.registerIndividual.find(item => item.id === type.id).username = type.username;
       state.registerIndividual.find(item => item.id === type.id).password = type.password;
@@ -82,14 +93,22 @@ export default {
   },
   getters: {},
   actions: {
-    // getIndividual({
-    //   commit,
-    // }, id) {
-    //   axios
-    //     .get(`/api/user/${id}`)
-    //     .then(result => commit('setIndividual', result.data))
-    //     .catch(console.error);
-    // },
+    getIndividuals({
+      commit,
+    }) {
+      axios
+        .get('/api/individual')
+        .then(result => commit('setIndividuals', result.data))
+        .catch(console.error);
+    },
+    getAgents({
+      commit,
+    }) {
+      axios
+        .get('/api/agent')
+        .then(result => commit('setAgents', result.data))
+        .catch(console.error);
+    },
     // getAgency({
     //   commit,
     // }, id) {
@@ -115,6 +134,14 @@ export default {
         .then(result => commit('addAgency', result.data))
         .catch(console.error);
     },
+    saveAgent({
+      commit,
+    }, item) {
+      axios
+        .post('/api/agent', item)
+        .then(result => commit('addAgent', result.data))
+        .catch(console.error);
+    },
     // updateIndividual({
     //   commit,
     // }, item) {