@@ -6,27 +6,27 @@ |
||
| 6 | 6 | |
| 7 | 7 | class ModuleServiceProvider extends ServiceProvider |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Bootstrap the module services. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function boot() |
|
| 15 | - { |
|
| 16 | - $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'groups'); |
|
| 17 | - $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'groups'); |
|
| 9 | + /** |
|
| 10 | + * Bootstrap the module services. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function boot() |
|
| 15 | + { |
|
| 16 | + $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'groups'); |
|
| 17 | + $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'groups'); |
|
| 18 | 18 | |
| 19 | - $this->loadMigrationsFrom(module_path('groups', 'Database/Migrations', 'app')); |
|
| 20 | - $this->loadFactoriesFrom(module_path('groups', 'Database/Factories', 'app')); |
|
| 21 | - } |
|
| 19 | + $this->loadMigrationsFrom(module_path('groups', 'Database/Migrations', 'app')); |
|
| 20 | + $this->loadFactoriesFrom(module_path('groups', 'Database/Factories', 'app')); |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Register the module services. |
|
| 25 | - * |
|
| 26 | - * @return void |
|
| 27 | - */ |
|
| 28 | - public function register() |
|
| 29 | - { |
|
| 30 | - $this->app->register(RouteServiceProvider::class); |
|
| 31 | - } |
|
| 23 | + /** |
|
| 24 | + * Register the module services. |
|
| 25 | + * |
|
| 26 | + * @return void |
|
| 27 | + */ |
|
| 28 | + public function register() |
|
| 29 | + { |
|
| 30 | + $this->app->register(RouteServiceProvider::class); |
|
| 31 | + } |
|
| 32 | 32 | } |
@@ -7,73 +7,73 @@ |
||
| 7 | 7 | |
| 8 | 8 | class RouteServiceProvider extends ServiceProvider |
| 9 | 9 | { |
| 10 | - /** |
|
| 11 | - * This namespace is applied to your controller routes. |
|
| 12 | - * |
|
| 13 | - * In addition, it is set as the URL generator's root namespace. |
|
| 14 | - * |
|
| 15 | - * @var string |
|
| 16 | - */ |
|
| 17 | - protected $namespace = 'App\Modules\Groups\Http\Controllers'; |
|
| 10 | + /** |
|
| 11 | + * This namespace is applied to your controller routes. |
|
| 12 | + * |
|
| 13 | + * In addition, it is set as the URL generator's root namespace. |
|
| 14 | + * |
|
| 15 | + * @var string |
|
| 16 | + */ |
|
| 17 | + protected $namespace = 'App\Modules\Groups\Http\Controllers'; |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * Define your route model bindings, pattern filters, etc. |
|
| 21 | - * |
|
| 22 | - * @return void |
|
| 23 | - */ |
|
| 24 | - public function boot() |
|
| 25 | - { |
|
| 26 | - // |
|
| 19 | + /** |
|
| 20 | + * Define your route model bindings, pattern filters, etc. |
|
| 21 | + * |
|
| 22 | + * @return void |
|
| 23 | + */ |
|
| 24 | + public function boot() |
|
| 25 | + { |
|
| 26 | + // |
|
| 27 | 27 | |
| 28 | - parent::boot(); |
|
| 29 | - } |
|
| 28 | + parent::boot(); |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * Define the routes for the module. |
|
| 33 | - * |
|
| 34 | - * @return void |
|
| 35 | - */ |
|
| 36 | - public function map() |
|
| 37 | - { |
|
| 38 | - $this->mapWebRoutes(); |
|
| 31 | + /** |
|
| 32 | + * Define the routes for the module. |
|
| 33 | + * |
|
| 34 | + * @return void |
|
| 35 | + */ |
|
| 36 | + public function map() |
|
| 37 | + { |
|
| 38 | + $this->mapWebRoutes(); |
|
| 39 | 39 | |
| 40 | - $this->mapApiRoutes(); |
|
| 40 | + $this->mapApiRoutes(); |
|
| 41 | 41 | |
| 42 | - // |
|
| 43 | - } |
|
| 42 | + // |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * Define the "web" routes for the module. |
|
| 47 | - * |
|
| 48 | - * These routes all receive session state, CSRF protection, etc. |
|
| 49 | - * |
|
| 50 | - * @return void |
|
| 51 | - */ |
|
| 52 | - protected function mapWebRoutes() |
|
| 53 | - { |
|
| 54 | - Route::group([ |
|
| 55 | - 'middleware' => 'web', |
|
| 56 | - 'namespace' => $this->namespace, |
|
| 57 | - ], function ($router) { |
|
| 58 | - require module_path('groups', 'Routes/web.php', 'app'); |
|
| 59 | - }); |
|
| 60 | - } |
|
| 45 | + /** |
|
| 46 | + * Define the "web" routes for the module. |
|
| 47 | + * |
|
| 48 | + * These routes all receive session state, CSRF protection, etc. |
|
| 49 | + * |
|
| 50 | + * @return void |
|
| 51 | + */ |
|
| 52 | + protected function mapWebRoutes() |
|
| 53 | + { |
|
| 54 | + Route::group([ |
|
| 55 | + 'middleware' => 'web', |
|
| 56 | + 'namespace' => $this->namespace, |
|
| 57 | + ], function ($router) { |
|
| 58 | + require module_path('groups', 'Routes/web.php', 'app'); |
|
| 59 | + }); |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * Define the "api" routes for the module. |
|
| 64 | - * |
|
| 65 | - * These routes are typically stateless. |
|
| 66 | - * |
|
| 67 | - * @return void |
|
| 68 | - */ |
|
| 69 | - protected function mapApiRoutes() |
|
| 70 | - { |
|
| 71 | - Route::group([ |
|
| 72 | - 'middleware' => 'api', |
|
| 73 | - 'namespace' => $this->namespace, |
|
| 74 | - 'prefix' => 'api', |
|
| 75 | - ], function ($router) { |
|
| 76 | - require module_path('groups', 'Routes/api.php', 'app'); |
|
| 77 | - }); |
|
| 78 | - } |
|
| 62 | + /** |
|
| 63 | + * Define the "api" routes for the module. |
|
| 64 | + * |
|
| 65 | + * These routes are typically stateless. |
|
| 66 | + * |
|
| 67 | + * @return void |
|
| 68 | + */ |
|
| 69 | + protected function mapApiRoutes() |
|
| 70 | + { |
|
| 71 | + Route::group([ |
|
| 72 | + 'middleware' => 'api', |
|
| 73 | + 'namespace' => $this->namespace, |
|
| 74 | + 'prefix' => 'api', |
|
| 75 | + ], function ($router) { |
|
| 76 | + require module_path('groups', 'Routes/api.php', 'app'); |
|
| 77 | + }); |
|
| 78 | + } |
|
| 79 | 79 | } |
@@ -1,9 +1,9 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | $factory->define(App\Modules\Groups\AclGroup::class, function (Faker\Generator $faker) { |
| 4 | - return [ |
|
| 5 | - 'name' => $faker->unique->word(), |
|
| 6 | - 'created_at' => $faker->dateTimeBetween('-1 years', 'now'), |
|
| 7 | - 'updated_at' => $faker->dateTimeBetween('-1 years', 'now') |
|
| 8 | - ]; |
|
| 4 | + return [ |
|
| 5 | + 'name' => $faker->unique->word(), |
|
| 6 | + 'created_at' => $faker->dateTimeBetween('-1 years', 'now'), |
|
| 7 | + 'updated_at' => $faker->dateTimeBetween('-1 years', 'now') |
|
| 8 | + ]; |
|
| 9 | 9 | }); |
@@ -6,27 +6,27 @@ |
||
| 6 | 6 | |
| 7 | 7 | class AssignRelationsSeeder extends Seeder |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Run the database seeds. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function run() |
|
| 15 | - { |
|
| 16 | - $adminGroupId = \DB::table('groups')->where('name', 'admin')->select('id')->first()->id; |
|
| 9 | + /** |
|
| 10 | + * Run the database seeds. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function run() |
|
| 15 | + { |
|
| 16 | + $adminGroupId = \DB::table('groups')->where('name', 'admin')->select('id')->first()->id; |
|
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * Assign the permissions to the admin group. |
|
| 20 | - */ |
|
| 21 | - \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['group'])->each(function ($permission) use ($adminGroupId) { |
|
| 22 | - \DB::table('groups_permissions')->insert( |
|
| 23 | - [ |
|
| 24 | - 'permission_id' => $permission->id, |
|
| 25 | - 'group_id' => $adminGroupId, |
|
| 26 | - 'created_at' => \DB::raw('NOW()'), |
|
| 27 | - 'updated_at' => \DB::raw('NOW()') |
|
| 28 | - ] |
|
| 29 | - ); |
|
| 30 | - }); |
|
| 31 | - } |
|
| 18 | + /** |
|
| 19 | + * Assign the permissions to the admin group. |
|
| 20 | + */ |
|
| 21 | + \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['group'])->each(function ($permission) use ($adminGroupId) { |
|
| 22 | + \DB::table('groups_permissions')->insert( |
|
| 23 | + [ |
|
| 24 | + 'permission_id' => $permission->id, |
|
| 25 | + 'group_id' => $adminGroupId, |
|
| 26 | + 'created_at' => \DB::raw('NOW()'), |
|
| 27 | + 'updated_at' => \DB::raw('NOW()') |
|
| 28 | + ] |
|
| 29 | + ); |
|
| 30 | + }); |
|
| 31 | + } |
|
| 32 | 32 | } |
@@ -6,15 +6,15 @@ |
||
| 6 | 6 | |
| 7 | 7 | class GroupsDatabaseSeeder extends Seeder |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Run the database seeds. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function run() |
|
| 15 | - { |
|
| 16 | - $this->call(ClearDataSeeder::class); |
|
| 17 | - $this->call(GroupsTableSeeder::class); |
|
| 18 | - $this->call(AssignRelationsSeeder::class); |
|
| 19 | - } |
|
| 9 | + /** |
|
| 10 | + * Run the database seeds. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function run() |
|
| 15 | + { |
|
| 16 | + $this->call(ClearDataSeeder::class); |
|
| 17 | + $this->call(GroupsTableSeeder::class); |
|
| 18 | + $this->call(AssignRelationsSeeder::class); |
|
| 19 | + } |
|
| 20 | 20 | } |
@@ -6,15 +6,15 @@ |
||
| 6 | 6 | |
| 7 | 7 | class ClearDataSeeder extends Seeder |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Run the database seeds. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function run() |
|
| 15 | - { |
|
| 16 | - $permissions = \DB::table('permissions')->whereIn('model', ['group']); |
|
| 17 | - \DB::table('groups_permissions')->whereIn('permission_id', $permissions->pluck('id'))->delete(); |
|
| 18 | - $permissions->delete(); |
|
| 19 | - } |
|
| 9 | + /** |
|
| 10 | + * Run the database seeds. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function run() |
|
| 15 | + { |
|
| 16 | + $permissions = \DB::table('permissions')->whereIn('model', ['group']); |
|
| 17 | + \DB::table('groups_permissions')->whereIn('permission_id', $permissions->pluck('id'))->delete(); |
|
| 18 | + $permissions->delete(); |
|
| 19 | + } |
|
| 20 | 20 | } |
@@ -6,42 +6,42 @@ |
||
| 6 | 6 | class AclGroup extends Model |
| 7 | 7 | { |
| 8 | 8 | |
| 9 | - use SoftDeletes; |
|
| 10 | - protected $table = 'groups'; |
|
| 11 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
| 12 | - protected $hidden = ['deleted_at']; |
|
| 13 | - protected $guarded = ['id']; |
|
| 14 | - protected $fillable = ['name']; |
|
| 15 | - public $searchable = ['name']; |
|
| 16 | - |
|
| 17 | - public function getCreatedAtAttribute($value) |
|
| 18 | - { |
|
| 19 | - return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 20 | - } |
|
| 21 | - |
|
| 22 | - public function getUpdatedAtAttribute($value) |
|
| 23 | - { |
|
| 24 | - return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 25 | - } |
|
| 26 | - |
|
| 27 | - public function getDeletedAtAttribute($value) |
|
| 28 | - { |
|
| 29 | - return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 30 | - } |
|
| 31 | - |
|
| 32 | - public function users() |
|
| 33 | - { |
|
| 34 | - return $this->belongsToMany('App\Modules\Users\AclUser', 'users_groups', 'group_id', 'user_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 35 | - } |
|
| 36 | - |
|
| 37 | - public function permissions() |
|
| 38 | - { |
|
| 39 | - return $this->belongsToMany('App\Modules\Permissions\AclPermission', 'groups_permissions', 'group_id', 'permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 40 | - } |
|
| 41 | - |
|
| 42 | - public static function boot() |
|
| 43 | - { |
|
| 44 | - parent::boot(); |
|
| 45 | - AclGroup::observe(\App::make('App\Modules\Groups\ModelObservers\AclGroupObserver')); |
|
| 46 | - } |
|
| 9 | + use SoftDeletes; |
|
| 10 | + protected $table = 'groups'; |
|
| 11 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
| 12 | + protected $hidden = ['deleted_at']; |
|
| 13 | + protected $guarded = ['id']; |
|
| 14 | + protected $fillable = ['name']; |
|
| 15 | + public $searchable = ['name']; |
|
| 16 | + |
|
| 17 | + public function getCreatedAtAttribute($value) |
|
| 18 | + { |
|
| 19 | + return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 20 | + } |
|
| 21 | + |
|
| 22 | + public function getUpdatedAtAttribute($value) |
|
| 23 | + { |
|
| 24 | + return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 25 | + } |
|
| 26 | + |
|
| 27 | + public function getDeletedAtAttribute($value) |
|
| 28 | + { |
|
| 29 | + return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 30 | + } |
|
| 31 | + |
|
| 32 | + public function users() |
|
| 33 | + { |
|
| 34 | + return $this->belongsToMany('App\Modules\Users\AclUser', 'users_groups', 'group_id', 'user_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 35 | + } |
|
| 36 | + |
|
| 37 | + public function permissions() |
|
| 38 | + { |
|
| 39 | + return $this->belongsToMany('App\Modules\Permissions\AclPermission', 'groups_permissions', 'group_id', 'permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 40 | + } |
|
| 41 | + |
|
| 42 | + public static function boot() |
|
| 43 | + { |
|
| 44 | + parent::boot(); |
|
| 45 | + AclGroup::observe(\App::make('App\Modules\Groups\ModelObservers\AclGroupObserver')); |
|
| 46 | + } |
|
| 47 | 47 | } |
@@ -8,25 +8,25 @@ |
||
| 8 | 8 | |
| 9 | 9 | class AclGroup extends JsonResource |
| 10 | 10 | { |
| 11 | - /** |
|
| 12 | - * Transform the resource into an array. |
|
| 13 | - * |
|
| 14 | - * @param Request $request |
|
| 15 | - * @return array |
|
| 16 | - */ |
|
| 17 | - public function toArray($request) |
|
| 18 | - { |
|
| 19 | - if (! $this->resource) { |
|
| 20 | - return []; |
|
| 21 | - } |
|
| 11 | + /** |
|
| 12 | + * Transform the resource into an array. |
|
| 13 | + * |
|
| 14 | + * @param Request $request |
|
| 15 | + * @return array |
|
| 16 | + */ |
|
| 17 | + public function toArray($request) |
|
| 18 | + { |
|
| 19 | + if (! $this->resource) { |
|
| 20 | + return []; |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - return [ |
|
| 24 | - 'id' => $this->id, |
|
| 25 | - 'name' => $this->name, |
|
| 26 | - 'users' => UserResource::collection($this->whenLoaded('users')), |
|
| 27 | - 'permissions' => PermissionResource::collection($this->whenLoaded('permissions')), |
|
| 28 | - 'created_at' => $this->created_at, |
|
| 29 | - 'updated_at' => $this->updated_at, |
|
| 30 | - ]; |
|
| 31 | - } |
|
| 23 | + return [ |
|
| 24 | + 'id' => $this->id, |
|
| 25 | + 'name' => $this->name, |
|
| 26 | + 'users' => UserResource::collection($this->whenLoaded('users')), |
|
| 27 | + 'permissions' => PermissionResource::collection($this->whenLoaded('permissions')), |
|
| 28 | + 'created_at' => $this->created_at, |
|
| 29 | + 'updated_at' => $this->updated_at, |
|
| 30 | + ]; |
|
| 31 | + } |
|
| 32 | 32 | } |
@@ -11,48 +11,48 @@ |
||
| 11 | 11 | |
| 12 | 12 | class GroupController extends BaseApiController |
| 13 | 13 | { |
| 14 | - /** |
|
| 15 | - * Init new object. |
|
| 16 | - * |
|
| 17 | - * @param GroupRepository $repo |
|
| 18 | - * @param CoreConfig $config |
|
| 19 | - * @return void |
|
| 20 | - */ |
|
| 21 | - public function __construct(GroupRepository $repo, CoreConfig $config) |
|
| 22 | - { |
|
| 23 | - parent::__construct($repo, $config, 'App\Modules\Groups\Http\Resources\AclGroup'); |
|
| 24 | - } |
|
| 14 | + /** |
|
| 15 | + * Init new object. |
|
| 16 | + * |
|
| 17 | + * @param GroupRepository $repo |
|
| 18 | + * @param CoreConfig $config |
|
| 19 | + * @return void |
|
| 20 | + */ |
|
| 21 | + public function __construct(GroupRepository $repo, CoreConfig $config) |
|
| 22 | + { |
|
| 23 | + parent::__construct($repo, $config, 'App\Modules\Groups\Http\Resources\AclGroup'); |
|
| 24 | + } |
|
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * Insert the given model to storage. |
|
| 28 | - * |
|
| 29 | - * @param InsertGroup $request |
|
| 30 | - * @return \Illuminate\Http\Response |
|
| 31 | - */ |
|
| 32 | - public function insert(InsertGroup $request) |
|
| 33 | - { |
|
| 34 | - return new $this->modelResource($this->repo->save($request->all())); |
|
| 35 | - } |
|
| 26 | + /** |
|
| 27 | + * Insert the given model to storage. |
|
| 28 | + * |
|
| 29 | + * @param InsertGroup $request |
|
| 30 | + * @return \Illuminate\Http\Response |
|
| 31 | + */ |
|
| 32 | + public function insert(InsertGroup $request) |
|
| 33 | + { |
|
| 34 | + return new $this->modelResource($this->repo->save($request->all())); |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * Update the given model to storage. |
|
| 39 | - * |
|
| 40 | - * @param UpdateGroup $request |
|
| 41 | - * @return \Illuminate\Http\Response |
|
| 42 | - */ |
|
| 43 | - public function update(UpdateGroup $request) |
|
| 44 | - { |
|
| 45 | - return new $this->modelResource($this->repo->save($request->all())); |
|
| 46 | - } |
|
| 37 | + /** |
|
| 38 | + * Update the given model to storage. |
|
| 39 | + * |
|
| 40 | + * @param UpdateGroup $request |
|
| 41 | + * @return \Illuminate\Http\Response |
|
| 42 | + */ |
|
| 43 | + public function update(UpdateGroup $request) |
|
| 44 | + { |
|
| 45 | + return new $this->modelResource($this->repo->save($request->all())); |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | - /** |
|
| 49 | - * Handle an assign permissions to group request. |
|
| 50 | - * |
|
| 51 | - * @param AssignPermissions $request |
|
| 52 | - * @return \Illuminate\Http\Response |
|
| 53 | - */ |
|
| 54 | - public function assignPermissions(AssignPermissions $request) |
|
| 55 | - { |
|
| 56 | - return new $this->modelResource($this->repo->assignPermissions($request->get('group_id'), $request->get('permission_ids'))); |
|
| 57 | - } |
|
| 48 | + /** |
|
| 49 | + * Handle an assign permissions to group request. |
|
| 50 | + * |
|
| 51 | + * @param AssignPermissions $request |
|
| 52 | + * @return \Illuminate\Http\Response |
|
| 53 | + */ |
|
| 54 | + public function assignPermissions(AssignPermissions $request) |
|
| 55 | + { |
|
| 56 | + return new $this->modelResource($this->repo->assignPermissions($request->get('group_id'), $request->get('permission_ids'))); |
|
| 57 | + } |
|
| 58 | 58 | } |