From 1be084fb31adea3b3a90e6eadadffd7ed7a2ecdd Mon Sep 17 00:00:00 2001 From: Louis Jeckel Date: Wed, 9 Sep 2020 18:19:05 +0200 Subject: [PATCH] add titles --- app/Http/Controllers/ActuLabosController.php | 4 ++++ app/Http/Controllers/AdCampaignController.php | 3 +++ app/Http/Controllers/AgendaController.php | 1 + app/Http/Controllers/EnPlusController.php | 1 + app/Http/Controllers/FileController.php | 2 ++ app/Http/Controllers/HumeurController.php | 2 +- app/Http/Controllers/MagController.php | 1 + app/Http/Controllers/SocialArticleController.php | 1 + app/Models/WeeklyAgenda.php | 6 ++++++ app/View/Components/PillBox.php | 2 +- config/app.php | 2 +- resources/views/en-plus/agenda/show.blade.php | 2 +- resources/views/layouts/app.blade.php | 2 +- 13 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/ActuLabosController.php b/app/Http/Controllers/ActuLabosController.php index 88b8596..c5160e6 100644 --- a/app/Http/Controllers/ActuLabosController.php +++ b/app/Http/Controllers/ActuLabosController.php @@ -10,6 +10,8 @@ class ActuLabosController extends Controller { public function index() { + \View::share('title', "L'actu des Labos"); + \View::share('actus', LaboArticle::query()->orderBy('position')->published()->visible()->take(4)->get()); return view('actu-labos.index'); } @@ -19,7 +21,9 @@ class ActuLabosController extends Controller { $actu = $repository->forSlug($slug); + \View::share('title', $actu->title); \View::share('actu', $actu); + return view('actu-labos.show'); } } diff --git a/app/Http/Controllers/AdCampaignController.php b/app/Http/Controllers/AdCampaignController.php index 44fc8a1..bf9ef83 100644 --- a/app/Http/Controllers/AdCampaignController.php +++ b/app/Http/Controllers/AdCampaignController.php @@ -26,6 +26,8 @@ class AdCampaignController extends Controller ->published() ->visible() ->get(); + + \View::share('title', "Marketing & Com : Les Campagnes de la Semaine"); \View::share('campaigns', $campaigns); return view('com-campaigns.index'); } @@ -35,6 +37,7 @@ class AdCampaignController extends Controller { $campaign = $repository->forSlug($slug); \View::share('campaign', $campaign); + \View::share('title', $campaign->title); return view('com-campaigns.show'); diff --git a/app/Http/Controllers/AgendaController.php b/app/Http/Controllers/AgendaController.php index c0a5f49..f56b6e8 100644 --- a/app/Http/Controllers/AgendaController.php +++ b/app/Http/Controllers/AgendaController.php @@ -10,6 +10,7 @@ class AgendaController extends Controller public function show(WeeklyAgenda $agenda) { \View::share('agenda', $agenda); + \View::share('title', $agenda->getFullTitle()); return view('en-plus.agenda.show'); } } diff --git a/app/Http/Controllers/EnPlusController.php b/app/Http/Controllers/EnPlusController.php index 2199e6a..4e3136c 100644 --- a/app/Http/Controllers/EnPlusController.php +++ b/app/Http/Controllers/EnPlusController.php @@ -13,6 +13,7 @@ class EnPlusController extends Controller { \View::share('humeur', Humeur::query()->orderByDesc('id')->firstOrFail()); \View::share('agenda', WeeklyAgenda::query()->orderByDesc('id')->firstOrFail()); + \View::share('title', "Agenda et Humeur"); return view('en-plus.index'); } diff --git a/app/Http/Controllers/FileController.php b/app/Http/Controllers/FileController.php index 7fb41eb..9cecba2 100644 --- a/app/Http/Controllers/FileController.php +++ b/app/Http/Controllers/FileController.php @@ -30,6 +30,8 @@ class FileController extends Controller public function show(PdfFile $file) { \View::share('file', $file); + \View::share('title', $file->title); + return view('file.show'); } diff --git a/app/Http/Controllers/HumeurController.php b/app/Http/Controllers/HumeurController.php index 2dd4d92..ee1c9ea 100644 --- a/app/Http/Controllers/HumeurController.php +++ b/app/Http/Controllers/HumeurController.php @@ -22,7 +22,7 @@ class HumeurController extends Controller /** @var Humeur $article */ $humeur = $repository->forSlug($slug); abort_if($humeur === null, 404); - + \View::share('title', $humeur->title); \View::share('humeur', $humeur); return view('en-plus.humeurs.show'); diff --git a/app/Http/Controllers/MagController.php b/app/Http/Controllers/MagController.php index 6169564..63653a9 100644 --- a/app/Http/Controllers/MagController.php +++ b/app/Http/Controllers/MagController.php @@ -8,6 +8,7 @@ class MagController extends Controller { public function index() { + \View::share('title', 'Le Mag'); return view('mag.index'); } } diff --git a/app/Http/Controllers/SocialArticleController.php b/app/Http/Controllers/SocialArticleController.php index 3827455..75bfdd3 100644 --- a/app/Http/Controllers/SocialArticleController.php +++ b/app/Http/Controllers/SocialArticleController.php @@ -21,6 +21,7 @@ class SocialArticleController extends Controller $article->addView(); \View::share('article', $article); + \View::share('title', $article->title); return view('social-articles.show'); } diff --git a/app/Models/WeeklyAgenda.php b/app/Models/WeeklyAgenda.php index dcd1cec..97d5320 100644 --- a/app/Models/WeeklyAgenda.php +++ b/app/Models/WeeklyAgenda.php @@ -42,6 +42,12 @@ class WeeklyAgenda extends Model { return $this->startDateCarbon()->format('d/m/Y'); } + + public function getFullTitle() + { + return "Semaine du {$this->startDateCarbon()->format('d/m/Y')} au {$this->endDateCarbon()->format('d/m/Y')}"; + } + public function getUrlAttribute() { return route('agenda.show', ['agenda' => $this->id]); diff --git a/app/View/Components/PillBox.php b/app/View/Components/PillBox.php index fc6a1a9..5d7fbb6 100644 --- a/app/View/Components/PillBox.php +++ b/app/View/Components/PillBox.php @@ -23,7 +23,7 @@ class PillBox extends Component * @param string $link * @param string $content */ - public function __construct(?string $slug, $object = null, $title = '', $link = '#', $content = '') + public function __construct($slug = null, $object = null, $title = '', $link = '#', $content = null) { /** @var PillBoxSpaceRepository $repository */ $repository = resolve(PillBoxSpaceRepository::class); diff --git a/config/app.php b/config/app.php index 65c2b35..64c5f76 100644 --- a/config/app.php +++ b/config/app.php @@ -13,7 +13,7 @@ return [ | */ - 'name' => env('APP_NAME', 'Laravel'), + 'name' => "Prescription Santé - Le Quotidien", /* |-------------------------------------------------------------------------- diff --git a/resources/views/en-plus/agenda/show.blade.php b/resources/views/en-plus/agenda/show.blade.php index 27a76f4..a60f1a7 100644 --- a/resources/views/en-plus/agenda/show.blade.php +++ b/resources/views/en-plus/agenda/show.blade.php @@ -6,7 +6,7 @@ @component('components.back', ['back' => route('humeur-agenda.index')]) @endcomponent -

Semaine du {{$agenda->startDateCarbon()->format('d/m/Y')}} au {{$agenda->endDateCarbon()->format('d/m/Y')}}

+

{{$agenda->getFullTitle()}}

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index b2d2bc3..1538f92 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -7,7 +7,7 @@ - {{ config('app.name', 'Laravel') }} + {{isset($title) ? "$title | " : ""}}{{ config('app.name', 'Laravel') }} -- 2.39.5