Skip to content

Commit 636d57d

Browse files
committed
Because there were updates to form maker
1 parent c36b144 commit 636d57d

File tree

9 files changed

+233
-122
lines changed

9 files changed

+233
-122
lines changed

app/Http/Controllers/Admin/UserController.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ class UserController extends Controller
2424
*/
2525
public function index()
2626
{
27-
$users = User::whereNotIn('id', [auth()->id()])->get();
27+
$index = app(AdminUserForm::class)->index();
28+
2829
$invites = Invite::where([
2930
'model_id' => null,
3031
])->get();
3132

3233
return view('admin.users.index')
33-
->with(compact('users', 'invites'));
34+
->with(compact('index', 'invites'));
3435
}
3536

3637
/**
@@ -41,17 +42,15 @@ public function index()
4142
*/
4243
public function search(Request $request)
4344
{
44-
$users = app(User::class)
45-
->search($request->search)
46-
->get();
45+
$query = app(User::class)->search($request->search);
46+
$index = app(AdminUserForm::class)->index($query);
4747

4848
$invites = Invite::where([
4949
'model_id' => null,
5050
])->get();
5151

5252
return view('admin.users.index')
53-
->with('users', $users)
54-
->with('invites', $invites);
53+
->with(compact('index', 'invites'));
5554
}
5655

5756
/**

app/Http/Forms/AdminUserForm.php

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,29 @@
44

55
use App\Models\Role;
66
use App\Models\User;
7-
use Grafite\FormMaker\Fields\Bootstrap\HasMany;
8-
use Grafite\FormMaker\Fields\Email;
97
use Grafite\FormMaker\Fields\Text;
8+
use Grafite\FormMaker\Fields\Email;
9+
use Grafite\FormMaker\Fields\Hidden;
1010
use Grafite\FormMaker\Forms\ModelForm;
11+
use Grafite\FormMaker\Fields\Bootstrap\HasMany;
1112

1213
class AdminUserForm extends ModelForm
1314
{
1415
public $model = User::class;
1516

1617
public $routePrefix = 'admin.users';
1718

19+
public $with = [
20+
'roles'
21+
];
22+
23+
public $confirmMessage = 'Are you sure you want to delete this user?';
24+
25+
public $confirmMethod = 'confirmation';
26+
1827
public $buttons = [
1928
'submit' => 'Save',
29+
'edit' => '<span class="fas fa-fw fa-pencil-alt"></span> Edit',
2030
'delete' => '<span class="fas fa-fw fa-trash"></span> Delete'
2131
];
2232

@@ -25,6 +35,7 @@ class AdminUserForm extends ModelForm
2535
public $buttonClasses = [
2636
'submit' => 'btn btn-primary',
2737
'cancel' => 'btn btn-secondary',
38+
'edit' => 'btn btn-outline-primary btn-sm mr-2',
2839
'delete' => 'btn btn-outline-danger btn-sm',
2940
];
3041

@@ -33,12 +44,16 @@ public function fields()
3344
return [
3445
Text::make('name', [
3546
'required' => true,
47+
'sortable' => true,
3648
]),
3749
Email::make('email', [
3850
'required' => true,
51+
'sortable' => true,
3952
]),
53+
Hidden::make('role'),
4054
HasMany::make('roles', [
4155
'required' => true,
56+
'visible' => false,
4257
'model' => Role::class,
4358
'model_options' => [
4459
'label' => 'label',

app/Models/Concerns/HasRoles.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66

77
trait HasRoles
88
{
9+
public function getRoleAttribute()
10+
{
11+
return $this->roles()->first()->label;
12+
}
13+
914
/**
1015
* User Roles.
1116
*

app/Providers/EventServiceProvider.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use Illuminate\Auth\Events\Registered;
66
use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
77
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
8-
use Illuminate\Support\Facades\Event;
98

109
class EventServiceProvider extends ServiceProvider
1110
{

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"require-dev": {
2727
"facade/ignition": "^2.0",
2828
"fzaninotto/faker": "^1.9",
29+
"itsgoingd/clockwork": "^4.1",
2930
"laravel/dusk": "^5.9",
3031
"mockery/mockery": "^1.3",
3132
"nunomaduro/collision": "^4.1",

0 commit comments

Comments
 (0)