@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | { |
13 | 13 | $user = $this->findUser($id); |
14 | 14 | |
15 | - if ($user->panelAdmin()->exists()){ |
|
15 | + if ($user->panelAdmin()->exists()) { |
|
16 | 16 | return [ |
17 | 17 | 'type' => 'error', |
18 | 18 | 'message' => 'User already is an admin!' |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | 'is_superuser' => $is_super, |
24 | 24 | ]); |
25 | 25 | |
26 | - if($is_super) |
|
26 | + if ($is_super) |
|
27 | 27 | $this->makeSuperAdminRole($user); |
28 | 28 | |
29 | 29 | return [ |
@@ -23,8 +23,9 @@ |
||
23 | 23 | 'is_superuser' => $is_super, |
24 | 24 | ]); |
25 | 25 | |
26 | - if($is_super) |
|
27 | - $this->makeSuperAdminRole($user); |
|
26 | + if($is_super) { |
|
27 | + $this->makeSuperAdminRole($user); |
|
28 | + } |
|
28 | 29 | |
29 | 30 | return [ |
30 | 31 | 'type' => 'success', |
@@ -31,10 +31,10 @@ discard block |
||
31 | 31 | public function register() |
32 | 32 | { |
33 | 33 | // Here we merge config with 'easy_panel' key |
34 | - $this->mergeConfigFrom(__DIR__ . '/../config/easy_panel_config.php', 'easy_panel'); |
|
34 | + $this->mergeConfigFrom(__DIR__.'/../config/easy_panel_config.php', 'easy_panel'); |
|
35 | 35 | |
36 | 36 | // Check the status of module |
37 | - if(!config('easy_panel.enable')) { |
|
37 | + if (!config('easy_panel.enable')) { |
|
38 | 38 | return; |
39 | 39 | } |
40 | 40 | |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | |
45 | 45 | public function boot() |
46 | 46 | { |
47 | - if(!config('easy_panel.enable')) { |
|
47 | + if (!config('easy_panel.enable')) { |
|
48 | 48 | return; |
49 | 49 | } |
50 | 50 | |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | $this->bindCommands(); |
58 | 58 | |
59 | 59 | // Load Views with 'admin::' prefix |
60 | - $this->loadViewsFrom(__DIR__ . '/../resources/views', 'admin'); |
|
60 | + $this->loadViewsFrom(__DIR__.'/../resources/views', 'admin'); |
|
61 | 61 | |
62 | 62 | // Register Middleware |
63 | 63 | $this->registerMiddlewareAlias(); |
@@ -76,13 +76,13 @@ discard block |
||
76 | 76 | |
77 | 77 | private function defineRoutes() |
78 | 78 | { |
79 | - if(!$this->app->routesAreCached()) { |
|
79 | + if (!$this->app->routesAreCached()) { |
|
80 | 80 | $middlewares = array_merge(['web', 'isAdmin', 'LangChanger'], config('easy_panel.additional_middlewares')); |
81 | 81 | |
82 | 82 | Route::prefix(config('easy_panel.route_prefix')) |
83 | 83 | ->middleware($middlewares) |
84 | - ->name(getRouteName() . '.') |
|
85 | - ->group(__DIR__ . '/routes.php'); |
|
84 | + ->name(getRouteName().'.') |
|
85 | + ->group(__DIR__.'/routes.php'); |
|
86 | 86 | } |
87 | 87 | } |
88 | 88 | |
@@ -119,16 +119,16 @@ discard block |
||
119 | 119 | |
120 | 120 | private function mergePublishes() |
121 | 121 | { |
122 | - $this->publishes([__DIR__ . '/../config/easy_panel_config.php' => config_path('easy_panel.php')], 'easy-panel-config'); |
|
122 | + $this->publishes([__DIR__.'/../config/easy_panel_config.php' => config_path('easy_panel.php')], 'easy-panel-config'); |
|
123 | 123 | |
124 | - $this->publishes([__DIR__ . '/../resources/views' => resource_path('/views/vendor/admin')], 'easy-panel-views'); |
|
124 | + $this->publishes([__DIR__.'/../resources/views' => resource_path('/views/vendor/admin')], 'easy-panel-views'); |
|
125 | 125 | |
126 | - $this->publishes([__DIR__ . '/../resources/assets' => public_path('/assets/admin')], 'easy-panel-styles'); |
|
126 | + $this->publishes([__DIR__.'/../resources/assets' => public_path('/assets/admin')], 'easy-panel-styles'); |
|
127 | 127 | |
128 | 128 | $this->publishes([ |
129 | - __DIR__ . '/../database/migrations/2021_07_17_999999_create_cruds_table.php' => base_path('/database/migrations/' . date('Y_m_d') . '_999999_create_cruds_table.php'), |
|
130 | - __DIR__ . '/../database/migrations/2021_12_17_999999_create_user_admins_table.php' => base_path('/database/migrations/' . date('Y_m_d') . '_999999_create_user_admins_table.php'), |
|
131 | - __DIR__ . '/../database/migrations/2022_04_19_999999_add_acl_fields_to_cruds_table.php' => base_path('/database/migrations/' . now()->tomorrow()->format('Y_m_d') . '_999999_add_acl_fields_to_cruds_table.php') |
|
129 | + __DIR__.'/../database/migrations/2021_07_17_999999_create_cruds_table.php' => base_path('/database/migrations/'.date('Y_m_d').'_999999_create_cruds_table.php'), |
|
130 | + __DIR__.'/../database/migrations/2021_12_17_999999_create_user_admins_table.php' => base_path('/database/migrations/'.date('Y_m_d').'_999999_create_user_admins_table.php'), |
|
131 | + __DIR__.'/../database/migrations/2022_04_19_999999_add_acl_fields_to_cruds_table.php' => base_path('/database/migrations/'.now()->tomorrow()->format('Y_m_d').'_999999_add_acl_fields_to_cruds_table.php') |
|
132 | 132 | ], 'easy-panel-migration'); |
133 | 133 | |
134 | 134 | $this->publishes([__DIR__.'/../resources/lang' => app()->langPath()], 'easy-panel-lang'); |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | { |
162 | 162 | $model = !$this->app->runningUnitTests() ? config('easy_panel.user_model') : User::class; |
163 | 163 | |
164 | - $model::resolveRelationUsing('panelAdmin', function ($userModel){ |
|
164 | + $model::resolveRelationUsing('panelAdmin', function($userModel) { |
|
165 | 165 | return $userModel->hasOne(PanelAdmin::class)->latest(); |
166 | 166 | }); |
167 | 167 | } |