Merge pull request #37 from tuandm/feature/improve-user-management

User search and quick add
tuandm · Apr 20, 2019 · 902ad69 · 902ad69
2 parents 61b2a76 + ce7fc49
commit 902ad69
Show file tree

Hide file tree

Showing 10 changed files with 311 additions and 38 deletions.
diff --git a/app/Http/Controllers/LaravueController.php b/app/Http/Controllers/LaravueController.php
@@ -1,11 +1,23 @@
 <?php
+/**
+ * File LaravelController.php
+ *
+ * @author Tuan Duong <[email protected]>
+ * @package Laravue
+ * @version 1.0
+ */
 
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 
 class LaravueController extends Controller
 {
+    /**
+     * Entry point for Laravue Dashboard
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
     public function index()
     {
         return view('laravue');

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -1,22 +1,49 @@
 <?php
+/**
+ * File UserController.php
+ *
+ * @author Tuan Duong <[email protected]>
+ * @package Laravue
+ * @version 1.0
+ */
 
 namespace App\Http\Controllers;
 
 use App\Http\Resources\User;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Input;
+use Illuminate\Http\Resources\Json\ResourceCollection;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Validation\Rule;
 use Validator;
 
 class UserController extends Controller
 {
+    const ITEM_PER_PAGE = 15;
     /**
-     * Display a listing of the resource.
+     * Display a listing of the user resource.
      *
-     * @return \Illuminate\Http\Response
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response|ResourceCollection
      */
-    public function index()
+    public function index(Request $request)
     {
-        return User::collection(\App\User::paginate(15));
+        $searchParams = $request->all();
+        $userQuery = \App\User::query();
+        $limit = Arr::get($searchParams, 'limit', static::ITEM_PER_PAGE);
+        $role = Arr::get($searchParams, 'role', '');
+        $keyword = Arr::get($searchParams, 'keyword', '');
+
+        if (!empty($role)) {
+            $userQuery->where('role', $role);
+        }
+
+        if (!empty($keyword)) {
+            $userQuery->where('name', 'LIKE', '%' . $keyword . '%');
+            $userQuery->where('email', 'LIKE', '%' . $keyword . '%');
+        }
+
+        return User::collection($userQuery->paginate($limit));
     }
 
     /**
@@ -27,7 +54,31 @@ public function index()
      */
     public function store(Request $request)
     {
-        //
+        sleep(1);
+        $validator = Validator::make(
+            $request->all(),
+            array_merge(
+                $this->getValidationRules(),
+                [
+                    'password' => ['required', 'min:6'],
+                    'confirmPassword' => 'same:password',
+                ]
+            )
+        );
+
+        if ($validator->fails()) {
+            return response()->json(['errors' => $validator->errors()], 403);
+        } else {
+            $params = $request->all();
+            $user = \App\User::create([
+                'name' => $params['name'],
+                'email' => $params['email'],
+                'role' => $params['role'],
+                'password' => Hash::make($params['password']),
+            ]);
+
+            return new User($user);
+        }
     }
 
     /**
@@ -45,23 +96,16 @@ public function show($id)
      * Update the specified resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
+     * @param  \App\User $user
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, int $id)
+    public function update(Request $request, \App\User $user)
     {
-        $user = \App\User::find($id);
         if ($user === null) {
             return response()->json(['error' => 'User not found'], 404);
         }
 
-        $rules = array(
-            'name' => 'required',
-            'email' => 'required|email',
-            'role' => 'required|not_in:admin',
-        );
-
-        $validator = Validator::make($request->all(), $rules);
+        $validator = Validator::make($request->all(), $this->getValidationRules());
         if ($validator->fails()) {
             return response()->json(['errors' => $validator->errors()], 403);
         } else {
@@ -75,11 +119,25 @@ public function update(Request $request, int $id)
     /**
      * Remove the specified resource from storage.
      *
-     * @param  int  $id
+     * @param  \App\User $user
      * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy(\App\User $user)
+    {
+        $user->delete();
+        return response()->json(null, 204);
+    }
+
+    private function getValidationRules()
     {
-        //
+        return [
+            'name' => 'required',
+            'email' => 'required|email',
+            'role' => [
+                'required',
+                'not_in:admin',
+                Rule::in(['admin', 'editor', 'user', 'guest']),
+            ],
+        ];
     }
 }
diff --git a/app/User.php b/app/User.php
@@ -6,6 +6,16 @@
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Tymon\JWTAuth\Contracts\JWTSubject;
 
+/**
+ * Class User
+ *
+ * @property string $name
+ * @property string $email
+ * @property string $role
+ * @property string $password
+ *
+ * @package App
+ */
 class User extends Authenticatable implements JWTSubject
 {
     use Notifiable;
@@ -16,7 +26,7 @@ class User extends Authenticatable implements JWTSubject
      * @var array
      */
     protected $fillable = [
-        'name', 'email', 'password',
+        'name', 'email', 'password', 'role'
     ];
 
     /**

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "driver.js": "^0.9.5",
     "dropzone": "^5.5.1",
     "echarts": "^4.1.0",
-    "element-ui": "^2.6.1",
+    "element-ui": "^2.7.2",
     "file-saver": "^2.0.1",
     "fuse.js": "^3.4.4",
     "js-cookie": "^2.2.0",

diff --git a/resources/js/api/resource.js b/resources/js/api/resource.js
@@ -24,11 +24,10 @@ class Resource {
     return request({
       url: '/' + this.uri,
       method: 'post',
-      params: resource,
+      data: resource,
     });
   }
   update(id, resource) {
-    // return request.put('/' + this.uri + '/' + id, resource);
     return request({
       url: '/' + this.uri + '/' + id,
       method: 'put',

diff --git a/resources/js/lang/en.js b/resources/js/lang/en.js
@@ -141,6 +141,8 @@ export default {
     delete: 'Delete',
     cancel: 'Cancel',
     confirm: 'Confirm',
+    keyword: 'Keyword',
+    role: 'Role',
   },
   errorLog: {
     tips: 'Please click the bug icon in the upper right corner',
@@ -177,4 +179,11 @@ export default {
     fixedHeader: 'Fixed Header',
     sidebarLogo: 'Sidebar Logo',
   },
+  user: {
+    'role': 'Role',
+    'password': 'Password',
+    'confirmPassword': 'Confirm password',
+    'name': 'Name',
+    'email': 'Email',
+  },
 };
diff --git a/resources/js/lang/vi.js b/resources/js/lang/vi.js
@@ -138,6 +138,8 @@ export default {
     delete: 'Delete',
     cancel: 'Cancel',
     confirm: 'Confirm',
+    keyword: 'Từ khóa',
+    role: 'Nhóm',
   },
   errorLog: {
     tips: 'Please click the bug icon in the upper right corner',
@@ -167,4 +169,11 @@ export default {
     closeOthers: 'Close Others',
     closeAll: 'Close All',
   },
+  user: {
+    'role': 'Nhóm',
+    'password': 'Mật khẩu',
+    'confirmPassword': 'Nhập lại mật khẩu',
+    'name': 'Tên',
+    'email': 'Địa chỉ email',
+  },
 };
diff --git a/resources/js/views/users/Edit.vue b/resources/js/views/users/Edit.vue
@@ -192,7 +192,6 @@
 <script>
 import Resource from '@/api/resource';
 import PanThumb from '@/components/PanThumb';
-import { Message } from 'element-ui';
 
 const userResource = new Resource('users');
 export default {
@@ -246,7 +245,7 @@ export default {
         .update(this.user.id, this.user)
         .then(response => {
           this.updating = false;
-          Message({
+          this.$message({
             message: 'User information has been updated successfully',
             type: 'success',
             duration: 5 * 1000,