Merge remote-tracking branch 'origin/master'

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,71 @@
     <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>
+    <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></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <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>
+              <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';
 
 export default {
   name: 'userManagementPage',
-  created() {
-    this.getuserManagementPage();
-  },
-  computed: {
-    ...mapState('status', ['userManagementPage']),
+  data() {
+    return {};
   },
   methods: {
-    ...mapActions('status', ['getuserManagementPage']),
+    ...mapActions('registerIndividual', ['getIndividuals']),
+  },
+  mounted() {
+    this.getIndividuals();
+  },
+  computed: {
+    ...mapState('registerIndividual', ['individuals']),
   },
 };
 </script>

src/components/shared/navBar.vue

@@ -136,6 +136,7 @@
 
             <li class="nav-item dropdown">
               <a
+                v-if="showLogout"
                 class="nav-link dropdown-toggle"
                 href="#"
                 id="navbarDropdown"

src/store/modules/user/register.js

@@ -3,6 +3,7 @@ import axios from 'axios';
 export default {
   namespaced: true,
   state: {
+    individuals: [],
     registerIndividual: {
       name: '',
       surname: '',
@@ -29,6 +30,9 @@ export default {
     setIndividual(state, type) {
       state.registerIndividual = type;
     },
+    setIndividuals(state, type) {
+      state.individuals = type;
+    },
     setAgency(state, type) {
       state.registerAgency = type;
     },
@@ -82,14 +86,14 @@ 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);
+    },
     // getAgency({
     //   commit,
     // }, id) {