@@ -19,7 +19,7 @@ |
||
| 19 | 19 | /* |
| 20 | 20 | * Authenticate the user's personal channel... |
| 21 | 21 | */ |
| 22 | - Broadcast::channel('App.User.*', function ($user, $userId) { |
|
| 22 | + Broadcast::channel('App.User.*', function($user, $userId) { |
|
| 23 | 23 | return (int) $user->id === (int) $userId; |
| 24 | 24 | }); |
| 25 | 25 | } |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | * Get the response for a successful password reset. |
| 61 | 61 | * |
| 62 | 62 | * @param string $response |
| 63 | - * @return \Illuminate\Http\Response |
|
| 63 | + * @return \Illuminate\Http\RedirectResponse |
|
| 64 | 64 | */ |
| 65 | 65 | protected function sendResetResponse($response) |
| 66 | 66 | { |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | * Get the response for a successful password reset. |
| 61 | 61 | * |
| 62 | 62 | * @param string $response |
| 63 | - * @return \Illuminate\Http\Response |
|
| 63 | + * @return \Illuminate\Http\RedirectResponse |
|
| 64 | 64 | */ |
| 65 | 65 | protected function sendResetResponse($response) |
| 66 | 66 | { |
@@ -245,11 +245,11 @@ discard block |
||
| 245 | 245 | |
| 246 | 246 | public function seo(): string |
| 247 | 247 | { |
| 248 | - return locales()->map(function ($locale) { |
|
| 248 | + return locales()->map(function($locale) { |
|
| 249 | 249 | |
| 250 | 250 | return collect($this->model->defaultSeoValues()) |
| 251 | 251 | ->keys() |
| 252 | - ->map(function ($attribute) use ($locale) { |
|
| 252 | + ->map(function($attribute) use ($locale) { |
|
| 253 | 253 | |
| 254 | 254 | $fieldName = translate_field_name("seo.{$attribute}", $locale); |
| 255 | 255 | |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | ), |
| 262 | 262 | ]); |
| 263 | 263 | }) |
| 264 | - ->pipe(function (Collection $fields) use ($locale) { |
|
| 264 | + ->pipe(function(Collection $fields) use ($locale) { |
|
| 265 | 265 | return $this->languageFieldSet($locale, $fields->toArray()); |
| 266 | 266 | }); |
| 267 | 267 | })->implode(''); |
@@ -13,12 +13,12 @@ |
||
| 13 | 13 | { |
| 14 | 14 | public function subscribe(Dispatcher $events) |
| 15 | 15 | { |
| 16 | - $events->listen(UserRegistered::class, function (UserRegistered $event) { |
|
| 16 | + $events->listen(UserRegistered::class, function(UserRegistered $event) { |
|
| 17 | 17 | Mail::send(new Welcome($event->user)); |
| 18 | 18 | }); |
| 19 | 19 | |
| 20 | - $events->listen(UserCreatedThroughBack::class, function (UserCreatedThroughBack $event) { |
|
| 21 | - Password::broker('front')->sendResetLink(['email' => $event->user->email], function (Message $message) { |
|
| 20 | + $events->listen(UserCreatedThroughBack::class, function(UserCreatedThroughBack $event) { |
|
| 21 | + Password::broker('front')->sendResetLink(['email' => $event->user->email], function(Message $message) { |
|
| 22 | 22 | $message->subject('Welkom bij '.config('app.url')); |
| 23 | 23 | }); |
| 24 | 24 | }); |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | { |
| 26 | 26 | $parentMenuItems = app(ArticleRepository::class) |
| 27 | 27 | ->getTopLevel() |
| 28 | - ->filter(function (Article $article) { |
|
| 28 | + ->filter(function(Article $article) { |
|
| 29 | 29 | return $article->technical_name != SpecialArticle::HOME; |
| 30 | 30 | }) |
| 31 | 31 | ->pluck('name', 'id') |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | protected function registerMacros(Router $router) |
| 27 | 27 | { |
| 28 | - $router->macro('module', function ($module, $sortable = false) use ($router) { |
|
| 28 | + $router->macro('module', function($module, $sortable = false) use ($router) { |
|
| 29 | 29 | $controller = ucfirst($module).'Controller'; |
| 30 | 30 | if ($sortable) { |
| 31 | 31 | $router->patch("{$module}/changeOrder", $controller.'@changeOrder'); |
@@ -34,15 +34,15 @@ discard block |
||
| 34 | 34 | $router->resource($module, $controller); |
| 35 | 35 | }); |
| 36 | 36 | |
| 37 | - $router->macro('articleList', function ($technicalNamePrefix, $action) use ($router) { |
|
| 37 | + $router->macro('articleList', function($technicalNamePrefix, $action) use ($router) { |
|
| 38 | 38 | |
| 39 | 39 | $articles = Article::getWithTechnicalNameLike($technicalNamePrefix); |
| 40 | 40 | |
| 41 | - $router->get(app()->getLocale().'/'.fragment_slug("navigation.{$technicalNamePrefix}"), function () use ($articles) { |
|
| 41 | + $router->get(app()->getLocale().'/'.fragment_slug("navigation.{$technicalNamePrefix}"), function() use ($articles) { |
|
| 42 | 42 | return redirect(route("{$articles->first()->technical_name}")); |
| 43 | 43 | })->name($technicalNamePrefix); |
| 44 | 44 | |
| 45 | - $articles->map(function ($article) use ($technicalNamePrefix, $action, $router) { |
|
| 45 | + $articles->map(function($article) use ($technicalNamePrefix, $action, $router) { |
|
| 46 | 46 | $router->get(app()->getLocale().'/'.fragment_slug("navigation.{$technicalNamePrefix}").'/'.$article->url, $action)->name("{$article->technical_name}"); |
| 47 | 47 | }); |
| 48 | 48 | }); |
@@ -52,16 +52,16 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | public function map(Router $router) |
| 54 | 54 | { |
| 55 | - Route::group(['namespace' => $this->namespace], function () { |
|
| 55 | + Route::group(['namespace' => $this->namespace], function() { |
|
| 56 | 56 | |
| 57 | 57 | /* |
| 58 | 58 | * Special routes |
| 59 | 59 | */ |
| 60 | - Route::group(['middleware' => 'web'], function () { |
|
| 60 | + Route::group(['middleware' => 'web'], function() { |
|
| 61 | 61 | |
| 62 | 62 | Route::demoAccess('/demo'); |
| 63 | 63 | |
| 64 | - Route::get('coming-soon', function () { |
|
| 64 | + Route::get('coming-soon', function() { |
|
| 65 | 65 | return view('temp/index'); |
| 66 | 66 | }); |
| 67 | 67 | }); |
@@ -69,10 +69,10 @@ discard block |
||
| 69 | 69 | /* |
| 70 | 70 | * Back site |
| 71 | 71 | */ |
| 72 | - Route::group(['namespace' => 'Back', 'middleware' => 'web', 'prefix' => 'blender'], function () { |
|
| 72 | + Route::group(['namespace' => 'Back', 'middleware' => 'web', 'prefix' => 'blender'], function() { |
|
| 73 | 73 | Auth::routes(); |
| 74 | 74 | |
| 75 | - Route::group(['middleware' => 'auth'], function () { |
|
| 75 | + Route::group(['middleware' => 'auth'], function() { |
|
| 76 | 76 | require base_path('routes/back.php'); |
| 77 | 77 | }); |
| 78 | 78 | }); |
@@ -81,16 +81,16 @@ discard block |
||
| 81 | 81 | * Frontsite |
| 82 | 82 | */ |
| 83 | 83 | |
| 84 | - Route::group(['namespace' => 'Front'], function () { |
|
| 85 | - Route::group(['namespace' => 'Api', 'middleware' => 'api', 'prefix' => 'api'], function () { |
|
| 84 | + Route::group(['namespace' => 'Front'], function() { |
|
| 85 | + Route::group(['namespace' => 'Api', 'middleware' => 'api', 'prefix' => 'api'], function() { |
|
| 86 | 86 | require base_path('routes/frontApi.php'); |
| 87 | 87 | }); |
| 88 | 88 | |
| 89 | - Route::group(['middleware' => ['web', 'demoMode', 'rememberLocale']], function () { |
|
| 89 | + Route::group(['middleware' => ['web', 'demoMode', 'rememberLocale']], function() { |
|
| 90 | 90 | |
| 91 | 91 | $multiLingual = count(config('app.locales')) > 1; |
| 92 | 92 | |
| 93 | - Route::group($multiLingual ? ['prefix' => locale()] : [], function () { |
|
| 93 | + Route::group($multiLingual ? ['prefix' => locale()] : [], function() { |
|
| 94 | 94 | try { |
| 95 | 95 | Auth::routes(); |
| 96 | 96 | require base_path('routes/front.php'); |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | }); |
| 101 | 101 | |
| 102 | 102 | if ($multiLingual) { |
| 103 | - Route::get('/', function () { |
|
| 103 | + Route::get('/', function() { |
|
| 104 | 104 | return redirect(locale()); |
| 105 | 105 | }); |
| 106 | 106 | } |
@@ -10,26 +10,26 @@ discard block |
||
| 10 | 10 | { |
| 11 | 11 | public function register() |
| 12 | 12 | { |
| 13 | - Menu::macro('back', function () { |
|
| 13 | + Menu::macro('back', function() { |
|
| 14 | 14 | return Menu::new() |
| 15 | 15 | ->setActiveClass('-active') |
| 16 | 16 | ->setActiveFromRequest('/blender'); |
| 17 | 17 | }); |
| 18 | 18 | |
| 19 | - Menu::macro('moduleGroup', function ($title) { |
|
| 19 | + Menu::macro('moduleGroup', function($title) { |
|
| 20 | 20 | return Menu::back() |
| 21 | 21 | ->addParentClass('menu__group') |
| 22 | 22 | ->setParentAttribute('data-menu-group', fragment("back.nav.{$title}")) |
| 23 | - ->registerFilter(function (Link $link) { |
|
| 23 | + ->registerFilter(function(Link $link) { |
|
| 24 | 24 | $link->addParentClass('menu__group__item'); |
| 25 | 25 | }); |
| 26 | 26 | }); |
| 27 | 27 | |
| 28 | - Menu::macro('module', function (string $action, string $name) { |
|
| 28 | + Menu::macro('module', function(string $action, string $name) { |
|
| 29 | 29 | return $this->action("Back\\{$action}", fragment("back.{$name}")); |
| 30 | 30 | }); |
| 31 | 31 | |
| 32 | - Menu::macro('backMain', function () { |
|
| 32 | + Menu::macro('backMain', function() { |
|
| 33 | 33 | return Menu::back() |
| 34 | 34 | ->addClass('menu__groups') |
| 35 | 35 | ->setAttribute('data-menu-groups') |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | ->module('StatisticsController@index', 'statistics.menuTitle')); |
| 51 | 51 | }); |
| 52 | 52 | |
| 53 | - Menu::macro('backUser', function () { |
|
| 53 | + Menu::macro('backUser', function() { |
|
| 54 | 54 | |
| 55 | 55 | $avatar = Html::avatar(current_user(), '-small'). |
| 56 | 56 | el('span.:response-desktop-only', current_user()->email); |
@@ -60,9 +60,9 @@ discard block |
||
| 60 | 60 | ->html(view('back.auth._partials.logoutForm')); |
| 61 | 61 | }); |
| 62 | 62 | |
| 63 | - Menu::macro('breadcrumbs', function (array $breadcrumbs) { |
|
| 64 | - return Menu::build($breadcrumbs, function (Menu $menu, $actionWithParameters, $label) { |
|
| 65 | - if (! is_array($actionWithParameters)) { |
|
| 63 | + Menu::macro('breadcrumbs', function(array $breadcrumbs) { |
|
| 64 | + return Menu::build($breadcrumbs, function(Menu $menu, $actionWithParameters, $label) { |
|
| 65 | + if (!is_array($actionWithParameters)) { |
|
| 66 | 66 | $actionWithParameters = [$actionWithParameters]; |
| 67 | 67 | } |
| 68 | 68 | |
@@ -36,11 +36,11 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | protected function registerFragmentBreadcrumbs() |
| 38 | 38 | { |
| 39 | - BreadCrumbsManager::register('fragmentsBack', function ($breadcrumbs) { |
|
| 39 | + BreadCrumbsManager::register('fragmentsBack', function($breadcrumbs) { |
|
| 40 | 40 | $breadcrumbs->push(fragment('back.fragments.title'), action('Back\FragmentsController@index')); |
| 41 | 41 | }); |
| 42 | 42 | |
| 43 | - BreadCrumbsManager::register('fragmentsDetailBack', function ($breadcrumbs, $string) { |
|
| 43 | + BreadCrumbsManager::register('fragmentsDetailBack', function($breadcrumbs, $string) { |
|
| 44 | 44 | $breadcrumbs->parent('fragmentsBack'); |
| 45 | 45 | $breadcrumbs->push($string->name, action('Back\FragmentsController@edit', $string->id)); |
| 46 | 46 | }); |
@@ -48,30 +48,30 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | protected function registerUserBreadcrumbs() |
| 50 | 50 | { |
| 51 | - BreadCrumbsManager::register('administratorsListBack', function ($breadcrumbs) { |
|
| 51 | + BreadCrumbsManager::register('administratorsListBack', function($breadcrumbs) { |
|
| 52 | 52 | $breadcrumbs->push(fragment('back.administrators.title'), action('Back\AdministratorsController@index')); |
| 53 | 53 | }); |
| 54 | 54 | |
| 55 | - BreadCrumbsManager::register('administratorsCreateBack', function ($breadcrumbs) { |
|
| 55 | + BreadCrumbsManager::register('administratorsCreateBack', function($breadcrumbs) { |
|
| 56 | 56 | $breadcrumbs->parent('administratorsListBack'); |
| 57 | 57 | $breadcrumbs->push(fragment('back.administrators.new'), action('Back\AdministratorsController@create')); |
| 58 | 58 | }); |
| 59 | 59 | |
| 60 | - BreadCrumbsManager::register('administratorsEditBack', function ($breadcrumbs, $user) { |
|
| 60 | + BreadCrumbsManager::register('administratorsEditBack', function($breadcrumbs, $user) { |
|
| 61 | 61 | $breadcrumbs->parent('administratorsListBack', $user); |
| 62 | 62 | $breadcrumbs->push($user->name, action('Back\AdministratorsController@edit', $user->id)); |
| 63 | 63 | }); |
| 64 | 64 | |
| 65 | - BreadCrumbsManager::register('membersListBack', function ($breadcrumbs) { |
|
| 65 | + BreadCrumbsManager::register('membersListBack', function($breadcrumbs) { |
|
| 66 | 66 | $breadcrumbs->push(fragment('back.members.title'), action('Back\MembersController@index')); |
| 67 | 67 | }); |
| 68 | 68 | |
| 69 | - BreadCrumbsManager::register('membersNewBack', function ($breadcrumbs) { |
|
| 69 | + BreadCrumbsManager::register('membersNewBack', function($breadcrumbs) { |
|
| 70 | 70 | $breadcrumbs->parent('membersListBack'); |
| 71 | 71 | $breadcrumbs->push(fragment('back.members.new'), action('Back\MembersController@create')); |
| 72 | 72 | }); |
| 73 | 73 | |
| 74 | - BreadCrumbsManager::register('membersEditBack', function ($breadcrumbs, $user) { |
|
| 74 | + BreadCrumbsManager::register('membersEditBack', function($breadcrumbs, $user) { |
|
| 75 | 75 | $breadcrumbs->parent('membersListBack', $user); |
| 76 | 76 | $breadcrumbs->push($user->name, action('Back\MembersController@edit', $user->id)); |
| 77 | 77 | }); |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | BreadCrumbsManager::register( |
| 85 | 85 | "{$name}ListBack", |
| 86 | - function ($breadcrumbs) use ($name, $controller) { |
|
| 86 | + function($breadcrumbs) use ($name, $controller) { |
|
| 87 | 87 | $breadcrumbs->push( |
| 88 | 88 | fragment("back.{$name}.title"), |
| 89 | 89 | action("{$controller}@index") |
@@ -93,12 +93,11 @@ discard block |
||
| 93 | 93 | |
| 94 | 94 | BreadCrumbsManager::register( |
| 95 | 95 | "{$name}Back", |
| 96 | - function ($breadcrumbs, $model) use ($name, $controller) { |
|
| 96 | + function($breadcrumbs, $model) use ($name, $controller) { |
|
| 97 | 97 | $breadcrumbs->parent("{$name}ListBack"); |
| 98 | 98 | |
| 99 | 99 | $breadcrumbs->push( |
| 100 | - $model->isDraft() ? fragment("back.{$name}.new") : |
|
| 101 | - (isset($model->name) ? $model->name : ucfirst(fragment('back.change'))), |
|
| 100 | + $model->isDraft() ? fragment("back.{$name}.new") : (isset($model->name) ? $model->name : ucfirst(fragment('back.change'))), |
|
| 102 | 101 | action("{$controller}@index") |
| 103 | 102 | ); |
| 104 | 103 | } |