Implemented the fourth phase of CRUD users

vs0uz4 · vs0uz4 · commit 376ba9d8951e · 2017-10-01T13:23:21.000-03:00
- Created 'remove' method in UsersControllers;
- Refactored 'index' method in UsersControllers for list addresses;
- Created 'remove' method in VdUsersTable component;
- Changed VdUsersTable for view table only users exists;
- Changed VdUsersTable for list users addresses;
- Changed VdUsersTable 'edit' method for send bus event with title property;
- Changed VdUserForm component for use dynamic modal titles;
- Changed VdUsers component for send bus event with 'title' property.
diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
@@ -9,7 +9,8 @@ class UsersController extends Controller
 {
     public function index()
     {
-        $users = User::all();
+        $users = User::with('addresses')->get();
+
         return view('users.index')->with(compact('users'));
     }
 
@@ -42,8 +43,11 @@ public function update($id)
         return redirect()->route('user.index')->with('success', 'Usuário Atualizado com Sucesso!');
     }
 
-    public function remove()
+    public function remove($id)
     {
+        $user = User::find($id);
+        $user->delete();
 
+        return redirect()->route('user.index')->with('success', 'Usuário Removido com Sucesso!');
     }
 }
diff --git a/public/build/js/app-c6bfcb2ec9.js b/public/build/js/app-c6bfcb2ec9.js
diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json
@@ -1,5 +1,5 @@
 {
   "css/app.css": "css/app-ad87f36536.css",
   "css/vendor.css": "css/vendor-0634183a17.css",
-  "js/app.js": "js/app-0eda38ff77.js"
+  "js/app.js": "js/app-c6bfcb2ec9.js"
 }
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/resources/assets/js/app/users/form.vue b/resources/assets/js/app/users/form.vue
@@ -8,16 +8,14 @@
                     id: 0,
                     name: '',
                     email: '',
-                    password: '',
                     created_at: '',
-                    updated_at: '',
-                }
+                    updated_at: ''
+                },
+                modalTitle : '',
+                isEditing: false,
             }
         },
         computed: {
-            isEditing () {
-                return this.user.id !== 0
-            },
             action () {
                 if (this.isEditing) {
                     return `/usuarios/atualizar/${this.user.id}`
@@ -30,20 +28,26 @@
             const userFormModal = jQuery(this.$refs.userFormModal)
 
             bus.$on('open-form', (obj) => {
-                if (obj !== undefined){
+                if (obj.user !== undefined){
+                    this.isEditing = true
                     this.user = obj.user
+                    this.modalTitle = obj.title
+                } else {
+                    this.isEditing = false
+                    this.modalTitle = obj.title
                 }
 
                 userFormModal.modal('show')
             })
 
             userFormModal.on('hidden.bs.modal', () => {
+                this.isEditing = false
                 this.user.id = 0
                 this.user.name = ''
                 this.user.email = ''
-                this.user.password = ''
                 this.user.created_at = ''
                 this.user.updated_at = ''
+                this.modalTitle = ''
             })
         }
     }
@@ -59,7 +63,7 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                        <h4 class="modal-title">Criar Novo Usuário</h4>
+                        <h4 class="modal-title"><i class="fa fa-fw fa-user"></i>{{ modalTitle }}</h4>
                     </div>
                     <div class="modal-body">
                         <form ref="userForm" method="post" :action="action">
diff --git a/resources/assets/js/app/users/main.vue b/resources/assets/js/app/users/main.vue
@@ -10,7 +10,7 @@
         },
         methods: {
             form (){
-                bus.$emit('open-form')
+                bus.$emit('open-form', { title: 'Criar Novo Usuário' })
             }
         }
     }
diff --git a/resources/assets/js/app/users/table.vue b/resources/assets/js/app/users/table.vue
@@ -13,6 +13,9 @@
             users () {
                 return JSON.parse(this.list)
             },
+            hasUsers () {
+                return this.users.length > 0
+            },
         },
         methods: {
             toggle (id) {
@@ -41,18 +44,25 @@
                 return moment(date).format('DD/MM/YYYY')
             },
             edit (user) {
-                bus.$emit('open-form', { user: user})
+                bus.$emit('open-form', { user: user, title: 'Editar Usuário'})
             },
             remove (id) {
+                const confirm = window.confirm('Tem Certeza da Exclusão?')
 
+                if (confirm) {
+                    window.location = `usuarios/remover/${id}`
+                }
             },
         }
     }
 </script>
 
 <template>
     <div>
-        <table class="table table-bordered table-striped">
+        <h5 v-show="!hasUsers">
+            Ainda Não Há Usuários Cadastrados.
+        </h5>
+        <table class="table table-bordered table-striped" v-show="hasUsers">
             <thead>
             <tr>
                 <th class="text-center">
@@ -89,7 +99,11 @@
             </tr>
             <tr v-show="details.includes(user.id)">
                 <td colspan="5">
-                    <i class="fa fa-fw fa-map-marker" aria-hidden="true"></i>Placeholder para Endereço
+                    <div class="row col-md-6" v-for="address in user.addresses">
+                        <div class="address">
+                            <i class="fa fa-fw fa-map-marker" aria-hidden="true"></i> {{ address.street }}, {{ address.number }} - {{ address.city }}, {{ address.state }}
+                        </div>
+                    </div>
                 </td>
             </tr>
             </tbody>
@@ -98,6 +112,13 @@
 </template>
 
 <style>
+    .address {
+        padding: 5px;
+        margin: 5px 5px 5px 0;
+        background-color: #f9f7ee;
+        border: 1px solid #f3ede5;
+        border-radius: 5px;
+    }
     .green {
         color: red;
     }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@ class UsersController extends Controller`
`9`	`9`	`{`
`10`	`10`	`public function index()`
`11`	`11`	`{`
`12`		`- $users = User::all();`
	`12`	`+ $users = User::with('addresses')->get();`
	`13`	`+`
`13`	`14`	`return view('users.index')->with(compact('users'));`
`14`	`15`	`}`
`15`	`16`
`@@ -42,8 +43,11 @@ public function update($id)`
`42`	`43`	`return redirect()->route('user.index')->with('success', 'Usuário Atualizado com Sucesso!');`
`43`	`44`	`}`
`44`	`45`
`45`		`- public function remove()`
	`46`	`+ public function remove($id)`
`46`	`47`	`{`
	`48`	`+ $user = User::find($id);`
	`49`	`+ $user->delete();`
`47`	`50`
	`51`	`+ return redirect()->route('user.index')->with('success', 'Usuário Removido com Sucesso!');`
`48`	`52`	`}`
`49`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"css/app.css": "css/app-ad87f36536.css",`
`3`	`3`	`"css/vendor.css": "css/vendor-0634183a17.css",`
`4`		`- "js/app.js": "js/app-0eda38ff77.js"`
	`4`	`+ "js/app.js": "js/app-c6bfcb2ec9.js"`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`},`
`11`	`11`	`methods: {`
`12`	`12`	`form (){`
`13`		`- bus.$emit('open-form')`
	`13`	`+ bus.$emit('open-form', { title: 'Criar Novo Usuário' })`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`