@@ -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 | - $adminRoleId = \DB::table('roles')->where('name', 'admin')->select('id')->first()->id; |
|
| 9 | + /** |
|
| 10 | + * Run the database seeds. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function run() |
|
| 15 | + { |
|
| 16 | + $adminRoleId = \DB::table('roles')->where('name', 'admin')->select('id')->first()->id; |
|
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * Assign the permissions to the admin role. |
|
| 20 | - */ |
|
| 21 | - \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['report'])->each(function ($permission) use ($adminRoleId) { |
|
| 22 | - \DB::table('permission_role')->insert( |
|
| 23 | - [ |
|
| 24 | - 'permission_id' => $permission->id, |
|
| 25 | - 'role_id' => $adminRoleId, |
|
| 26 | - 'created_at' => \DB::raw('NOW()'), |
|
| 27 | - 'updated_at' => \DB::raw('NOW()') |
|
| 28 | - ] |
|
| 29 | - ); |
|
| 30 | - }); |
|
| 31 | - } |
|
| 18 | + /** |
|
| 19 | + * Assign the permissions to the admin role. |
|
| 20 | + */ |
|
| 21 | + \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['report'])->each(function ($permission) use ($adminRoleId) { |
|
| 22 | + \DB::table('permission_role')->insert( |
|
| 23 | + [ |
|
| 24 | + 'permission_id' => $permission->id, |
|
| 25 | + 'role_id' => $adminRoleId, |
|
| 26 | + 'created_at' => \DB::raw('NOW()'), |
|
| 27 | + 'updated_at' => \DB::raw('NOW()') |
|
| 28 | + ] |
|
| 29 | + ); |
|
| 30 | + }); |
|
| 31 | + } |
|
| 32 | 32 | } |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | /** |
| 19 | 19 | * Assign the permissions to the admin role. |
| 20 | 20 | */ |
| 21 | - \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['report'])->each(function ($permission) use ($adminRoleId) { |
|
| 21 | + \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['report'])->each(function($permission) use ($adminRoleId) { |
|
| 22 | 22 | \DB::table('permission_role')->insert( |
| 23 | 23 | [ |
| 24 | 24 | 'permission_id' => $permission->id, |
@@ -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', ['report']); |
|
| 17 | - \DB::table('permission_role')->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', ['report']); |
|
| 17 | + \DB::table('permission_role')->whereIn('permission_id', $permissions->pluck('id'))->delete(); |
|
| 18 | + $permissions->delete(); |
|
| 19 | + } |
|
| 20 | 20 | } |
@@ -5,14 +5,14 @@ discard block |
||
| 5 | 5 | |
| 6 | 6 | class SampelReport extends Migration |
| 7 | 7 | { |
| 8 | - /** |
|
| 9 | - * Run the migrations. |
|
| 10 | - * |
|
| 11 | - * @return void |
|
| 12 | - */ |
|
| 13 | - public function up() |
|
| 14 | - { |
|
| 15 | - DB::statement("CREATE VIEW admin_count AS |
|
| 8 | + /** |
|
| 9 | + * Run the migrations. |
|
| 10 | + * |
|
| 11 | + * @return void |
|
| 12 | + */ |
|
| 13 | + public function up() |
|
| 14 | + { |
|
| 15 | + DB::statement("CREATE VIEW admin_count AS |
|
| 16 | 16 | select count(u.id) |
| 17 | 17 | from users u, roles g ,role_user ug |
| 18 | 18 | where |
@@ -20,25 +20,25 @@ discard block |
||
| 20 | 20 | ug.role_id = g.id |
| 21 | 21 | "); |
| 22 | 22 | |
| 23 | - DB::table('reports')->insert( |
|
| 24 | - [ |
|
| 25 | - [ |
|
| 26 | - 'report_name' => 'admin_count', |
|
| 27 | - 'view_name' => 'admin_count', |
|
| 28 | - 'created_at' => \DB::raw('NOW()'), |
|
| 29 | - 'updated_at' => \DB::raw('NOW()') |
|
| 30 | - ] |
|
| 31 | - ] |
|
| 32 | - ); |
|
| 33 | - } |
|
| 23 | + DB::table('reports')->insert( |
|
| 24 | + [ |
|
| 25 | + [ |
|
| 26 | + 'report_name' => 'admin_count', |
|
| 27 | + 'view_name' => 'admin_count', |
|
| 28 | + 'created_at' => \DB::raw('NOW()'), |
|
| 29 | + 'updated_at' => \DB::raw('NOW()') |
|
| 30 | + ] |
|
| 31 | + ] |
|
| 32 | + ); |
|
| 33 | + } |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * Reverse the migrations. |
|
| 37 | - * |
|
| 38 | - * @return void |
|
| 39 | - */ |
|
| 40 | - public function down() |
|
| 41 | - { |
|
| 42 | - DB::statement("DROP VIEW IF EXISTS admin_count"); |
|
| 43 | - } |
|
| 35 | + /** |
|
| 36 | + * Reverse the migrations. |
|
| 37 | + * |
|
| 38 | + * @return void |
|
| 39 | + */ |
|
| 40 | + public function down() |
|
| 41 | + { |
|
| 42 | + DB::statement("DROP VIEW IF EXISTS admin_count"); |
|
| 43 | + } |
|
| 44 | 44 | } |
@@ -6,14 +6,14 @@ |
||
| 6 | 6 | |
| 7 | 7 | class View extends JsonResource |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Transform the resource into an array. |
|
| 11 | - * |
|
| 12 | - * @param Request $request |
|
| 13 | - * @return array |
|
| 14 | - */ |
|
| 15 | - public function toArray($request) |
|
| 16 | - { |
|
| 17 | - return [$this->resource]; |
|
| 18 | - } |
|
| 9 | + /** |
|
| 10 | + * Transform the resource into an array. |
|
| 11 | + * |
|
| 12 | + * @param Request $request |
|
| 13 | + * @return array |
|
| 14 | + */ |
|
| 15 | + public function toArray($request) |
|
| 16 | + { |
|
| 17 | + return [$this->resource]; |
|
| 18 | + } |
|
| 19 | 19 | } |
@@ -9,40 +9,40 @@ |
||
| 9 | 9 | |
| 10 | 10 | class ReportController extends BaseApiController |
| 11 | 11 | { |
| 12 | - /** |
|
| 13 | - * Path of the model resource |
|
| 14 | - * |
|
| 15 | - * @var string |
|
| 16 | - */ |
|
| 17 | - protected $modelResource = 'App\Modules\Reporting\Http\Resources\Report'; |
|
| 12 | + /** |
|
| 13 | + * Path of the model resource |
|
| 14 | + * |
|
| 15 | + * @var string |
|
| 16 | + */ |
|
| 17 | + protected $modelResource = 'App\Modules\Reporting\Http\Resources\Report'; |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * List of all route actions that the base api controller |
|
| 21 | - * will skip permissions check for them. |
|
| 22 | - * @var array |
|
| 23 | - */ |
|
| 24 | - protected $skipPermissionCheck = ['getReport']; |
|
| 19 | + /** |
|
| 20 | + * List of all route actions that the base api controller |
|
| 21 | + * will skip permissions check for them. |
|
| 22 | + * @var array |
|
| 23 | + */ |
|
| 24 | + protected $skipPermissionCheck = ['getReport']; |
|
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * Init new object. |
|
| 28 | - * |
|
| 29 | - * @param ReportService $service |
|
| 30 | - * @return void |
|
| 31 | - */ |
|
| 32 | - public function __construct(ReportService $service) |
|
| 33 | - { |
|
| 34 | - parent::__construct($service); |
|
| 35 | - } |
|
| 26 | + /** |
|
| 27 | + * Init new object. |
|
| 28 | + * |
|
| 29 | + * @param ReportService $service |
|
| 30 | + * @return void |
|
| 31 | + */ |
|
| 32 | + public function __construct(ReportService $service) |
|
| 33 | + { |
|
| 34 | + parent::__construct($service); |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * Render the given servicert name with the given conditions. |
|
| 39 | - * |
|
| 40 | - * @param Request $request |
|
| 41 | - * @param string $reportName Name of the requested servicert |
|
| 42 | - * @return \Illuminate\Http\Response |
|
| 43 | - */ |
|
| 44 | - public function getReport(Request $request, $reportName) |
|
| 45 | - { |
|
| 46 | - return new ViewResource($this->service->getReport($reportName, $request->all(), $request->query('perPage'))); |
|
| 47 | - } |
|
| 37 | + /** |
|
| 38 | + * Render the given servicert name with the given conditions. |
|
| 39 | + * |
|
| 40 | + * @param Request $request |
|
| 41 | + * @param string $reportName Name of the requested servicert |
|
| 42 | + * @return \Illuminate\Http\Response |
|
| 43 | + */ |
|
| 44 | + public function getReport(Request $request, $reportName) |
|
| 45 | + { |
|
| 46 | + return new ViewResource($this->service->getReport($reportName, $request->all(), $request->query('perPage'))); |
|
| 47 | + } |
|
| 48 | 48 | } |
@@ -12,5 +12,5 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | |
| 14 | 14 | Broadcast::channel('users.{id}', function ($user, $id) {
|
| 15 | - return (int) $user->id === (int) $id; |
|
| 15 | + return (int) $user->id === (int) $id; |
|
| 16 | 16 | }); |
@@ -11,6 +11,6 @@ |
||
| 11 | 11 | | |
| 12 | 12 | */ |
| 13 | 13 | |
| 14 | -Broadcast::channel('users.{id}', function ($user, $id) {
|
|
| 14 | +Broadcast::channel('users.{id}', function($user, $id) {
|
|
| 15 | 15 | return (int) $user->id === (int) $id; |
| 16 | 16 | }); |
@@ -7,15 +7,15 @@ |
||
| 7 | 7 | |
| 8 | 8 | class BroadcastServiceProvider extends ServiceProvider |
| 9 | 9 | {
|
| 10 | - /** |
|
| 11 | - * Bootstrap any application services. |
|
| 12 | - * |
|
| 13 | - * @return void |
|
| 14 | - */ |
|
| 15 | - public function boot() |
|
| 16 | - {
|
|
| 17 | - Broadcast::routes(['middleware' => ['auth:api']]); |
|
| 10 | + /** |
|
| 11 | + * Bootstrap any application services. |
|
| 12 | + * |
|
| 13 | + * @return void |
|
| 14 | + */ |
|
| 15 | + public function boot() |
|
| 16 | + {
|
|
| 17 | + Broadcast::routes(['middleware' => ['auth:api']]); |
|
| 18 | 18 | |
| 19 | - require base_path('routes/channels.php');
|
|
| 20 | - } |
|
| 19 | + require base_path('routes/channels.php');
|
|
| 20 | + } |
|
| 21 | 21 | } |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /* |
|
| 5 | + /* |
|
| 6 | 6 | |-------------------------------------------------------------------------- |
| 7 | 7 | | Authentication Defaults |
| 8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,12 +13,12 @@ discard block |
||
| 13 | 13 | | |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | - 'defaults' => [ |
|
| 17 | - 'guard' => 'web', |
|
| 18 | - 'passwords' => 'users', |
|
| 19 | - ], |
|
| 16 | + 'defaults' => [ |
|
| 17 | + 'guard' => 'web', |
|
| 18 | + 'passwords' => 'users', |
|
| 19 | + ], |
|
| 20 | 20 | |
| 21 | - /* |
|
| 21 | + /* |
|
| 22 | 22 | |-------------------------------------------------------------------------- |
| 23 | 23 | | Authentication Guards |
| 24 | 24 | |-------------------------------------------------------------------------- |
@@ -35,19 +35,19 @@ discard block |
||
| 35 | 35 | | |
| 36 | 36 | */ |
| 37 | 37 | |
| 38 | - 'guards' => [ |
|
| 39 | - 'web' => [ |
|
| 40 | - 'driver' => 'session', |
|
| 41 | - 'provider' => 'users', |
|
| 42 | - ], |
|
| 38 | + 'guards' => [ |
|
| 39 | + 'web' => [ |
|
| 40 | + 'driver' => 'session', |
|
| 41 | + 'provider' => 'users', |
|
| 42 | + ], |
|
| 43 | 43 | |
| 44 | - 'api' => [ |
|
| 45 | - 'driver' => 'passport', |
|
| 46 | - 'provider' => 'users', |
|
| 47 | - ], |
|
| 48 | - ], |
|
| 44 | + 'api' => [ |
|
| 45 | + 'driver' => 'passport', |
|
| 46 | + 'provider' => 'users', |
|
| 47 | + ], |
|
| 48 | + ], |
|
| 49 | 49 | |
| 50 | - /* |
|
| 50 | + /* |
|
| 51 | 51 | |-------------------------------------------------------------------------- |
| 52 | 52 | | User Providers |
| 53 | 53 | |-------------------------------------------------------------------------- |
@@ -64,19 +64,19 @@ discard block |
||
| 64 | 64 | | |
| 65 | 65 | */ |
| 66 | 66 | |
| 67 | - 'providers' => [ |
|
| 68 | - 'users' => [ |
|
| 69 | - 'driver' => 'eloquent', |
|
| 70 | - 'model' => App\Modules\Users\AclUser::class, |
|
| 71 | - ], |
|
| 67 | + 'providers' => [ |
|
| 68 | + 'users' => [ |
|
| 69 | + 'driver' => 'eloquent', |
|
| 70 | + 'model' => App\Modules\Users\AclUser::class, |
|
| 71 | + ], |
|
| 72 | 72 | |
| 73 | - // 'users' => [ |
|
| 74 | - // 'driver' => 'database', |
|
| 75 | - // 'table' => 'users', |
|
| 76 | - // ], |
|
| 77 | - ], |
|
| 73 | + // 'users' => [ |
|
| 74 | + // 'driver' => 'database', |
|
| 75 | + // 'table' => 'users', |
|
| 76 | + // ], |
|
| 77 | + ], |
|
| 78 | 78 | |
| 79 | - /* |
|
| 79 | + /* |
|
| 80 | 80 | |-------------------------------------------------------------------------- |
| 81 | 81 | | Resetting Passwords |
| 82 | 82 | |-------------------------------------------------------------------------- |
@@ -91,12 +91,12 @@ discard block |
||
| 91 | 91 | | |
| 92 | 92 | */ |
| 93 | 93 | |
| 94 | - 'passwords' => [ |
|
| 95 | - 'users' => [ |
|
| 96 | - 'provider' => 'users', |
|
| 97 | - 'table' => 'password_resets', |
|
| 98 | - 'expire' => 60, |
|
| 99 | - ], |
|
| 100 | - ], |
|
| 94 | + 'passwords' => [ |
|
| 95 | + 'users' => [ |
|
| 96 | + 'provider' => 'users', |
|
| 97 | + 'table' => 'password_resets', |
|
| 98 | + 'expire' => 60, |
|
| 99 | + ], |
|
| 100 | + ], |
|
| 101 | 101 | |
| 102 | 102 | ]; |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | {
|
| 26 | 26 | $this->registerPolicies(); |
| 27 | 27 | |
| 28 | - Passport::routes(function ($router) {
|
|
| 28 | + Passport::routes(function($router) {
|
|
| 29 | 29 | $router->forAuthorization(); |
| 30 | 30 | $router->forAccessTokens(); |
| 31 | 31 | $router->forPersonalAccessTokens(); |
@@ -7,31 +7,31 @@ |
||
| 7 | 7 | |
| 8 | 8 | class AuthServiceProvider extends ServiceProvider |
| 9 | 9 | {
|
| 10 | - /** |
|
| 11 | - * The policy mappings for the application. |
|
| 12 | - * |
|
| 13 | - * @var array |
|
| 14 | - */ |
|
| 15 | - protected $policies = [ |
|
| 16 | - 'App\Model' => 'App\Policies\ModelPolicy', |
|
| 17 | - ]; |
|
| 10 | + /** |
|
| 11 | + * The policy mappings for the application. |
|
| 12 | + * |
|
| 13 | + * @var array |
|
| 14 | + */ |
|
| 15 | + protected $policies = [ |
|
| 16 | + 'App\Model' => 'App\Policies\ModelPolicy', |
|
| 17 | + ]; |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * Register any authentication / authorization services. |
|
| 21 | - * |
|
| 22 | - * @return void |
|
| 23 | - */ |
|
| 24 | - public function boot() |
|
| 25 | - {
|
|
| 26 | - $this->registerPolicies(); |
|
| 19 | + /** |
|
| 20 | + * Register any authentication / authorization services. |
|
| 21 | + * |
|
| 22 | + * @return void |
|
| 23 | + */ |
|
| 24 | + public function boot() |
|
| 25 | + {
|
|
| 26 | + $this->registerPolicies(); |
|
| 27 | 27 | |
| 28 | - Passport::routes(function ($router) {
|
|
| 29 | - $router->forAuthorization(); |
|
| 30 | - $router->forAccessTokens(); |
|
| 31 | - $router->forPersonalAccessTokens(); |
|
| 32 | - $router->forTransientTokens(); |
|
| 33 | - }); |
|
| 34 | - Passport::tokensExpireIn(\Carbon\Carbon::now()->addMinutes(60)); |
|
| 35 | - Passport::refreshTokensExpireIn(\Carbon\Carbon::now()->addMinutes(14400)); |
|
| 36 | - } |
|
| 28 | + Passport::routes(function ($router) {
|
|
| 29 | + $router->forAuthorization(); |
|
| 30 | + $router->forAccessTokens(); |
|
| 31 | + $router->forPersonalAccessTokens(); |
|
| 32 | + $router->forTransientTokens(); |
|
| 33 | + }); |
|
| 34 | + Passport::tokensExpireIn(\Carbon\Carbon::now()->addMinutes(60)); |
|
| 35 | + Passport::refreshTokensExpireIn(\Carbon\Carbon::now()->addMinutes(14400)); |
|
| 36 | + } |
|
| 37 | 37 | } |