diff --git a/app/Http/Controllers/Admin/UsersOverview.php b/app/Http/Controllers/Admin/UsersOverview.php index b4251daf..6f27d15a 100644 --- a/app/Http/Controllers/Admin/UsersOverview.php +++ b/app/Http/Controllers/Admin/UsersOverview.php @@ -4,13 +4,17 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; use App\Http\Requests; -use App\Http\Requests\CreateNewUserRequest; use App\Models\User; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Hash; -class UsersOverview extends Controller { - public function getOverview() { - return view('admin.userManagement.overview'); +class UsersOverview extends Controller +{ + public function getOverview($perPage = 12, $state = null) + { + $users = User::where('role', '!=', User::STATE_DELETED)->orderBy('id', 'desc'); + + + $users = $users->paginate($perPage); + + return view('admin.userManagement.overview', ['users' => $users]); } } \ No newline at end of file diff --git a/resources/assets/css/admin.css b/resources/assets/css/admin.css index 8bbd8ebe..f2e06d4f 100644 --- a/resources/assets/css/admin.css +++ b/resources/assets/css/admin.css @@ -1,16 +1,13 @@ +.columns:last-child:not(:first-child), .column:last-child:not(:first-child) { + float: left; +} + .row { width: 100%; max-width: 100%; } -header { -} - -.sidebar { -} - - .login-form { margin-top: 4em; } diff --git a/resources/lang/en/admin/userManagement.php b/resources/lang/en/admin/userManagement.php index 16001365..102ab5a5 100644 --- a/resources/lang/en/admin/userManagement.php +++ b/resources/lang/en/admin/userManagement.php @@ -13,6 +13,7 @@ return [ 'registrationSuccessfull' => 'New user successfully added.', 'profile' => 'Your profile', 'overview' => 'List of all users', + 'noUsers' => 'No users avialable.', 'detail' => 'User\'s detail' ]; \ No newline at end of file diff --git a/resources/views/admin/userManagement/overview.blade.php b/resources/views/admin/userManagement/overview.blade.php index eb36523c..242cb58e 100644 --- a/resources/views/admin/userManagement/overview.blade.php +++ b/resources/views/admin/userManagement/overview.blade.php @@ -4,4 +4,30 @@ @section('content') +