From b24bdc4f6ec8154b5bfc3ca1755e6616dbe5a419 Mon Sep 17 00:00:00 2001
From: woothu <32914662+woothu@users.noreply.github.com>
Date: Sat, 19 Oct 2019 15:28:42 +0200
Subject: [PATCH] fix: fix users view

---
 src/views/users/User.vue  | 21 ++++++----------
 src/views/users/Users.vue | 51 +++++++++++++++++++--------------------
 2 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/src/views/users/User.vue b/src/views/users/User.vue
index 9ed6b8e6..dbf0e450 100644
--- a/src/views/users/User.vue
+++ b/src/views/users/User.vue
@@ -10,12 +10,12 @@
             striped
             small
             fixed
-            :items="items($route.params.id)"
+            :items="getUserData($route.params.id)"
             :fields="$options.fields"
           />
         </CCardBody>
         <CCardFooter>
-          <CButton @click="goBack">Back</CButton>
+          <CButton color="primary" @click="goBack">Back</CButton>
         </CCardFooter>
       </CCard>
     </CCol>
@@ -26,25 +26,18 @@
 import usersData from './UsersData'
 export default {
   name: 'User',
-  props: {
-    caption: {
-      type: String,
-      default: 'User id'
-    },
-  },
   fields: [
-    { key: 'key', _style:'width:150px'},
-    { key: 'value' , _style:'width:150px;', _classes:'font-weight-bold'}
+    { key: 'key', _style: 'width:150px' },
+    { key: 'value' , _style: 'width:150px;' }
   ],
   methods: {
-    items (id) {
-      const user = usersData.find( user => user.id.toString() === id)
+    getUserData (id) {
+      const user = usersData.find((user, index) => index + 1 == id)
       const userDetails = user ? Object.entries(user) : [['id', 'Not found']]
-      return userDetails.map(([key, value]) => {return {key: key, value: value}})
+      return userDetails.map(([key, value]) => { return { key, value } })
     },
     goBack() {
       this.$router.go(-1)
-      // this.$router.replace({path: '/users'})
     }
   }
 }
diff --git a/src/views/users/Users.vue b/src/views/users/Users.vue
index 1cf7b633..5034db2d 100644
--- a/src/views/users/Users.vue
+++ b/src/views/users/Users.vue
@@ -2,28 +2,31 @@
   <CRow>
     <CCol col="12" xl="8">
       <transition name="slide">
-        <CCard header-html="users" body-wrapper>
+        <CCard header-html="Users" body-wrapper>
           <CTable
             hover
             striped
             :items="items"
             :fields="fields"
-            :current-page="currentPage"
-            :per-page="perPage"
+            :items-per-page="perPage"
             @row-clicked="rowClicked"
             :pagination="$options.paginationProps"
+            index-column
+            clickable-rows
           >
-            <td slot="id" slot-scope="data">
-              <strong>{{data.item.id}}</strong>
-            </td>
-            <td slot="name" slot-scope="data">
-              <strong>{{data.item.name}}</strong>
-            </td>
-            <td slot="status" slot-scope="data">
-              <CBadge :color="getBadge(data.item.status)">
-                {{data.item.status}}
-              </CBadge>
-            </td>
+            <template #username="data">
+              <td>
+                <strong>{{data.item.username}}</strong>
+              </td>
+            </template>
+           
+            <template #status="data">
+              <td>
+                <CBadge :color="getBadge(data.item.status)">
+                  {{data.item.status}}
+                </CBadge>
+              </td>
+            </template>
           </CTable>
         </CCard>
       </transition>
@@ -37,22 +40,19 @@ export default {
   name: 'Users',
   data: () => {
     return {
-      items: usersData.filter((user) => user.id < 42),
+      items: usersData,
       fields: [
-        {key: 'id'},
-        {key: 'name'},
-        {key: 'registered'},
-        {key: 'role'},
-        {key: 'status'}
+        { key: 'username', label: 'Name' },
+        { key: 'registered' },
+        { key: 'role' },
+        { key: 'status' }
       ],
-      currentPage: 1,
       perPage: 5,
-      totalRows: 0
     }
   },
   paginationProps: {
     align: 'center',
-    hideDoubleArrows: true,
+    doubleArrows: false,
     previousButtonHtml: 'prev',
     nextButtonHtml: 'next'
   },
@@ -66,11 +66,10 @@ export default {
     userLink (id) {
       return `users/${id.toString()}`
     },
-    rowClicked (item) {
-      const userLink = this.userLink(item.id)
+    rowClicked (item, index) {
+      const userLink = this.userLink(index + 1)
       this.$router.push({path: userLink})
     }
-
   }
 }
 </script>