@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace plunner\Http\Controllers\Companies\Employees; |
| 4 | 4 | |
| 5 | -use Illuminate\Http\Request; |
|
| 6 | 5 | use plunner\Company; |
| 7 | 6 | use plunner\Employee; |
| 8 | 7 | use plunner\Http\Controllers\Controller; |
@@ -21,8 +21,8 @@ |
||
| 21 | 21 | */ |
| 22 | 22 | public function __construct() |
| 23 | 23 | { |
| 24 | - config(['auth.model' => \plunner\Employee::class]); |
|
| 25 | - config(['jwt.user' => \plunner\Employee::class]); |
|
| 24 | + config([ 'auth.model' => \plunner\Employee::class ]); |
|
| 25 | + config([ 'jwt.user' => \plunner\Employee::class ]); |
|
| 26 | 26 | $this->middleware('jwt.authandrefresh:mode-en'); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -2,11 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace plunner\Http\Controllers\Employees\Meetings; |
| 4 | 4 | |
| 5 | -use Illuminate\Http\Request; |
|
| 6 | - |
|
| 7 | -use plunner\Group; |
|
| 8 | 5 | use plunner\Employee; |
| 9 | -use plunner\Http\Requests; |
|
| 10 | 6 | use plunner\Http\Controllers\Controller; |
| 11 | 7 | use plunner\Meeting; |
| 12 | 8 | |
@@ -21,8 +21,8 @@ |
||
| 21 | 21 | */ |
| 22 | 22 | public function __construct() |
| 23 | 23 | { |
| 24 | - config(['auth.model' => \plunner\Employee::class]); |
|
| 25 | - config(['jwt.user' => \plunner\Employee::class]); |
|
| 24 | + config([ 'auth.model' => \plunner\Employee::class ]); |
|
| 25 | + config([ 'jwt.user' => \plunner\Employee::class ]); |
|
| 26 | 26 | $this->middleware('jwt.authandrefresh:mode-en'); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -2,8 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace plunner\Policies; |
| 4 | 4 | |
| 5 | -use plunner\Timeslot; |
|
| 6 | 5 | use plunner\PolicyCheckable; |
| 6 | +use plunner\Timeslot; |
|
| 7 | 7 | |
| 8 | 8 | /** |
| 9 | 9 | * Class TimeslotPolicy |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | return [ |
| 35 | 35 | 'name' => 'required|min:1|max:255', |
| 36 | 36 | 'email' => 'required|email|max:255|unique:employees,email,'.$this->route('employees').',id,company_id,'.$this->user()->id, |
| 37 | - 'password' => ((\Route::current()->getName() == 'companies.employees.store')?'':'sometimes|').'required|confirmed|min:6', |
|
| 37 | + 'password' => ((\Route::current()->getName() == 'companies.employees.store') ? '' : 'sometimes|').'required|confirmed|min:6', |
|
| 38 | 38 | ]; |
| 39 | 39 | } |
| 40 | 40 | } |
@@ -19,41 +19,41 @@ discard block |
||
| 19 | 19 | * Companies |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | -Route::group(['namespace' => 'Companies', 'prefix' => 'companies'], function() { |
|
| 22 | +Route::group([ 'namespace' => 'Companies', 'prefix' => 'companies' ], function() { |
|
| 23 | 23 | |
| 24 | 24 | //\Auth |
| 25 | 25 | |
| 26 | - Route::group(['namespace' => 'Auth'], function() { |
|
| 27 | - Route::group(['prefix' => 'auth'], function () { |
|
| 26 | + Route::group([ 'namespace' => 'Auth' ], function() { |
|
| 27 | + Route::group([ 'prefix' => 'auth' ], function() { |
|
| 28 | 28 | // Authentication routes... |
| 29 | - Route::post('login', ['as' => 'companies.auth.login','uses'=>'AuthController@postLogin']); |
|
| 29 | + Route::post('login', [ 'as' => 'companies.auth.login', 'uses'=>'AuthController@postLogin' ]); |
|
| 30 | 30 | |
| 31 | 31 | // Registration routes... |
| 32 | - Route::post('register', ['as' => 'companies.auth.register', 'uses'=>'AuthController@postRegister']); |
|
| 32 | + Route::post('register', [ 'as' => 'companies.auth.register', 'uses'=>'AuthController@postRegister' ]); |
|
| 33 | 33 | |
| 34 | 34 | }); |
| 35 | 35 | |
| 36 | - Route::group(['prefix' => 'password'], function () { |
|
| 36 | + Route::group([ 'prefix' => 'password' ], function() { |
|
| 37 | 37 | // Password reset link request routes... |
| 38 | - Route::post('email', ['as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail']); |
|
| 38 | + Route::post('email', [ 'as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail' ]); |
|
| 39 | 39 | |
| 40 | 40 | // Password reset routes... |
| 41 | - Route::post('reset', ['as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset']); |
|
| 41 | + Route::post('reset', [ 'as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset' ]); |
|
| 42 | 42 | }); |
| 43 | 43 | }); |
| 44 | 44 | |
| 45 | - Route::group(['namespace' => 'Employees'], function() { |
|
| 46 | - Route::resource('employees', 'EmployeesController', ['except' => ['create', 'edit']]); |
|
| 45 | + Route::group([ 'namespace' => 'Employees' ], function() { |
|
| 46 | + Route::resource('employees', 'EmployeesController', [ 'except' => [ 'create', 'edit' ] ]); |
|
| 47 | 47 | }); |
| 48 | 48 | |
| 49 | - Route::group(['namespace' => 'Groups'], function() { |
|
| 50 | - Route::resource('groups', 'GroupsController', ['except' => ['create', 'edit']]); |
|
| 51 | - Route::resource('groups.employees', 'EmployeesController', ['only' => ['store', 'index', 'destroy']]); |
|
| 49 | + Route::group([ 'namespace' => 'Groups' ], function() { |
|
| 50 | + Route::resource('groups', 'GroupsController', [ 'except' => [ 'create', 'edit' ] ]); |
|
| 51 | + Route::resource('groups.employees', 'EmployeesController', [ 'only' => [ 'store', 'index', 'destroy' ] ]); |
|
| 52 | 52 | }); |
| 53 | 53 | |
| 54 | - Route::group(['namespace' => 'Company', 'prefix' => 'company'], function() { |
|
| 55 | - Route::get('/', ['as' => 'companies.company.index', 'uses' => 'CompanyController@index']); |
|
| 56 | - Route::put('/', ['as' => 'companies.company.update', 'uses' => 'CompanyController@update']); |
|
| 54 | + Route::group([ 'namespace' => 'Company', 'prefix' => 'company' ], function() { |
|
| 55 | + Route::get('/', [ 'as' => 'companies.company.index', 'uses' => 'CompanyController@index' ]); |
|
| 56 | + Route::put('/', [ 'as' => 'companies.company.update', 'uses' => 'CompanyController@update' ]); |
|
| 57 | 57 | }); |
| 58 | 58 | }); |
| 59 | 59 | |
@@ -61,52 +61,52 @@ discard block |
||
| 61 | 61 | /** |
| 62 | 62 | * Employees |
| 63 | 63 | */ |
| 64 | -Route::group(['namespace' => 'Employees', 'prefix' => 'employees'], function() { |
|
| 64 | +Route::group([ 'namespace' => 'Employees', 'prefix' => 'employees' ], function() { |
|
| 65 | 65 | |
| 66 | 66 | //\Auth |
| 67 | - Route::group(['namespace' => 'Auth'], function() { |
|
| 68 | - Route::group(['prefix' => 'auth'], function () { |
|
| 67 | + Route::group([ 'namespace' => 'Auth' ], function() { |
|
| 68 | + Route::group([ 'prefix' => 'auth' ], function() { |
|
| 69 | 69 | // Authentication routes... |
| 70 | - Route::post('login', ['as' => 'companies.auth.login', 'uses'=>'AuthController@postLogin']); |
|
| 70 | + Route::post('login', [ 'as' => 'companies.auth.login', 'uses'=>'AuthController@postLogin' ]); |
|
| 71 | 71 | |
| 72 | 72 | // Registration routes... |
| 73 | 73 | //Route::post('register', ['as' => 'companies.auth.register', 'uses'=>'AuthController@postRegister']); //the registration is managed by the company |
| 74 | 74 | |
| 75 | 75 | }); |
| 76 | 76 | |
| 77 | - Route::group(['prefix' => 'password'], function () { |
|
| 77 | + Route::group([ 'prefix' => 'password' ], function() { |
|
| 78 | 78 | // Password reset link request routes... |
| 79 | - Route::post('email', ['as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail']); |
|
| 79 | + Route::post('email', [ 'as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail' ]); |
|
| 80 | 80 | |
| 81 | 81 | // Password reset routes... |
| 82 | - Route::post('reset', ['as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset']); |
|
| 82 | + Route::post('reset', [ 'as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset' ]); |
|
| 83 | 83 | }); |
| 84 | 84 | }); |
| 85 | 85 | |
| 86 | - Route::group(['namespace' => 'Calendars'], function() { |
|
| 87 | - Route::resource('calendars', 'CalendarsController', ['except' => ['create', 'edit']]); |
|
| 88 | - Route::post('calendars/caldav', ['as' => 'employees.calendars.caldav','uses'=>'CalendarsController@storeCaldav']); |
|
| 89 | - Route::post('calendars/calendars', ['as' => 'employees.calendars.calendars','uses'=>'CalendarsController@getCalendars']); //TODO it's correct post? or not |
|
| 90 | - Route::resource('calendars.timeslots', 'TimeslotsController', ['except' => ['create', 'edit']]); |
|
| 86 | + Route::group([ 'namespace' => 'Calendars' ], function() { |
|
| 87 | + Route::resource('calendars', 'CalendarsController', [ 'except' => [ 'create', 'edit' ] ]); |
|
| 88 | + Route::post('calendars/caldav', [ 'as' => 'employees.calendars.caldav', 'uses'=>'CalendarsController@storeCaldav' ]); |
|
| 89 | + Route::post('calendars/calendars', [ 'as' => 'employees.calendars.calendars', 'uses'=>'CalendarsController@getCalendars' ]); //TODO it's correct post? or not |
|
| 90 | + Route::resource('calendars.timeslots', 'TimeslotsController', [ 'except' => [ 'create', 'edit' ] ]); |
|
| 91 | 91 | }); |
| 92 | 92 | |
| 93 | - Route::group(['namespace' => 'Planners', 'prefix' => 'planners'], function() { |
|
| 94 | - Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]); |
|
| 95 | - Route::resource('groups.meetings', 'MeetingsController', ['except' => ['create', 'edit']]); |
|
| 96 | - Route::resource('groups.meetings.timeslots', 'MeetingTimeslotsController', ['except' => ['create', 'edit']]); |
|
| 93 | + Route::group([ 'namespace' => 'Planners', 'prefix' => 'planners' ], function() { |
|
| 94 | + Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]); |
|
| 95 | + Route::resource('groups.meetings', 'MeetingsController', [ 'except' => [ 'create', 'edit' ] ]); |
|
| 96 | + Route::resource('groups.meetings.timeslots', 'MeetingTimeslotsController', [ 'except' => [ 'create', 'edit' ] ]); |
|
| 97 | 97 | }); |
| 98 | 98 | |
| 99 | - Route::group(['namespace' => 'Groups'], function() { |
|
| 100 | - Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]); |
|
| 99 | + Route::group([ 'namespace' => 'Groups' ], function() { |
|
| 100 | + Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]); |
|
| 101 | 101 | }); |
| 102 | 102 | |
| 103 | 103 | |
| 104 | - Route::group(['namespace' => 'Meetings'], function() { |
|
| 105 | - Route::resource('meetings', 'MeetingsController', ['only' => ['index', 'show']]); |
|
| 104 | + Route::group([ 'namespace' => 'Meetings' ], function() { |
|
| 105 | + Route::resource('meetings', 'MeetingsController', [ 'only' => [ 'index', 'show' ] ]); |
|
| 106 | 106 | }); |
| 107 | 107 | |
| 108 | - Route::group(['namespace' => 'Employee', 'prefix' => 'employee'], function() { |
|
| 109 | - Route::get('/', ['as' => 'employees.employee.index', 'uses' => 'EmployeeController@index']); |
|
| 110 | - Route::put('/', ['as' => 'employees.employee.update', 'uses' => 'EmployeeController@update']); |
|
| 108 | + Route::group([ 'namespace' => 'Employee', 'prefix' => 'employee' ], function() { |
|
| 109 | + Route::get('/', [ 'as' => 'employees.employee.index', 'uses' => 'EmployeeController@index' ]); |
|
| 110 | + Route::put('/', [ 'as' => 'employees.employee.update', 'uses' => 'EmployeeController@update' ]); |
|
| 111 | 111 | }); |
| 112 | 112 | }); |
| 113 | 113 | \ No newline at end of file |
@@ -33,14 +33,14 @@ |
||
| 33 | 33 | * |
| 34 | 34 | * @var array |
| 35 | 35 | */ |
| 36 | - protected $fillable = ['time_start', 'time_end']; |
|
| 36 | + protected $fillable = [ 'time_start', 'time_end' ]; |
|
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | 39 | * The attributes excluded from the model's JSON form. |
| 40 | 40 | * |
| 41 | 41 | * @var array |
| 42 | 42 | */ |
| 43 | - protected $hidden = ['pivot', 'calendar']; |
|
| 43 | + protected $hidden = [ 'pivot', 'calendar' ]; |
|
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |