@@ -15,29 +15,29 @@ |
||
15 | 15 | |
16 | 16 | Route::group(['prefix' => 'users'], function () { |
17 | 17 | |
18 | - Route::get('/', 'UserController@index'); |
|
19 | - Route::get('{id}', 'UserController@show'); |
|
20 | - Route::post('/', 'UserController@store'); |
|
21 | - Route::patch('{id}', 'UserController@update'); |
|
22 | - Route::delete('{id}', 'UserController@destroy'); |
|
23 | - Route::patch('restore/{id}', 'UserController@restore'); |
|
24 | - Route::patch('block/{id}', 'UserController@block'); |
|
25 | - Route::patch('unblock/{id}', 'UserController@unblock'); |
|
26 | - Route::patch('assign/roles/{id}', 'UserController@assignRoles'); |
|
18 | + Route::get('/', 'UserController@index'); |
|
19 | + Route::get('{id}', 'UserController@show'); |
|
20 | + Route::post('/', 'UserController@store'); |
|
21 | + Route::patch('{id}', 'UserController@update'); |
|
22 | + Route::delete('{id}', 'UserController@destroy'); |
|
23 | + Route::patch('restore/{id}', 'UserController@restore'); |
|
24 | + Route::patch('block/{id}', 'UserController@block'); |
|
25 | + Route::patch('unblock/{id}', 'UserController@unblock'); |
|
26 | + Route::patch('assign/roles/{id}', 'UserController@assignRoles'); |
|
27 | 27 | |
28 | - Route::group(['prefix' => 'account'], function () { |
|
28 | + Route::group(['prefix' => 'account'], function () { |
|
29 | 29 | |
30 | - Route::get('my', 'UserController@account'); |
|
31 | - Route::get('logout', 'UserController@logout'); |
|
32 | - Route::post('refresh/token', 'UserController@refreshToken'); |
|
33 | - Route::post('save', 'UserController@saveProfile'); |
|
34 | - Route::post('register', 'UserController@register'); |
|
35 | - Route::post('login', 'UserController@login'); |
|
36 | - Route::post('login/social', 'UserController@loginSocial'); |
|
37 | - Route::post('send/reset', 'UserController@sendReset'); |
|
38 | - Route::post('reset/password', 'UserController@resetPassword'); |
|
39 | - Route::post('change/password', 'UserController@changePassword'); |
|
40 | - Route::post('confirm/email', 'UserController@confirmEmail'); |
|
41 | - Route::post('resend/email/confirmation', 'UserController@resendEmailConfirmation'); |
|
42 | - }); |
|
30 | + Route::get('my', 'UserController@account'); |
|
31 | + Route::get('logout', 'UserController@logout'); |
|
32 | + Route::post('refresh/token', 'UserController@refreshToken'); |
|
33 | + Route::post('save', 'UserController@saveProfile'); |
|
34 | + Route::post('register', 'UserController@register'); |
|
35 | + Route::post('login', 'UserController@login'); |
|
36 | + Route::post('login/social', 'UserController@loginSocial'); |
|
37 | + Route::post('send/reset', 'UserController@sendReset'); |
|
38 | + Route::post('reset/password', 'UserController@resetPassword'); |
|
39 | + Route::post('change/password', 'UserController@changePassword'); |
|
40 | + Route::post('confirm/email', 'UserController@confirmEmail'); |
|
41 | + Route::post('resend/email/confirmation', 'UserController@resendEmailConfirmation'); |
|
42 | + }); |
|
43 | 43 | }); |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Disable Confirm Email |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | | |
12 | 12 | */ |
13 | 13 | |
14 | - 'disable_confirm_email' => env('DISABLE_CONFIRM_EMAIL', false), |
|
14 | + 'disable_confirm_email' => env('DISABLE_CONFIRM_EMAIL', false), |
|
15 | 15 | |
16 | - /* |
|
16 | + /* |
|
17 | 17 | |-------------------------------------------------------------------------- |
18 | 18 | | Confirm Email URL |
19 | 19 | |-------------------------------------------------------------------------- |
@@ -22,9 +22,9 @@ discard block |
||
22 | 22 | | |
23 | 23 | */ |
24 | 24 | |
25 | - 'confrim_email_url' => env('CONFIRM_EMAIL_URL'), |
|
25 | + 'confrim_email_url' => env('CONFIRM_EMAIL_URL'), |
|
26 | 26 | |
27 | - /* |
|
27 | + /* |
|
28 | 28 | |-------------------------------------------------------------------------- |
29 | 29 | | Reset Password URL |
30 | 30 | |-------------------------------------------------------------------------- |
@@ -33,9 +33,9 @@ discard block |
||
33 | 33 | | |
34 | 34 | */ |
35 | 35 | |
36 | - 'reset_password_url' => env('RESET_PASSWORD_URL'), |
|
36 | + 'reset_password_url' => env('RESET_PASSWORD_URL'), |
|
37 | 37 | |
38 | - /* |
|
38 | + /* |
|
39 | 39 | |-------------------------------------------------------------------------- |
40 | 40 | | Passport Client Id |
41 | 41 | |-------------------------------------------------------------------------- |
@@ -44,9 +44,9 @@ discard block |
||
44 | 44 | | |
45 | 45 | */ |
46 | 46 | |
47 | - 'passport_client_id' => env('PASSWORD_CLIENT_ID'), |
|
47 | + 'passport_client_id' => env('PASSWORD_CLIENT_ID'), |
|
48 | 48 | |
49 | - /* |
|
49 | + /* |
|
50 | 50 | |-------------------------------------------------------------------------- |
51 | 51 | | Passport Client Secret |
52 | 52 | |-------------------------------------------------------------------------- |
@@ -55,9 +55,9 @@ discard block |
||
55 | 55 | | |
56 | 56 | */ |
57 | 57 | |
58 | - 'passport_client_secret' => env('PASSWORD_CLIENT_SECRET'), |
|
58 | + 'passport_client_secret' => env('PASSWORD_CLIENT_SECRET'), |
|
59 | 59 | |
60 | - /* |
|
60 | + /* |
|
61 | 61 | |-------------------------------------------------------------------------- |
62 | 62 | | Token Expire In |
63 | 63 | |-------------------------------------------------------------------------- |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | | |
67 | 67 | */ |
68 | 68 | |
69 | - /* |
|
69 | + /* |
|
70 | 70 | |-------------------------------------------------------------------------- |
71 | 71 | | Social Pass |
72 | 72 | |-------------------------------------------------------------------------- |
@@ -75,5 +75,5 @@ discard block |
||
75 | 75 | | |
76 | 76 | */ |
77 | 77 | |
78 | - 'social_pass' => env('SOCIAL_PASS', false), |
|
78 | + 'social_pass' => env('SOCIAL_PASS', false), |
|
79 | 79 | ]; |
@@ -10,21 +10,21 @@ |
||
10 | 10 | class Permission extends Model |
11 | 11 | { |
12 | 12 | |
13 | - use SoftDeletes; |
|
14 | - protected $table = 'permissions'; |
|
15 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
16 | - protected $hidden = ['deleted_at']; |
|
17 | - protected $guarded = ['id']; |
|
18 | - public $fillable = ['name', 'model']; |
|
13 | + use SoftDeletes; |
|
14 | + protected $table = 'permissions'; |
|
15 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
16 | + protected $hidden = ['deleted_at']; |
|
17 | + protected $guarded = ['id']; |
|
18 | + public $fillable = ['name', 'model']; |
|
19 | 19 | |
20 | - public function roles() |
|
21 | - { |
|
22 | - return $this->belongsToMany(Role::class, 'permission_role', 'permission_id', 'role_id')->whereNull('permission_role.deleted_at')->withTimestamps(); |
|
23 | - } |
|
20 | + public function roles() |
|
21 | + { |
|
22 | + return $this->belongsToMany(Role::class, 'permission_role', 'permission_id', 'role_id')->whereNull('permission_role.deleted_at')->withTimestamps(); |
|
23 | + } |
|
24 | 24 | |
25 | - public static function boot() |
|
26 | - { |
|
27 | - parent::boot(); |
|
28 | - Permission::observe(PermissionObserver::class); |
|
29 | - } |
|
25 | + public static function boot() |
|
26 | + { |
|
27 | + parent::boot(); |
|
28 | + Permission::observe(PermissionObserver::class); |
|
29 | + } |
|
30 | 30 | } |
@@ -5,41 +5,41 @@ |
||
5 | 5 | |
6 | 6 | class Permissions extends Migration |
7 | 7 | { |
8 | - /** |
|
9 | - * Run the migrations. |
|
10 | - * |
|
11 | - * @return void |
|
12 | - */ |
|
13 | - public function up() |
|
14 | - { |
|
15 | - Schema::create('permissions', function (Blueprint $table) { |
|
16 | - increments('id'); |
|
17 | - $table->string('name', 100); |
|
18 | - $table->string('model', 100); |
|
19 | - $table->softDeletes(); |
|
20 | - $table->timestamps(); |
|
21 | - $table->unique(array('name', 'model')); |
|
22 | - }); |
|
23 | - Schema::create('permission_role', function (Blueprint $table) { |
|
24 | - increments('id'); |
|
25 | - $table->unsignedInteger('role_id'); |
|
26 | - $table->unsignedInteger('permission_id'); |
|
27 | - $table->softDeletes(); |
|
28 | - $table->timestamps(); |
|
8 | + /** |
|
9 | + * Run the migrations. |
|
10 | + * |
|
11 | + * @return void |
|
12 | + */ |
|
13 | + public function up() |
|
14 | + { |
|
15 | + Schema::create('permissions', function (Blueprint $table) { |
|
16 | + increments('id'); |
|
17 | + $table->string('name', 100); |
|
18 | + $table->string('model', 100); |
|
19 | + $table->softDeletes(); |
|
20 | + $table->timestamps(); |
|
21 | + $table->unique(array('name', 'model')); |
|
22 | + }); |
|
23 | + Schema::create('permission_role', function (Blueprint $table) { |
|
24 | + increments('id'); |
|
25 | + $table->unsignedInteger('role_id'); |
|
26 | + $table->unsignedInteger('permission_id'); |
|
27 | + $table->softDeletes(); |
|
28 | + $table->timestamps(); |
|
29 | 29 | |
30 | - $table->foreign('role_id')->references('id')->on('roles'); |
|
31 | - $table->foreign('permission_id')->references('id')->on('permissions'); |
|
32 | - }); |
|
33 | - } |
|
30 | + $table->foreign('role_id')->references('id')->on('roles'); |
|
31 | + $table->foreign('permission_id')->references('id')->on('permissions'); |
|
32 | + }); |
|
33 | + } |
|
34 | 34 | |
35 | - /** |
|
36 | - * Reverse the migrations. |
|
37 | - * |
|
38 | - * @return void |
|
39 | - */ |
|
40 | - public function down() |
|
41 | - { |
|
42 | - Schema::dropIfExists('permission_role'); |
|
43 | - Schema::dropIfExists('permissions'); |
|
44 | - } |
|
35 | + /** |
|
36 | + * Reverse the migrations. |
|
37 | + * |
|
38 | + * @return void |
|
39 | + */ |
|
40 | + public function down() |
|
41 | + { |
|
42 | + Schema::dropIfExists('permission_role'); |
|
43 | + Schema::dropIfExists('permissions'); |
|
44 | + } |
|
45 | 45 | } |
@@ -11,26 +11,26 @@ |
||
11 | 11 | class Role extends Model |
12 | 12 | { |
13 | 13 | |
14 | - use SoftDeletes; |
|
15 | - protected $table = 'roles'; |
|
16 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
17 | - protected $hidden = ['deleted_at']; |
|
18 | - protected $guarded = ['id']; |
|
19 | - public $fillable = ['name']; |
|
14 | + use SoftDeletes; |
|
15 | + protected $table = 'roles'; |
|
16 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
17 | + protected $hidden = ['deleted_at']; |
|
18 | + protected $guarded = ['id']; |
|
19 | + public $fillable = ['name']; |
|
20 | 20 | |
21 | - public function users() |
|
22 | - { |
|
23 | - return $this->belongsToMany(AclUser::class, 'role_user', 'role_id', 'user_id')->whereNull('role_user.deleted_at')->withTimestamps(); |
|
24 | - } |
|
21 | + public function users() |
|
22 | + { |
|
23 | + return $this->belongsToMany(AclUser::class, 'role_user', 'role_id', 'user_id')->whereNull('role_user.deleted_at')->withTimestamps(); |
|
24 | + } |
|
25 | 25 | |
26 | - public function permissions() |
|
27 | - { |
|
28 | - return $this->belongsToMany(Permission::class, 'permission_role', 'role_id', 'permission_id')->whereNull('permission_role.deleted_at')->withTimestamps(); |
|
29 | - } |
|
26 | + public function permissions() |
|
27 | + { |
|
28 | + return $this->belongsToMany(Permission::class, 'permission_role', 'role_id', 'permission_id')->whereNull('permission_role.deleted_at')->withTimestamps(); |
|
29 | + } |
|
30 | 30 | |
31 | - public static function boot() |
|
32 | - { |
|
33 | - parent::boot(); |
|
34 | - Role::observe(RoleObserver::class); |
|
35 | - } |
|
31 | + public static function boot() |
|
32 | + { |
|
33 | + parent::boot(); |
|
34 | + Role::observe(RoleObserver::class); |
|
35 | + } |
|
36 | 36 | } |
@@ -5,40 +5,40 @@ |
||
5 | 5 | |
6 | 6 | class Roles extends Migration |
7 | 7 | { |
8 | - /** |
|
9 | - * Run the migrations. |
|
10 | - * |
|
11 | - * @return void |
|
12 | - */ |
|
13 | - public function up() |
|
14 | - { |
|
15 | - Schema::create('roles', function (Blueprint $table) { |
|
16 | - increments('id'); |
|
17 | - $table->string('name', 100)->unique(); |
|
18 | - $table->softDeletes(); |
|
19 | - $table->timestamps(); |
|
20 | - }); |
|
8 | + /** |
|
9 | + * Run the migrations. |
|
10 | + * |
|
11 | + * @return void |
|
12 | + */ |
|
13 | + public function up() |
|
14 | + { |
|
15 | + Schema::create('roles', function (Blueprint $table) { |
|
16 | + increments('id'); |
|
17 | + $table->string('name', 100)->unique(); |
|
18 | + $table->softDeletes(); |
|
19 | + $table->timestamps(); |
|
20 | + }); |
|
21 | 21 | |
22 | - Schema::create('role_user', function (Blueprint $table) { |
|
23 | - increments('id'); |
|
24 | - $table->unsignedInteger('user_id'); |
|
25 | - $table->unsignedInteger('role_id'); |
|
26 | - $table->softDeletes(); |
|
27 | - $table->timestamps(); |
|
22 | + Schema::create('role_user', function (Blueprint $table) { |
|
23 | + increments('id'); |
|
24 | + $table->unsignedInteger('user_id'); |
|
25 | + $table->unsignedInteger('role_id'); |
|
26 | + $table->softDeletes(); |
|
27 | + $table->timestamps(); |
|
28 | 28 | |
29 | - $table->foreign('user_id')->references('id')->on('users'); |
|
30 | - $table->foreign('role_id')->references('id')->on('roles'); |
|
31 | - }); |
|
32 | - } |
|
29 | + $table->foreign('user_id')->references('id')->on('users'); |
|
30 | + $table->foreign('role_id')->references('id')->on('roles'); |
|
31 | + }); |
|
32 | + } |
|
33 | 33 | |
34 | - /** |
|
35 | - * Reverse the migrations. |
|
36 | - * |
|
37 | - * @return void |
|
38 | - */ |
|
39 | - public function down() |
|
40 | - { |
|
41 | - Schema::dropIfExists('role_user'); |
|
42 | - Schema::dropIfExists('roles'); |
|
43 | - } |
|
34 | + /** |
|
35 | + * Reverse the migrations. |
|
36 | + * |
|
37 | + * @return void |
|
38 | + */ |
|
39 | + public function down() |
|
40 | + { |
|
41 | + Schema::dropIfExists('role_user'); |
|
42 | + Schema::dropIfExists('roles'); |
|
43 | + } |
|
44 | 44 | } |
@@ -15,11 +15,11 @@ |
||
15 | 15 | |
16 | 16 | Route::group(['prefix' => 'roles'], function () { |
17 | 17 | |
18 | - Route::get('/', 'RoleController@index'); |
|
19 | - Route::get('{id}', 'RoleController@show'); |
|
20 | - Route::post('/', 'RoleController@store'); |
|
21 | - Route::patch('{id}', 'RoleController@update'); |
|
22 | - Route::delete('{id}', 'RoleController@destroy'); |
|
23 | - Route::patch('restore/{id}', 'RoleController@restore'); |
|
24 | - Route::patch('assign/permissions/{id}', 'RoleController@assignPermissions'); |
|
18 | + Route::get('/', 'RoleController@index'); |
|
19 | + Route::get('{id}', 'RoleController@show'); |
|
20 | + Route::post('/', 'RoleController@store'); |
|
21 | + Route::patch('{id}', 'RoleController@update'); |
|
22 | + Route::delete('{id}', 'RoleController@destroy'); |
|
23 | + Route::patch('restore/{id}', 'RoleController@restore'); |
|
24 | + Route::patch('assign/permissions/{id}', 'RoleController@assignPermissions'); |
|
25 | 25 | }); |
@@ -6,33 +6,33 @@ |
||
6 | 6 | |
7 | 7 | class CreateJobsTable extends Migration |
8 | 8 | { |
9 | - /** |
|
10 | - * Run the migrations. |
|
11 | - * |
|
12 | - * @return void |
|
13 | - */ |
|
14 | - public function up() |
|
15 | - { |
|
16 | - Schema::create('jobs', function (Blueprint $table) { |
|
17 | - $table->bigincrements('id')->primary(); |
|
18 | - $table->string('queue'); |
|
19 | - $table->longText('payload'); |
|
20 | - $table->tinyInteger('attempts')->unsigned(); |
|
21 | - $table->unsignedInteger('reserved_at')->nullable(); |
|
22 | - $table->unsignedInteger('available_at'); |
|
23 | - $table->unsignedInteger('created_at'); |
|
9 | + /** |
|
10 | + * Run the migrations. |
|
11 | + * |
|
12 | + * @return void |
|
13 | + */ |
|
14 | + public function up() |
|
15 | + { |
|
16 | + Schema::create('jobs', function (Blueprint $table) { |
|
17 | + $table->bigincrements('id')->primary(); |
|
18 | + $table->string('queue'); |
|
19 | + $table->longText('payload'); |
|
20 | + $table->tinyInteger('attempts')->unsigned(); |
|
21 | + $table->unsignedInteger('reserved_at')->nullable(); |
|
22 | + $table->unsignedInteger('available_at'); |
|
23 | + $table->unsignedInteger('created_at'); |
|
24 | 24 | |
25 | - $table->index(['queue', 'reserved_at']); |
|
26 | - }); |
|
27 | - } |
|
25 | + $table->index(['queue', 'reserved_at']); |
|
26 | + }); |
|
27 | + } |
|
28 | 28 | |
29 | - /** |
|
30 | - * Reverse the migrations. |
|
31 | - * |
|
32 | - * @return void |
|
33 | - */ |
|
34 | - public function down() |
|
35 | - { |
|
36 | - Schema::dropIfExists('jobs'); |
|
37 | - } |
|
29 | + /** |
|
30 | + * Reverse the migrations. |
|
31 | + * |
|
32 | + * @return void |
|
33 | + */ |
|
34 | + public function down() |
|
35 | + { |
|
36 | + Schema::dropIfExists('jobs'); |
|
37 | + } |
|
38 | 38 | } |
@@ -6,30 +6,30 @@ |
||
6 | 6 | |
7 | 7 | class CreateFailedJobsTable extends Migration |
8 | 8 | { |
9 | - /** |
|
10 | - * Run the migrations. |
|
11 | - * |
|
12 | - * @return void |
|
13 | - */ |
|
14 | - public function up() |
|
15 | - { |
|
16 | - Schema::create('failed_jobs', function (Blueprint $table) { |
|
17 | - $table->bigincrements('id')->primary(); |
|
18 | - $table->text('connection'); |
|
19 | - $table->text('queue'); |
|
20 | - $table->longText('payload'); |
|
21 | - $table->longText('exception'); |
|
22 | - $table->timestamp('failed_at')->useCurrent(); |
|
23 | - }); |
|
24 | - } |
|
9 | + /** |
|
10 | + * Run the migrations. |
|
11 | + * |
|
12 | + * @return void |
|
13 | + */ |
|
14 | + public function up() |
|
15 | + { |
|
16 | + Schema::create('failed_jobs', function (Blueprint $table) { |
|
17 | + $table->bigincrements('id')->primary(); |
|
18 | + $table->text('connection'); |
|
19 | + $table->text('queue'); |
|
20 | + $table->longText('payload'); |
|
21 | + $table->longText('exception'); |
|
22 | + $table->timestamp('failed_at')->useCurrent(); |
|
23 | + }); |
|
24 | + } |
|
25 | 25 | |
26 | - /** |
|
27 | - * Reverse the migrations. |
|
28 | - * |
|
29 | - * @return void |
|
30 | - */ |
|
31 | - public function down() |
|
32 | - { |
|
33 | - Schema::dropIfExists('failed_jobs'); |
|
34 | - } |
|
26 | + /** |
|
27 | + * Reverse the migrations. |
|
28 | + * |
|
29 | + * @return void |
|
30 | + */ |
|
31 | + public function down() |
|
32 | + { |
|
33 | + Schema::dropIfExists('failed_jobs'); |
|
34 | + } |
|
35 | 35 | } |