agenda et humeurs

diff --git a/app/Http/Controllers/HumeurController.php b/app/Http/Controllers/HumeurController.php
index bab5c1b9d5d7c88898219377bbd5b98cf315b30a..2dd4d92fdc7e4120f448c744b921ad6e28a0879f 100644 (file)
--- a/app/Http/Controllers/HumeurController.php
+++ b/app/Http/Controllers/HumeurController.php
@@ -8,6 +8,15 @@ use Illuminate\Http\Request;
 
 class HumeurController extends Controller
 {
+
+
+    public function index()
+    {
+        \View::share('humeurs', Humeur::query()->orderByDesc('id')->take(5)->get());
+        return view('en-plus.humeurs.index');
+
+    }
+
     public function show($slug, HumeurRepository $repository)
     {
         /** @var Humeur $article */

diff --git a/app/Models/Humeur.php b/app/Models/Humeur.php
index 32711d0fb621161a4cb6080560daab32eb28be30..e47af4d0e8090af05d70ebcda920db4b12586333 100644 (file)
--- a/app/Models/Humeur.php
+++ b/app/Models/Humeur.php
@@ -30,7 +30,7 @@ class Humeur extends Model
     /**
      * @return string
      */
-    public function getLinkAttribute(): string
+    public function getUrlAttribute(): string
     {
         return route('humeur.show', ['slug' => $this->slug]);
     }

diff --git a/resources/views/components/back.blade.php b/resources/views/components/back.blade.php
index aaa80e6d1ef7c34295810985b92ab04a86cff043..cbc8d594b9cf572d68433900b6430a234b2366e9 100644 (file)
--- a/resources/views/components/back.blade.php
+++ b/resources/views/components/back.blade.php
@@ -1 +1 @@
-<a href="{{url()->previous()}}" class="btn btn-back">❮ Retour</a>
+<a href="{{$back ?? url()->previous()}}" class="btn btn-back">❮ Retour</a>

diff --git a/resources/views/components/simple-preview.blade.php b/resources/views/components/simple-preview.blade.php
index 64a9587fbe239c3437391dc315c501ec87e1b934..f60e2a1de2591934a9dee724a42eae89806cdc1e 100644 (file)
--- a/resources/views/components/simple-preview.blade.php
+++ b/resources/views/components/simple-preview.blade.php
@@ -8,12 +8,16 @@
                 </a>
             </div>
 
+            @if(method_exists($actu, 'image') && !empty($image = $actu->image('image')))
             <div class="col-4">
-                <img src="{{$actu->image('image')}}" alt="" class="w-100">
+                <img src="{{$image}}" alt="" class="w-100">
             </div>
-            <div class="col-8">
+            @endif
+            <div class="{{empty($image) ? 'col-12' : 'col-8'}}">
+                @if($actu->chapo)
                 <p class="chapo ">{{$actu->chapo}}</p>
-                {{ $actu->preview }}
+                @endif
+                {!! $actu->preview ?? $actu->extract !!}
                 <a href="{{$actu->url}}" class="click-here">Lire la suite</a>
 
             </div>

diff --git a/resources/views/en-plus/agenda/show.blade.php b/resources/views/en-plus/agenda/show.blade.php
index 8788d7ee697f39ccbf2b0b2ff0373592832d040b..0bc09c4ecbb44e5b801ccb5889e2a8b9f5e04af1 100644 (file)
--- a/resources/views/en-plus/agenda/show.blade.php
+++ b/resources/views/en-plus/agenda/show.blade.php
@@ -3,6 +3,9 @@
 @section('content')
 
     <div class="container psq-plus">
+
+        @component('components.back', ['back' => route('humeur-agenda.index')])
+        @endcomponent
         <h1>Semaine du {{$agenda->start_date->format('d/m/Y')}} au {{$agenda->end_date->format('d/m/Y')}}</h1>
 
         <div class="row">

diff --git a/resources/views/en-plus/humeurs/index.blade.php b/resources/views/en-plus/humeurs/index.blade.php
new file mode 100644 (file)
index 0000000..7e42354
--- /dev/null
+++ b/resources/views/en-plus/humeurs/index.blade.php
@@ -0,0 +1,19 @@
+@extends('layouts.app')
+
+@section('content')
+
+    <div class="container psq-plus">
+        @component('components.back', ['back' => route('humeur-agenda.index')])
+        @endcomponent
+        <h1>Nos mauvaises humeurs</h1>
+
+        <div class="row mt-5">
+            <div class="col-sm-6 mb-4">
+                @component('components.simple-preview', ['actu' => $humeurs->shift()])
+                @endcomponent
+            </div>
+        </div>
+
+    </div>
+
+@endsection

diff --git a/resources/views/en-plus/humeurs/show.blade.php b/resources/views/en-plus/humeurs/show.blade.php
index 05d85d7f84422c9cd5749d55990cd99a09fe7721..c93d04909ba2e2225fcf1cc65188356930881beb 100644 (file)
--- a/resources/views/en-plus/humeurs/show.blade.php
+++ b/resources/views/en-plus/humeurs/show.blade.php
@@ -3,6 +3,8 @@
 @section('content')
 
     <div class="container psq-plus">
+        @component('components.back', ['back' => route('humeur.index')])
+        @endcomponent
         <h1>Nos mauvaises humeurs</h1>
         <article>
 

diff --git a/resources/views/en-plus/index.blade.php b/resources/views/en-plus/index.blade.php
index d746b9b65ac38e1c8a224e65d3c5bb40b1c81470..f900a46b48b7453c366d0c08a71258c4a925d29f 100644 (file)
--- a/resources/views/en-plus/index.blade.php
+++ b/resources/views/en-plus/index.blade.php
@@ -10,11 +10,11 @@
                 <article class="box p-3 mb-3">
                     <h2>{{$humeur->title}}</h2>
                     <p>{!! $humeur->extract !!}</p>
-                    <a href="{{$humeur->link}}" class="click-here">Lire la suite</a>
+                    <a href="{{$humeur->url}}" class="click-here">Lire la suite</a>
                     <p>Par Olivier Robichon</p>
                     <img src="{{asset('/img/humeurs/olivier.jpg')}}" alt="Photo Olivier Robichon" style="max-width: 100px;">
                 </article>
-                <a href="#" class="click-here text-left">Toutes nos mauvaises humeurs</a>
+                <a href="{{route('humeur.index')}}" class="click-here text-left">Toutes nos mauvaises humeurs</a>
 
 
             </div>
@@ -28,7 +28,7 @@
                 </a>
                 @endif
 
-                <a href="{{route('agenda.show', ['agenda' => $agenda->start_date])}}" class="click-here text-left mt-3">Les Conférences de presse, les Colloques, les Rendez-Vous et les Dates essentielles des acteurs du Médicament et de leurs Partenaires</a>
+                <a href="{{route('agenda.show', ['agenda' => $agenda->id])}}" class="click-here text-left mt-3">Les Conférences de presse, les Colloques, les Rendez-Vous et les Dates essentielles des acteurs du Médicament et de leurs Partenaires</a>
             </div>
         </div>
     </div>

diff --git a/routes/web.php b/routes/web.php
index f5648a333a4beb55e7843ea4d0a3ad348d6a05c4..a30502880a512d818726d3d6c4baf242d02ad167 100644 (file)
--- a/routes/web.php
+++ b/routes/web.php
@@ -83,8 +83,9 @@ Route::domain(env('CLIENT_DOMAIN_NAME'))->group(function() {
     });
 
     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('humeurs', 'HumeurController@index')->name('humeur.index');
+    Route::get('humeurs/{slug}', 'HumeurController@show')->name('humeur.show');
+    Route::get('agendas/{agenda}', 'AgendaController@show')->name('agenda.show');
 
     Route::get('/l/{link:slug}', 'TrackedLinkController@redirect')->name('track');