diff --git a/app/Http/Controllers/Fo/NewsController.php b/app/Http/Controllers/Fo/NewsController.php index 6b30496..11f0adb 100644 --- a/app/Http/Controllers/Fo/NewsController.php +++ b/app/Http/Controllers/Fo/NewsController.php @@ -57,6 +57,10 @@ class NewsController extends Controller // Find the next news from the id. $prevNews = News::query()->where('id', $publishedNews[$prevPositionId])->firstOrFail(); - return view('fo.pages.news.show', \compact('news', 'nextNews', 'prevNews')); + return view('fo.pages.news.show', [ + 'news' => $news, + 'nextNews' => $nextNews, + 'prevNews' => $prevNews, + ]); } } diff --git a/app/Http/Requests/Bo/News/StoreNewsRequest.php b/app/Http/Requests/Bo/News/StoreNewsRequest.php index f8da419..d7d73cb 100644 --- a/app/Http/Requests/Bo/News/StoreNewsRequest.php +++ b/app/Http/Requests/Bo/News/StoreNewsRequest.php @@ -58,7 +58,7 @@ class StoreNewsRequest extends FormRequest ]; return \array_merge( $rules, - $this->pictureRules('picture', 330, 210, 330, 210, true), + $this->pictureRules('picture', 500, 390, 500, 390, true), $this->pictureRules('thumbnail', 300, 200, 300, 200, true), ); } diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 8cdad86..9dc65b1 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -3,6 +3,7 @@ namespace App\Providers; use App\Http\Middleware\VerifyCsrfToken; +use App\Models\News; use App\Models\Strip; use App\Models\User; use Illuminate\Cache\RateLimiting\Limit; @@ -45,6 +46,12 @@ class RouteServiceProvider extends ServiceProvider Route::model('user', User::class); Route::model('strip', Strip::class); + Route::model('news', News::class); + Route::bind('publishedNews', function ($value) { + return News::where(function ($q) use ($value) { + $q->where('id', $value)->orWhere('slug', $value); + })->where('published', true)->firstOrFail(); + }); } /** diff --git a/resources/sass/fo/pages/_news.scss b/resources/sass/fo/pages/_news.scss index acd2e20..1ec1852 100644 --- a/resources/sass/fo/pages/_news.scss +++ b/resources/sass/fo/pages/_news.scss @@ -13,6 +13,10 @@ .rotate-arrow { transform: rotate(180deg); } + + .news-linkedin-logo { + height: 3rem; + } } // LLLLLLLLLLL GGGGGGGGGGGGG diff --git a/resources/views/bo/pages/news/form.blade.php b/resources/views/bo/pages/news/form.blade.php index dc1d027..cade8e8 100644 --- a/resources/views/bo/pages/news/form.blade.php +++ b/resources/views/bo/pages/news/form.blade.php @@ -244,12 +244,12 @@ @include('bo.partials.inputs.varchar-picture', [ 'id' => 'newsPicture', 'name' => 'picture', - 'width' => 330, - 'height' => 210, + 'width' => 500, + 'height' => 390, 'model' => $newsModel ?? null, 'helper' => __('crud.minicrud.dimensions_must_be', [ - 'widthpx' => '330px', - 'heightpx' => '210px', + 'widthpx' => '500px', + 'heightpx' => '390px', ]), 'required' => true, 'preview' => true, @@ -361,7 +361,7 @@ 'id' => 'newsPublishedAt', 'name' => 'publish_at', 'model' => $newsModel ?? null, - 'helper' => __('crud.helpers.publish_at', [ + 'helper' => __('validation.custom.publish_at', [ 'model' => trans_choice('models.classes.news', 1), ]), ]) @@ -374,7 +374,7 @@ 'id' => 'newsUnPublishedAt', 'name' => 'unpublish_at', 'model' => $newsModel ?? null, - 'helper' => __('crud.helpers.unpublish_at', [ + 'helper' => __('validation.custom.unpublish_at', [ 'model' => trans_choice('models.classes.news', 1), ]), ]) diff --git a/resources/views/fo/pages/news/show.blade.php b/resources/views/fo/pages/news/show.blade.php index 9d37448..258ff96 100644 --- a/resources/views/fo/pages/news/show.blade.php +++ b/resources/views/fo/pages/news/show.blade.php @@ -21,11 +21,16 @@