FEATURE: make users overview look less ugly
This commit is contained in:
@@ -2,19 +2,37 @@
|
||||
|
||||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Enumerations\UserRoles;
|
||||
use App\Enumerations\UserStates;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests;
|
||||
use App\Models\User;
|
||||
|
||||
class UsersOverview extends Controller
|
||||
{
|
||||
public function getOverview($perPage = 12, $state = null)
|
||||
public function getOverview($status = null, $perPage = 12)
|
||||
{
|
||||
$users = User::where('role', '!=', User::STATE_DELETED)->orderBy('id', 'desc');
|
||||
$users = User::where('status', '<>', User::STATE_DELETED)
|
||||
->orderBy('id', 'desc');
|
||||
|
||||
// get statuses
|
||||
$statuses = UserStates::getWithTranslations();
|
||||
$statuses[''] = trans('admin/userManagement.allStatuses');
|
||||
unset($statuses[User::STATE_DELETED]);
|
||||
|
||||
// filter using status
|
||||
if (!is_null($status) && isset($statuses[$status])) {
|
||||
$users = $users->where('status', $status);
|
||||
}
|
||||
|
||||
// setup pagination
|
||||
$users = $users->paginate($perPage);
|
||||
|
||||
return view('admin.userManagement.overview', ['users' => $users]);
|
||||
return view('admin.userManagement.overview', [
|
||||
'users' => $users,
|
||||
'roles' => UserRoles::getWithTranslations(),
|
||||
'statuses' => $statuses,
|
||||
'currentStatus' => $status
|
||||
]);
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -45,7 +45,7 @@ Route::group([
|
||||
->name('users.detail');
|
||||
|
||||
// display list of all users registered into our system
|
||||
Route::get('users/overview/{state?}', 'UsersOverview@getOverview')
|
||||
Route::get('users/overview/{state?}/{perPage?}', 'UsersOverview@getOverview')
|
||||
->name('users.overview');
|
||||
|
||||
// custom fields
|
||||
|
||||
Reference in New Issue
Block a user