Add search feature for table in dashboard

jcc · May 3, 2018 · dd46da2 · dd46da2
1 parent 7ec1b28
commit dd46da2
Show file tree

Hide file tree

Showing 18 changed files with 289 additions and 60 deletions.
diff --git a/app/Http/Controllers/Api/ArticleController.php b/app/Http/Controllers/Api/ArticleController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Api;
 
+use Illuminate\Http\Request;
 use App\Http\Requests\ArticleRequest;
 use App\Repositories\ArticleRepository;
 
@@ -21,9 +22,9 @@ public function __construct(ArticleRepository $article)
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function index()
+    public function index(Request $request)
     {
-        return $this->response->collection($this->article->page());
+        return $this->response->collection($this->article->pageWithRequest($request));
     }
 
     /**

diff --git a/app/Http/Controllers/Api/CategoryController.php b/app/Http/Controllers/Api/CategoryController.php
@@ -22,9 +22,9 @@ public function __construct(CategoryRepository $category)
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function index()
+    public function index(Request $request)
     {
-        return $this->response->collection($this->category->page());
+        return $this->response->collection($this->category->pageWithRequest($request));
     }
 
     /**
@@ -99,7 +99,7 @@ public function update(CategoryRequest $request, $id)
      * Remove the specified resource from storage.
      *
      * @param  int  $id
-     * 
+     *
      * @return \Illuminate\Http\JsonResponse
      */
     public function destroy($id)

diff --git a/app/Http/Controllers/Api/CommentController.php b/app/Http/Controllers/Api/CommentController.php
@@ -24,9 +24,9 @@ public function __construct(CommentRepository $comment)
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function index()
+    public function index(Request $request)
     {
-        return $this->response->collection($this->comment->page());
+        return $this->response->collection($this->comment->pageWithRequest($request));
     }
 
     /**

diff --git a/app/Http/Controllers/Api/DiscussionController.php b/app/Http/Controllers/Api/DiscussionController.php
@@ -22,9 +22,9 @@ public function __construct(DiscussionRepository $discussion)
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function index()
+    public function index(Request $request)
     {
-        return $this->response->collection($this->discussion->page(10, 'desc'));
+        return $this->response->collection($this->discussion->pageWithRequest($request));
     }
 
     /**

diff --git a/app/Http/Controllers/Api/LinkController.php b/app/Http/Controllers/Api/LinkController.php
@@ -20,15 +20,15 @@ public function __construct(LinkRepository $link)
 
         $this->manager = app('uploader');
     }
-    
+
     /**
      * Display a listing of the resource.
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function index()
+    public function index(Request $request)
     {
-        return $this->response->collection($this->link->page());
+        return $this->response->collection($this->link->pageWithRequest($request));
     }
 
     /**

diff --git a/app/Http/Controllers/Api/TagController.php b/app/Http/Controllers/Api/TagController.php
@@ -22,9 +22,9 @@ public function __construct(TagRepository $tag)
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function index()
+    public function index(Request $request)
     {
-        return $this->response->collection($this->tag->page());
+        return $this->response->collection($this->tag->pageWithRequest($request));
     }
 
     /**

diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php
@@ -23,9 +23,9 @@ public function __construct(UserRepository $user)
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function index()
+    public function index(Request $request)
     {
-        return $this->response->collection($this->user->page());
+        return $this->response->collection($this->user->pageWithRequest($request));
     }
 
     /**
@@ -93,7 +93,7 @@ public function update(Request $request, $id)
 
     /**
      * Crop Avatar
-     * 
+     *
      * @param  Request $request
      * @return \Illuminate\Http\JsonResponse
      */

diff --git a/app/Http/Controllers/Api/VisitorController.php b/app/Http/Controllers/Api/VisitorController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Api;
 
+use Illuminate\Http\Request;
 use App\Repositories\VisitorRepository;
 
 class VisitorController extends ApiController
@@ -20,9 +21,9 @@ public function __construct(VisitorRepository $visitor)
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function index()
+    public function index(Request $request)
     {
-        return $this->response->collection($this->visitor->page());
+        return $this->response->collection($this->visitor->pageWithRequest($request));
     }
 
 }
diff --git a/app/Repositories/ArticleRepository.php b/app/Repositories/ArticleRepository.php
@@ -22,7 +22,30 @@ public function __construct(Article $article, VisitorRepository $visitor)
 
     /**
      * Get the page of articles without draft scope.
-     * 
+     *
+     * @param  Request $request
+     * @param  integer $number
+     * @param  string  $sort
+     * @param  string  $sortColumn
+     * @return collection
+     */
+    public function pageWithRequest($request, $number = 10, $sort = 'desc', $sortColumn = 'created_at')
+    {
+        $this->model = $this->checkAuthScope();
+
+        $keyword = $request->get('keyword');
+
+        return $this->model
+                    ->when($keyword, function ($query) use ($keyword) {
+                        $query->where('title', 'like', "%{$keyword}%")
+                            ->orWhere('subtitle', 'like', "%{$keyword}%");
+                    })
+                    ->orderBy($sortColumn, $sort)->paginate($number);
+    }
+
+    /**
+     * Get the page of articles without draft scope.
+     *
      * @param  integer $number
      * @param  string  $sort
      * @param  string  $sortColumn
@@ -37,7 +60,7 @@ public function page($number = 10, $sort = 'desc', $sortColumn = 'created_at')
 
     /**
      * Get the article record without draft scope.
-     * 
+     *
      * @param  int $id
      * @return mixed
      */
