From: Louis Jeckel Date: Fri, 4 Sep 2020 09:34:57 +0000 (+0200) Subject: humeurs et agenda X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=0a8b0a96e5b4cf1c90399339bff7badf5dcbede9;p=psq.git humeurs et agenda --- diff --git a/.idea/dictionaries/Louis.xml b/.idea/dictionaries/Louis.xml index 24e8316..2dba9ce 100644 --- a/.idea/dictionaries/Louis.xml +++ b/.idea/dictionaries/Louis.xml @@ -1,6 +1,8 @@ + humeur + humeurs mailgun podcast webhook diff --git a/app/Http/Controllers/AgendaController.php b/app/Http/Controllers/AgendaController.php new file mode 100644 index 0000000..c0a5f49 --- /dev/null +++ b/app/Http/Controllers/AgendaController.php @@ -0,0 +1,15 @@ +orderByDesc('id')->firstOrFail()); + \View::share('agenda', WeeklyAgenda::query()->orderByDesc('id')->firstOrFail()); + + return view('en-plus.index'); + } +} diff --git a/app/Http/Controllers/HumeurController.php b/app/Http/Controllers/HumeurController.php new file mode 100644 index 0000000..bab5c1b --- /dev/null +++ b/app/Http/Controllers/HumeurController.php @@ -0,0 +1,21 @@ +forSlug($slug); + abort_if($humeur === null, 404); + + \View::share('humeur', $humeur); + return view('en-plus.humeurs.show'); + + } +} diff --git a/app/Models/Humeur.php b/app/Models/Humeur.php index acb9dc4..32711d0 100644 --- a/app/Models/Humeur.php +++ b/app/Models/Humeur.php @@ -5,6 +5,11 @@ namespace App\Models; use A17\Twill\Models\Behaviors\HasSlug; use A17\Twill\Models\Model; +/** + * Class Humeur + * @package App\Models + * @property string $link + */ class Humeur extends Model { use HasSlug; @@ -21,4 +26,13 @@ class Humeur extends Model 'title', ]; + + /** + * @return string + */ + public function getLinkAttribute(): string + { + return route('humeur.show', ['slug' => $this->slug]); + } + } diff --git a/app/Models/WeeklyAgenda.php b/app/Models/WeeklyAgenda.php index c18a221..0e5da81 100644 --- a/app/Models/WeeklyAgenda.php +++ b/app/Models/WeeklyAgenda.php @@ -5,7 +5,14 @@ namespace App\Models; use A17\Twill\Models\Behaviors\HasBlocks; use A17\Twill\Models\Behaviors\HasMedias; use A17\Twill\Models\Model; - +use Carbon\Carbon; + +/** + * Class WeeklyAgenda + * @package App\Models + * @property Carbon $start_date + * @property-read Carbon $end_date + */ class WeeklyAgenda extends Model { use HasMedias; @@ -15,6 +22,8 @@ class WeeklyAgenda extends Model 'title', ]; + protected $dates = ['start_date']; + protected $appends = ['title']; public $mediasParams = [ @@ -33,6 +42,11 @@ class WeeklyAgenda extends Model return $this->start_date; } + public function getEndDateAttribute(): Carbon + { + return $this->start_date->addWeek(); + } + } diff --git a/public/img/humeurs/olivier.jpg b/public/img/humeurs/olivier.jpg new file mode 100644 index 0000000..040175a Binary files /dev/null and b/public/img/humeurs/olivier.jpg differ diff --git a/resources/views/agenda-humeurs/index.blade.php b/resources/views/agenda-humeurs/index.blade.php deleted file mode 100644 index e69de29..0000000 diff --git a/resources/views/components/nav.blade.php b/resources/views/components/nav.blade.php index 6ed9e68..e09f262 100644 --- a/resources/views/components/nav.blade.php +++ b/resources/views/components/nav.blade.php @@ -13,7 +13,7 @@
- + Pill Icon

Agenda
& Humeur

 diff --git a/resources/views/en-plus/agenda/show.blade.php b/resources/views/en-plus/agenda/show.blade.php new file mode 100644 index 0000000..8788d7e --- /dev/null +++ b/resources/views/en-plus/agenda/show.blade.php @@ -0,0 +1,32 @@ +@extends('layouts.app') +@inject('imageService', \A17\Twill\Services\MediaLibrary\ImageService) +@section('content') + +
+

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

+ +
+ + @foreach($agenda->imageObjects('events') as $event) +
+ @if(!empty($url = $event->getMetadata('url'))) + + @endif + + + @if(!empty($url)) + + @endif + +
+ + + @endforeach + +
+ + + +
+ +@endsection diff --git a/resources/views/en-plus/humeurs/show.blade.php b/resources/views/en-plus/humeurs/show.blade.php new file mode 100644 index 0000000..05d85d7 --- /dev/null +++ b/resources/views/en-plus/humeurs/show.blade.php @@ -0,0 +1,22 @@ +@extends('layouts.app') + +@section('content') + +
+

Nos mauvaises humeurs

+
+ +

{{$humeur->title}}

+
+ {!! $humeur->content !!} + +
+
+ + + + + +
+ +@endsection diff --git a/resources/views/en-plus/index.blade.php b/resources/views/en-plus/index.blade.php new file mode 100644 index 0000000..d746b9b --- /dev/null +++ b/resources/views/en-plus/index.blade.php @@ -0,0 +1,36 @@ +@extends('layouts.app') + +@section('content') + + +
+
+
+

Nos mauvaises humeurs

+
+

{{$humeur->title}}

+

{!! $humeur->extract !!}

+ Lire la suite +

Par Olivier Robichon

+ Photo Olivier Robichon +
+ Toutes nos mauvaises humeurs + + +
+
+

L’AGENDA DES ACTEURS DU MÉDICAMENT

+ @if(!empty($url = $agenda->imageObject('events')->getMetadata('url'))) + + @endif + + @if(!empty($url)) + + @endif + + Les Conférences de presse, les Colloques, les Rendez-Vous et les Dates essentielles des acteurs du Médicament et de leurs Partenaires +
+
+
+ +@endsection diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index fc64aaa..bcb7ca3 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -6,8 +6,6 @@
-

{{($m = $exception->getMessage()) === '' ? __('Not Found') : $m }}

-

Cette page est introuvable... cliquez ici pour retourner sur la page d'accueil

diff --git a/routes/web.php b/routes/web.php index 81eddc9..f5648a3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -82,6 +82,9 @@ Route::domain(env('CLIENT_DOMAIN_NAME'))->group(function() { Route::get('/cover', 'FileController@cover'); }); + Route::get('agenda-et-humeurs', 'EnPlusController@index')->name('humeur-agenda.index'); + Route::get('humeur/{slug}', 'HumeurController@show')->name('humeur.show'); + Route::get('agenda/{agenda:start_date}', 'AgendaController@show')->name('agenda.show'); Route::get('/l/{link:slug}', 'TrackedLinkController@redirect')->name('track');