@@ -17,7 +17,7 @@ |
||
17 | 17 | app(InviteUser::class)->handle($user, auth()->guard('chief')->user()); |
18 | 18 | |
19 | 19 | return redirect()->route('chief.back.users.index') |
20 | - ->with('messages.success', $user->fullname. ' is opnieuw een uitnodiging verstuurd.'); |
|
20 | + ->with('messages.success', $user->fullname.' is opnieuw een uitnodiging verstuurd.'); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | } |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | |
19 | 19 | public function handle($request, Closure $next) |
20 | 20 | { |
21 | - if (! $request->user() || ! $request->session()) { |
|
21 | + if (!$request->user() || !$request->session()) { |
|
22 | 22 | return $next($request); |
23 | 23 | } |
24 | 24 | |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | } |
31 | 31 | } |
32 | 32 | |
33 | - if (! $request->session()->has('password_hash')) { |
|
33 | + if (!$request->session()->has('password_hash')) { |
|
34 | 34 | $this->storePasswordHashInSession($request); |
35 | 35 | } |
36 | 36 | |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | $this->logout($request); |
39 | 39 | } |
40 | 40 | |
41 | - return tap($next($request), function () use ($request) { |
|
41 | + return tap($next($request), function() use ($request) { |
|
42 | 42 | $this->storePasswordHashInSession($request); |
43 | 43 | }); |
44 | 44 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | */ |
52 | 52 | protected function storePasswordHashInSession($request) |
53 | 53 | { |
54 | - if (! $request->user()) { |
|
54 | + if (!$request->user()) { |
|
55 | 55 | return; |
56 | 56 | } |
57 | 57 |
@@ -19,15 +19,15 @@ |
||
19 | 19 | public function handle($request, Closure $next) |
20 | 20 | { |
21 | 21 | // Verifies a valid signature and still outside expiration period |
22 | - if (! $request->hasValidSignature()) { |
|
22 | + if (!$request->hasValidSignature()) { |
|
23 | 23 | return redirect()->route('invite.expired'); |
24 | 24 | } |
25 | 25 | |
26 | - if(! $invitation = Invitation::findByToken($request->token)) { |
|
26 | + if (!$invitation = Invitation::findByToken($request->token)) { |
|
27 | 27 | return redirect()->route('invite.expired'); |
28 | 28 | } |
29 | 29 | |
30 | - if($invitation->state() == InvitationState::REVOKED) { |
|
30 | + if ($invitation->state() == InvitationState::REVOKED) { |
|
31 | 31 | return redirect()->route('invite.expired'); |
32 | 32 | } |
33 | 33 |
@@ -23,7 +23,7 @@ |
||
23 | 23 | { |
24 | 24 | Schema::defaultStringLength(191); |
25 | 25 | |
26 | - $this->loadRoutesFrom(__DIR__ . '/../../src/Demo/Http/routes/demoRoutes.php'); |
|
27 | - $this->loadViewsFrom(__DIR__ . '/../../src/Demo/views', 'demo'); |
|
26 | + $this->loadRoutesFrom(__DIR__.'/../../src/Demo/Http/routes/demoRoutes.php'); |
|
27 | + $this->loadViewsFrom(__DIR__.'/../../src/Demo/views', 'demo'); |
|
28 | 28 | } |
29 | 29 | } |
@@ -17,7 +17,7 @@ |
||
17 | 17 | { |
18 | 18 | $this->registerPolicies(); |
19 | 19 | |
20 | - Auth::provider('chief-eloquent',function($app, array $config){ |
|
20 | + Auth::provider('chief-eloquent', function($app, array $config) { |
|
21 | 21 | return new ChiefUserProvider($app['hash'], $config['model']); |
22 | 22 | }); |
23 | 23 | } |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | $this->app->bind('command.chief:permission', GeneratePermissionCommand::class); |
53 | 53 | $this->app->bind('command.chief:role', GenerateRoleCommand::class); |
54 | 54 | $this->app->bind('command.chief:admin', CreateAdmin::class); |
55 | - $this->app->bind('command.chief:page', function($app){ |
|
55 | + $this->app->bind('command.chief:page', function($app) { |
|
56 | 56 | return new GeneratePage($app['files'], [ |
57 | 57 | 'base_path' => base_path() |
58 | 58 | ]); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | public function register() |
68 | 68 | { |
69 | 69 | // TODO: test this logic... |
70 | - $this->mergeConfigFrom(__DIR__.'/../../config/chief.php' , 'thinktomorrow.chief'); |
|
70 | + $this->mergeConfigFrom(__DIR__.'/../../config/chief.php', 'thinktomorrow.chief'); |
|
71 | 71 | |
72 | 72 | $this->setupEnvironmentProviders(); |
73 | 73 | |
@@ -83,9 +83,9 @@ discard block |
||
83 | 83 | */ |
84 | 84 | private function setupEnvironmentProviders() |
85 | 85 | { |
86 | - if (!$this->app->environment('production') && $services = config('app.providers-'.app()->environment(),false)) |
|
86 | + if (!$this->app->environment('production') && $services = config('app.providers-'.app()->environment(), false)) |
|
87 | 87 | { |
88 | - foreach($services as $service) |
|
88 | + foreach ($services as $service) |
|
89 | 89 | { |
90 | 90 | $this->app->register($service); |
91 | 91 | } |
@@ -5,9 +5,9 @@ discard block |
||
5 | 5 | * SPIRIT ROUTES |
6 | 6 | * ----------------------------------------------------------------- |
7 | 7 | */ |
8 | -Route::get('spirit/{section?}/{item?}', ['as' => 'spirit.index', 'uses' => function($section = null, $item = null){ |
|
8 | +Route::get('spirit/{section?}/{item?}', ['as' => 'spirit.index', 'uses' => function($section = null, $item = null) { |
|
9 | 9 | |
10 | - if($section && $item && view()->exists('chief::spirit.'.$section.'.'.$item)){ |
|
10 | + if ($section && $item && view()->exists('chief::spirit.'.$section.'.'.$item)) { |
|
11 | 11 | return view('chief::spirit.'.$section.'.'.$item); |
12 | 12 | } |
13 | 13 | |
@@ -39,27 +39,27 @@ discard block |
||
39 | 39 | * ADMIN ROUTES |
40 | 40 | * ----------------------------------------------------------------- |
41 | 41 | */ |
42 | -Route::group(['prefix' => 'admin','middleware' => ['web', 'web-chief', 'auth:chief']],function() |
|
42 | +Route::group(['prefix' => 'admin', 'middleware' => ['web', 'web-chief', 'auth:chief']], function() |
|
43 | 43 | { |
44 | 44 | |
45 | 45 | Route::get('logout', 'Thinktomorrow\Chief\App\Http\Controllers\Auth\LoginController@logout')->name('chief.back.logout'); |
46 | 46 | |
47 | - Route::get('/','Thinktomorrow\Chief\App\Http\Controllers\Back\DashboardController@show')->name('chief.back.dashboard'); |
|
48 | - Route::get('getting-started','Thinktomorrow\Chief\App\Http\Controllers\Back\DashboardController@gettingStarted')->name('chief.back.dashboard.getting-started'); |
|
47 | + Route::get('/', 'Thinktomorrow\Chief\App\Http\Controllers\Back\DashboardController@show')->name('chief.back.dashboard'); |
|
48 | + Route::get('getting-started', 'Thinktomorrow\Chief\App\Http\Controllers\Back\DashboardController@gettingStarted')->name('chief.back.dashboard.getting-started'); |
|
49 | 49 | |
50 | 50 | // Prompt for a (new) password |
51 | - Route::get('password-prompt','Thinktomorrow\Chief\App\Http\Controllers\Auth\ChangePasswordController@edit')->name('chief.back.password.edit'); |
|
52 | - Route::put('password-prompt','Thinktomorrow\Chief\App\Http\Controllers\Auth\ChangePasswordController@update')->name('chief.back.password.update'); |
|
51 | + Route::get('password-prompt', 'Thinktomorrow\Chief\App\Http\Controllers\Auth\ChangePasswordController@edit')->name('chief.back.password.edit'); |
|
52 | + Route::put('password-prompt', 'Thinktomorrow\Chief\App\Http\Controllers\Auth\ChangePasswordController@update')->name('chief.back.password.update'); |
|
53 | 53 | |
54 | 54 | // pages |
55 | - Route::get('pages','Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@index')->name('chief.back.pages.index'); |
|
55 | + Route::get('pages', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@index')->name('chief.back.pages.index'); |
|
56 | 56 | Route::post('pages', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@store')->name('chief.back.pages.store'); |
57 | 57 | Route::get('pages/create', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@create')->name('chief.back.pages.create'); |
58 | 58 | Route::delete('pages/{id}', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@destroy')->name('chief.back.pages.destroy'); |
59 | 59 | Route::put('pages/{id}', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@update')->name('chief.back.pages.update'); |
60 | 60 | Route::get('pages/{id}', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@show')->name('chief.back.pages.show'); |
61 | 61 | Route::get('pages/{id}/edit', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@edit')->name('chief.back.pages.edit'); |
62 | - Route::post('pages/publish','Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@publish')->name('chief.back.pages.publish'); |
|
62 | + Route::post('pages/publish', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@publish')->name('chief.back.pages.publish'); |
|
63 | 63 | |
64 | 64 | Route::get('media', 'Thinktomorrow\Chief\App\Http\Controllers\Back\MediaLibraryController@library')->name('media.library'); |
65 | 65 | Route::get('media-modal', 'Thinktomorrow\Chief\App\Http\Controllers\Back\MediaLibraryController@mediaModal')->name('media.modal'); |
@@ -70,9 +70,9 @@ discard block |
||
70 | 70 | |
71 | 71 | Route::post('page/{id}/upload', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@upload')->name('page.upload'); |
72 | 72 | |
73 | - Route::get('/settings',['as' => 'chief.back.settings.index','uses' => Thinktomorrow\Chief\App\Http\Controllers\Back\System\SettingsController::class.'@show']); |
|
73 | + Route::get('/settings', ['as' => 'chief.back.settings.index', 'uses' => Thinktomorrow\Chief\App\Http\Controllers\Back\System\SettingsController::class.'@show']); |
|
74 | 74 | |
75 | - Route::post('notes/publish',['as' => 'notes.publish','uses' => Thinktomorrow\Chief\App\Http\Controllers\Back\NoteController::class.'@publish']); |
|
75 | + Route::post('notes/publish', ['as' => 'notes.publish', 'uses' => Thinktomorrow\Chief\App\Http\Controllers\Back\NoteController::class.'@publish']); |
|
76 | 76 | Route::resource('notes', Thinktomorrow\Chief\App\Http\Controllers\Back\NoteController::class); |
77 | 77 | |
78 | 78 | // YOUR PROFILE MANAGEMENT |
@@ -94,9 +94,9 @@ discard block |
||
94 | 94 | Route::get('users/{user}/edit', 'Thinktomorrow\Chief\App\Http\Controllers\Back\Users\UserController@edit')->name('chief.back.users.edit'); |
95 | 95 | |
96 | 96 | // INVITE MANAGEMENT |
97 | - Route::post('users/{id}/disable','Thinktomorrow\Chief\App\Http\Controllers\Back\Users\DisableUserController@store')->name('chief.back.users.disable'); |
|
98 | - Route::post('users/{id}/enable','Thinktomorrow\Chief\App\Http\Controllers\Back\Users\EnableUserController@store')->name('chief.back.users.enable'); |
|
99 | - Route::get('users/{id}/resend-invite','Thinktomorrow\Chief\App\Http\Controllers\Back\Users\ResendInviteController@store')->name('chief.back.invites.resend'); |
|
97 | + Route::post('users/{id}/disable', 'Thinktomorrow\Chief\App\Http\Controllers\Back\Users\DisableUserController@store')->name('chief.back.users.disable'); |
|
98 | + Route::post('users/{id}/enable', 'Thinktomorrow\Chief\App\Http\Controllers\Back\Users\EnableUserController@store')->name('chief.back.users.enable'); |
|
99 | + Route::get('users/{id}/resend-invite', 'Thinktomorrow\Chief\App\Http\Controllers\Back\Users\ResendInviteController@store')->name('chief.back.invites.resend'); |
|
100 | 100 | |
101 | 101 | // ROLE MANAGEMENT |
102 | 102 | Route::get('roles', 'Thinktomorrow\Chief\App\Http\Controllers\Back\Authorization\RoleController@index')->name('chief.back.roles.index'); |
@@ -122,15 +122,15 @@ discard block |
||
122 | 122 | * ----------------------------------------------------------------- |
123 | 123 | */ |
124 | 124 | // Developer access |
125 | - Route::get('translations/lines/create',['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.create','uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@create']); |
|
126 | - Route::delete('translations/lines/{id}',['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.destroy','uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@destroy']); |
|
127 | - Route::get('translations/lines/{id}/edit',['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.edit','uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@edit']); |
|
128 | - Route::put('translations/lines/{id}',['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.update','uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@update']); |
|
129 | - Route::post('translations/lines',['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.store','uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@store']); |
|
125 | + Route::get('translations/lines/create', ['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.create', 'uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@create']); |
|
126 | + Route::delete('translations/lines/{id}', ['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.destroy', 'uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@destroy']); |
|
127 | + Route::get('translations/lines/{id}/edit', ['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.edit', 'uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@edit']); |
|
128 | + Route::put('translations/lines/{id}', ['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.update', 'uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@update']); |
|
129 | + Route::post('translations/lines', ['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.store', 'uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@store']); |
|
130 | 130 | |
131 | 131 | // Client access |
132 | - Route::get('translations/{id}/edit',['as' => 'squanto.edit','uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\TranslationController@edit']); |
|
133 | - Route::put('translations/{id}',['as' => 'squanto.update','uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\TranslationController@update']); |
|
134 | - Route::get('translations',['as' => 'squanto.index','uses' => 'Thinktomorrow\Chief\App\Http\Controllers\Back\TranslationController@index']); |
|
132 | + Route::get('translations/{id}/edit', ['as' => 'squanto.edit', 'uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\TranslationController@edit']); |
|
133 | + Route::put('translations/{id}', ['as' => 'squanto.update', 'uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\TranslationController@update']); |
|
134 | + Route::get('translations', ['as' => 'squanto.index', 'uses' => 'Thinktomorrow\Chief\App\Http\Controllers\Back\TranslationController@index']); |
|
135 | 135 | |
136 | 136 | }); |