@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | */ |
22 | 22 | public function up() |
23 | 23 | { |
24 | - Schema::create(config('admin.database.users_table'), function (Blueprint $table) { |
|
24 | + Schema::create(config('admin.database.users_table'), function(Blueprint $table) { |
|
25 | 25 | $table->increments('id'); |
26 | 26 | $table->string('username', 190)->unique(); |
27 | 27 | $table->string('password', 60); |
@@ -31,14 +31,14 @@ discard block |
||
31 | 31 | $table->timestamps(); |
32 | 32 | }); |
33 | 33 | |
34 | - Schema::create(config('admin.database.roles_table'), function (Blueprint $table) { |
|
34 | + Schema::create(config('admin.database.roles_table'), function(Blueprint $table) { |
|
35 | 35 | $table->increments('id'); |
36 | 36 | $table->string('name', 50)->unique(); |
37 | 37 | $table->string('slug', 50)->unique(); |
38 | 38 | $table->timestamps(); |
39 | 39 | }); |
40 | 40 | |
41 | - Schema::create(config('admin.database.permissions_table'), function (Blueprint $table) { |
|
41 | + Schema::create(config('admin.database.permissions_table'), function(Blueprint $table) { |
|
42 | 42 | $table->increments('id'); |
43 | 43 | $table->string('name', 50)->unique(); |
44 | 44 | $table->string('slug', 50)->unique(); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $table->timestamps(); |
48 | 48 | }); |
49 | 49 | |
50 | - Schema::create(config('admin.database.menu_table'), function (Blueprint $table) { |
|
50 | + Schema::create(config('admin.database.menu_table'), function(Blueprint $table) { |
|
51 | 51 | $table->increments('id'); |
52 | 52 | $table->integer('parent_id')->default(0); |
53 | 53 | $table->integer('order')->default(0); |
@@ -59,35 +59,35 @@ discard block |
||
59 | 59 | $table->timestamps(); |
60 | 60 | }); |
61 | 61 | |
62 | - Schema::create(config('admin.database.role_users_table'), function (Blueprint $table) { |
|
62 | + Schema::create(config('admin.database.role_users_table'), function(Blueprint $table) { |
|
63 | 63 | $table->integer('role_id'); |
64 | 64 | $table->integer('user_id'); |
65 | 65 | $table->index(['role_id', 'user_id']); |
66 | 66 | $table->timestamps(); |
67 | 67 | }); |
68 | 68 | |
69 | - Schema::create(config('admin.database.role_permissions_table'), function (Blueprint $table) { |
|
69 | + Schema::create(config('admin.database.role_permissions_table'), function(Blueprint $table) { |
|
70 | 70 | $table->integer('role_id'); |
71 | 71 | $table->integer('permission_id'); |
72 | 72 | $table->index(['role_id', 'permission_id']); |
73 | 73 | $table->timestamps(); |
74 | 74 | }); |
75 | 75 | |
76 | - Schema::create(config('admin.database.user_permissions_table'), function (Blueprint $table) { |
|
76 | + Schema::create(config('admin.database.user_permissions_table'), function(Blueprint $table) { |
|
77 | 77 | $table->integer('user_id'); |
78 | 78 | $table->integer('permission_id'); |
79 | 79 | $table->index(['user_id', 'permission_id']); |
80 | 80 | $table->timestamps(); |
81 | 81 | }); |
82 | 82 | |
83 | - Schema::create(config('admin.database.role_menu_table'), function (Blueprint $table) { |
|
83 | + Schema::create(config('admin.database.role_menu_table'), function(Blueprint $table) { |
|
84 | 84 | $table->integer('role_id'); |
85 | 85 | $table->integer('menu_id'); |
86 | 86 | $table->index(['role_id', 'menu_id']); |
87 | 87 | $table->timestamps(); |
88 | 88 | }); |
89 | 89 | |
90 | - Schema::create(config('admin.database.operation_log_table'), function (Blueprint $table) { |
|
90 | + Schema::create(config('admin.database.operation_log_table'), function(Blueprint $table) { |
|
91 | 91 | $table->increments('id'); |
92 | 92 | $table->integer('user_id'); |
93 | 93 | $table->string('path'); |
@@ -107,6 +107,7 @@ |
||
107 | 107 | } |
108 | 108 | |
109 | 109 | /** |
110 | + * @param string $name |
|
110 | 111 | * @return string |
111 | 112 | */ |
112 | 113 | protected function elementNameWithPrefix($name) |
@@ -287,10 +287,10 @@ |
||
287 | 287 | 'middleware' => config('admin.route.middleware'), |
288 | 288 | ]; |
289 | 289 | |
290 | - app('router')->group($attributes, function ($router) { |
|
290 | + app('router')->group($attributes, function($router) { |
|
291 | 291 | |
292 | 292 | /* @var \Illuminate\Support\Facades\Route $router */ |
293 | - $router->namespace('\Encore\Admin\Controllers')->group(function ($router) { |
|
293 | + $router->namespace('\Encore\Admin\Controllers')->group(function($router) { |
|
294 | 294 | |
295 | 295 | /* @var \Illuminate\Routing\Router $router */ |
296 | 296 | $router->resource('auth/users', 'UserController')->names('admin.auth.users'); |
@@ -36,14 +36,14 @@ discard block |
||
36 | 36 | $grid->column('created_at', trans('admin.created_at')); |
37 | 37 | $grid->column('updated_at', trans('admin.updated_at')); |
38 | 38 | |
39 | - $grid->actions(function (Grid\Displayers\Actions $actions) { |
|
39 | + $grid->actions(function(Grid\Displayers\Actions $actions) { |
|
40 | 40 | if ($actions->row->slug == 'administrator') { |
41 | 41 | $actions->disableDelete(); |
42 | 42 | } |
43 | 43 | }); |
44 | 44 | |
45 | - $grid->tools(function (Grid\Tools $tools) { |
|
46 | - $tools->batch(function (Grid\Tools\BatchActions $actions) { |
|
45 | + $grid->tools(function(Grid\Tools $tools) { |
|
46 | + $tools->batch(function(Grid\Tools\BatchActions $actions) { |
|
47 | 47 | $actions->disableDelete(); |
48 | 48 | }); |
49 | 49 | }); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | $show->field('id', 'ID'); |
68 | 68 | $show->field('slug', trans('admin.slug')); |
69 | 69 | $show->field('name', trans('admin.name')); |
70 | - $show->field('permissions', trans('admin.permissions'))->as(function ($permission) { |
|
70 | + $show->field('permissions', trans('admin.permissions'))->as(function($permission) { |
|
71 | 71 | return $permission->pluck('name'); |
72 | 72 | })->label(); |
73 | 73 | $show->field('created_at', trans('admin.created_at')); |
@@ -27,14 +27,14 @@ discard block |
||
27 | 27 | |
28 | 28 | $grid->column('id', 'ID')->sortable(); |
29 | 29 | $grid->column('user.name', 'User'); |
30 | - $grid->column('method')->display(function ($method) { |
|
30 | + $grid->column('method')->display(function($method) { |
|
31 | 31 | $color = Arr::get(OperationLog::$methodColors, $method, 'grey'); |
32 | 32 | |
33 | 33 | return "<span class=\"badge bg-$color\">$method</span>"; |
34 | 34 | }); |
35 | 35 | $grid->column('path')->label('info'); |
36 | 36 | $grid->column('ip')->label('primary'); |
37 | - $grid->column('input')->display(function ($input) { |
|
37 | + $grid->column('input')->display(function($input) { |
|
38 | 38 | $input = json_decode($input, true); |
39 | 39 | $input = Arr::except($input, ['_pjax', '_token', '_method', '_previous_']); |
40 | 40 | if (empty($input)) { |
@@ -46,14 +46,14 @@ discard block |
||
46 | 46 | |
47 | 47 | $grid->column('created_at', trans('admin.created_at')); |
48 | 48 | |
49 | - $grid->actions(function (Grid\Displayers\Actions $actions) { |
|
49 | + $grid->actions(function(Grid\Displayers\Actions $actions) { |
|
50 | 50 | $actions->disableEdit(); |
51 | 51 | $actions->disableView(); |
52 | 52 | }); |
53 | 53 | |
54 | 54 | $grid->disableCreateButton(); |
55 | 55 | |
56 | - $grid->filter(function (Grid\Filter $filter) { |
|
56 | + $grid->filter(function(Grid\Filter $filter) { |
|
57 | 57 | $userModel = config('admin.database.users_model'); |
58 | 58 | |
59 | 59 | $filter->equal('user_id', 'User')->select($userModel::all()->pluck('name', 'id')); |
@@ -34,14 +34,14 @@ discard block |
||
34 | 34 | $grid->column('created_at', trans('admin.created_at')); |
35 | 35 | $grid->column('updated_at', trans('admin.updated_at')); |
36 | 36 | |
37 | - $grid->actions(function (Grid\Displayers\Actions $actions) { |
|
37 | + $grid->actions(function(Grid\Displayers\Actions $actions) { |
|
38 | 38 | if ($actions->getKey() == 1) { |
39 | 39 | $actions->disableDelete(); |
40 | 40 | } |
41 | 41 | }); |
42 | 42 | |
43 | - $grid->tools(function (Grid\Tools $tools) { |
|
44 | - $tools->batch(function (Grid\Tools\BatchActions $actions) { |
|
43 | + $grid->tools(function(Grid\Tools $tools) { |
|
44 | + $tools->batch(function(Grid\Tools\BatchActions $actions) { |
|
45 | 45 | $actions->disableDelete(); |
46 | 46 | }); |
47 | 47 | }); |
@@ -65,10 +65,10 @@ discard block |
||
65 | 65 | $show->field('id', 'ID'); |
66 | 66 | $show->field('username', trans('admin.username')); |
67 | 67 | $show->field('name', trans('admin.name')); |
68 | - $show->field('roles', trans('admin.roles'))->as(function ($roles) { |
|
68 | + $show->field('roles', trans('admin.roles'))->as(function($roles) { |
|
69 | 69 | return $roles->pluck('name'); |
70 | 70 | })->label(); |
71 | - $show->field('permissions', trans('admin.permissions'))->as(function ($permission) { |
|
71 | + $show->field('permissions', trans('admin.permissions'))->as(function($permission) { |
|
72 | 72 | return $permission->pluck('name'); |
73 | 73 | })->label(); |
74 | 74 | $show->field('created_at', trans('admin.created_at')); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | $form->image('avatar', trans('admin.avatar')); |
102 | 102 | $form->password('password', trans('admin.password'))->rules('required|confirmed'); |
103 | 103 | $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required') |
104 | - ->default(function ($form) { |
|
104 | + ->default(function($form) { |
|
105 | 105 | return $form->model()->password; |
106 | 106 | }); |
107 | 107 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | $form->display('created_at', trans('admin.created_at')); |
114 | 114 | $form->display('updated_at', trans('admin.updated_at')); |
115 | 115 | |
116 | - $form->saving(function (Form $form) { |
|
116 | + $form->saving(function(Form $form) { |
|
117 | 117 | if ($form->password && $form->model()->password != $form->password) { |
118 | 118 | $form->password = bcrypt($form->password); |
119 | 119 | } |
@@ -10,7 +10,7 @@ |
||
10 | 10 | |
11 | 11 | public function render() |
12 | 12 | { |
13 | - $this->options = collect(DateTimeZone::listIdentifiers(DateTimeZone::ALL))->mapWithKeys(function ($timezone) { |
|
13 | + $this->options = collect(DateTimeZone::listIdentifiers(DateTimeZone::ALL))->mapWithKeys(function($timezone) { |
|
14 | 14 | return [$timezone => $timezone]; |
15 | 15 | })->toArray(); |
16 | 16 |
@@ -6,7 +6,7 @@ |
||
6 | 6 | { |
7 | 7 | public function display($style = null) |
8 | 8 | { |
9 | - $style = collect((array) $style)->map(function ($style) { |
|
9 | + $style = collect((array) $style)->map(function($style) { |
|
10 | 10 | return 'btn-'.$style; |
11 | 11 | })->implode(' '); |
12 | 12 |
@@ -24,7 +24,7 @@ |
||
24 | 24 | /** |
25 | 25 | * Carousel constructor. |
26 | 26 | * |
27 | - * @param array $items |
|
27 | + * @param \Illuminate\Support\Collection $items |
|
28 | 28 | */ |
29 | 29 | public function __construct($items = []) |
30 | 30 | { |