From e889c5f9ef5b81dc3a82b823c6d9881d14cd647d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?=
 <timothee.jaussoin@belledonne-communications.com>
Date: Wed, 29 Apr 2020 17:57:03 +0200
Subject: [PATCH] Add Accounts search feature in admin panel

---
 .../Controllers/Admin/AccountController.php   | 16 ++++++++++++--
 .../resources/views/account/index.blade.php   |  8 ++-----
 .../views/admin/account/index.blade.php       | 21 +++++++++++++++++--
 flexiapi/routes/web.php                       |  5 +++--
 4 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/flexiapi/app/Http/Controllers/Admin/AccountController.php b/flexiapi/app/Http/Controllers/Admin/AccountController.php
index 36319d8..5f68fb7 100644
--- a/flexiapi/app/Http/Controllers/Admin/AccountController.php
+++ b/flexiapi/app/Http/Controllers/Admin/AccountController.php
@@ -10,13 +10,25 @@ use App\Admin;
 
 class AccountController extends Controller
 {
-    public function index(Request $request)
+    public function index(Request $request, $search = '')
     {
+        $accounts = Account::orderBy('creation_time', 'desc');
+
+        if (!empty($search)) {
+            $accounts = $accounts->where('username', 'like', '%'.$search.'%');
+        }
+
         return view('admin.account.index', [
-            'accounts' => Account::orderBy('creation_time', 'desc')->paginate(30)
+            'search' => $search,
+            'accounts' => $accounts->paginate(30)->appends($request->query())
         ]);
     }
 
+    public function search(Request $request)
+    {
+        return redirect()->route('admin.account.index', $request->get('search'));
+    }
+
     public function show(Request $request, $id)
     {
         return view('admin.account.show', [
diff --git a/flexiapi/resources/views/account/index.blade.php b/flexiapi/resources/views/account/index.blade.php
index b441910..83ba531 100644
--- a/flexiapi/resources/views/account/index.blade.php
+++ b/flexiapi/resources/views/account/index.blade.php
@@ -36,13 +36,9 @@
     <div class="list-group">
         <a href="{{ route('admin.account.index') }}" class="list-group-item list-group-item-action">
             <div class="d-flex w-100 justify-content-between">
-                <h5 class="mb-1">Change my current account email</h5>
+                <h5 class="mb-1">Accounts</h5>
             </div>
-            @if (!empty($account->email))
-                <p class="mb-1">{{ $account->email }}</p>
-            @else
-                <p class="mb-1">No email yet</p>
-            @endif
+            <p class="mb-1">Manage the FlexiSIP accounts</p>
         </a>
     </div>
 @endif
diff --git a/flexiapi/resources/views/admin/account/index.blade.php b/flexiapi/resources/views/admin/account/index.blade.php
index d127cec..48ed090 100644
--- a/flexiapi/resources/views/admin/account/index.blade.php
+++ b/flexiapi/resources/views/admin/account/index.blade.php
@@ -6,9 +6,26 @@
 
 @section('content')
 
-<h2>Accounts</h2>
+<div class="row mb-2">
+    <div class="col-6">
+        <h2>Accounts</h2>
+    </div>
+    <div class="col-6">
+        {!! Form::open(['route' => 'admin.account.search']) !!}
+            <div class="form-row">
+                <div class="col-9">
+                    {!! Form::text('search', $search, ['class' => 'form-control', 'placeholder' => 'Search by username: +1234, foo_bar…']) !!}
+                </div>
+                <div class="col-3">
+                    <button type="submit" class="btn btn-primary">Search</button>
+                </div>
+            </div>
+        {!! Form::close() !!}
+    </div>
+</div>
 
-<table class="table">
+
+<table class="table table-responsive-md">
     <thead>
         <tr>
             <th scope="col">#</th>
diff --git a/flexiapi/routes/web.php b/flexiapi/routes/web.php
index fcf8ac9..9fc721e 100644
--- a/flexiapi/routes/web.php
+++ b/flexiapi/routes/web.php
@@ -48,8 +48,9 @@ Route::group(['middleware' => 'auth'], function () {
 });
 
 Route::group(['middleware' => 'auth.admin'], function () {
-    Route::get('admin/accounts', 'Admin\AccountController@index')->name('admin.account.index');
-    Route::get('admin/accounts/{id}', 'Admin\AccountController@show')->name('admin.account.show');
+    Route::get('admin/accounts/{search?}', 'Admin\AccountController@index')->name('admin.account.index');
+    Route::post('admin/search', 'Admin\AccountController@search')->name('admin.account.search');
+    Route::get('admin/accounts/show/{id}', 'Admin\AccountController@show')->name('admin.account.show');
     Route::get('admin/accounts/{id}/activate', 'Admin\AccountController@activate')->name('admin.account.activate');
     Route::get('admin/accounts/{id}/deactivate', 'Admin\AccountController@deactivate')->name('admin.account.deactivate');
     Route::get('admin/accounts/{id}/admin', 'Admin\AccountController@admin')->name('admin.account.admin');