@@ -48,7 +71,7 @@ public function getById($id)
 
     /**
      * Update the article record without draft scope.
-     * 
+     *
      * @param  int $id
      * @param  array $input
      * @return boolean
@@ -82,7 +105,7 @@ public function getBySlug($slug)
 
     /**
      * Check the auth and the model without global scope when user is the admin.
-     * 
+     *
      * @return Model
      */
     public function checkAuthScope()
@@ -107,7 +130,7 @@ public function syncTag(array $tags)
 
     /**
      * Search the articles by the keyword.
-     * 
+     *
      * @param  string $key
      * @return collection
      */

diff --git a/app/Repositories/CategoryRepository.php b/app/Repositories/CategoryRepository.php
@@ -15,9 +15,29 @@ public function __construct(Category $category)
         $this->model = $category;
     }
 
+    /**
+     * Get number of the records.
+     *
+     * @param  Request $request
+     * @param  integer $number
+     * @param  string  $sort
+     * @param  string  $sortColumn
+     * @return collection
+     */
+    public function pageWithRequest($request, $number = 10, $sort = 'desc', $sortColumn = 'created_at')
+    {
+        $keyword = $request->get('keyword');
+
+        return $this->model
+                    ->when($keyword, function ($query) use ($keyword) {
+                        $query->where('name', 'like', "%{$keyword}%");
+                    })
+                    ->orderBy($sortColumn, $sort)->paginate($number);
+    }
+
     /**
      * Get record by the name.
-     * 
+     *
      * @param  string $name
      * @return collection
      */

diff --git a/app/Repositories/CommentRepository.php b/app/Repositories/CommentRepository.php
@@ -18,6 +18,28 @@ public function __construct(Comment $comment)
         $this->model = $comment;
     }
 
+    /**
+     * Get number of the records.
+     *
+     * @param  Request $request
+     * @param  integer $number
+     * @param  string  $sort
+     * @param  string  $sortColumn
+     * @return collection
+     */
+    public function pageWithRequest($request, $number = 10, $sort = 'desc', $sortColumn = 'created_at')
+    {
+        $keyword = $request->get('keyword');
+
+        return $this->model
+                    ->when($keyword, function ($query) use ($keyword) {
+                        $query->whereHas('user', function ($query) use ($keyword) {
+                            $query->where('name', 'like', "%{$keyword}%");
+                        });
+                    })
+                    ->orderBy($sortColumn, $sort)->paginate($number);
+    }
+
     /**
      * Store a new record.
      *
@@ -57,7 +79,7 @@ public function save($model, $input)
 
     /**
      * Get comments by the commentable_id and commentable_type
-     * 
+     *
      * @param  int $commentableId
      * @param  string $commentableType
      * @return array
@@ -71,10 +93,10 @@ public function getByCommentable($commentableId, $commentableType)
 
     /**
      * Toogle up vote and down vote by user.
-     * 
+     *
      * @param  int $id
      * @param  boolean $isUpVote
-     * 
+     *
      * @return boolean
      */
     public function toggleVote($id, $isUpVote = true)
@@ -94,11 +116,11 @@ public function toggleVote($id, $isUpVote = true)
 
     /**
      * Up vote or down vote item.
-     * 
+     *
      * @param  \App\User $user
      * @param  \Illuminate\Database\Eloquent\Model $target
      * @param  string $type
-     * 
+     *
      * @return boolean
      */
     public function upOrDownVote($user, $target, $type = 'up')

diff --git a/app/Repositories/DiscussionRepository.php b/app/Repositories/DiscussionRepository.php
@@ -16,6 +16,31 @@ public function __construct(Discussion $discussion)
         $this->model = $discussion;
     }
 
+    /**
+     * Get number of the records.
+     *
+     * @param  Request $request
+     * @param  integer $number
+     * @param  string  $sort
+     * @param  string  $sortColumn
+     * @return collection
+     */
+    public function pageWithRequest($request, $number = 10, $sort = 'desc', $sortColumn = 'created_at')
+    {
+        $this->model = $this->checkAuthScope();
+
+        $keyword = $request->get('keyword');
+
+        return $this->model
+                    ->when($keyword, function ($query) use ($keyword) {
+                        $query->where('title', 'like', "%{$keyword}%")
+                            ->orWhereHas('user', function ($query) use ($keyword) {
+                                $query->where('name', 'like', "%{$keyword}%");
+                            });
+                    })
+                    ->orderBy($sortColumn, $sort)->paginate($number);
+    }
+
     /**
      * Get number of the records.
      *
@@ -33,7 +58,7 @@ public function page($number = 10, $sort = 'asc', $sortColumn = 'created_at')
 
     /**
      * Get the discussion record without draft scope.
-     * 
+     *
      * @param  int $id
      * @return mixed
      */
@@ -64,7 +89,7 @@ public function store($data)
 
     /**
      * Update a record by id.
-     * 
+     *
      * @param  int $id
      * @param  array $data
      * @return boolean
@@ -86,7 +111,7 @@ public function update(int $id, array $data)
 
     /**
      * Update a record by id without tag.
-     * 
+     *
      * @param  int $id
      * @param  array $data
      * @return boolean
@@ -102,7 +127,7 @@ public function updateWithoutTags(int $id, array $data)
 
     /**
      * Check the auth and the model without global scope when user is the admin.
-     * 
+     *
      * @return Model
      */
     public function checkAuthScope()