podcasts coups de cour com v2

diff --git a/app/Http/Controllers/PodcastController.php b/app/Http/Controllers/PodcastController.php
index 7291ce1369a42264046ee4992bb5dc712b72039c..e90d776bf6fe3b4879acd4b2936d85eaee70f68a 100644 (file)
--- a/app/Http/Controllers/PodcastController.php
+++ b/app/Http/Controllers/PodcastController.php
@@ -12,6 +12,6 @@ class PodcastController extends Controller
     public function index()
     {
         \View::share('podcast', Podcast::published()->visible()->orderByDesc('id')->first());
-        return view('podcasts.index');
+        return view('podcasts.show');
     }
 }

diff --git a/app/Models/Podcast.php b/app/Models/Podcast.php
index 7f67dc290e3ce8bc441163ae6a950aecdead6f5a..163e3608e22472322e038028a5660f1f5d1df31d 100644 (file)
--- a/app/Models/Podcast.php
+++ b/app/Models/Podcast.php
@@ -12,7 +12,7 @@ use Illuminate\Support\Facades\Storage;
 
 class Podcast extends Model
 {
-    use HasSlug, HasMedias, HasFiles;
+    use HasSlug, HasMedias, HasFiles, HasBlocks;
 
     protected $fillable = [
         'published',
@@ -20,7 +20,14 @@ class Podcast extends Model
         'description',
         'sponsor',
         'sponsor_url',
-        'publish_start_date'
+        'publish_start_date',
+        'coup_de_coeur_text',
+        'coup_de_coeur_link',
+        'coup_de_com_text',
+        'coup_de_com_link',
+        'journal_com_text',
+        'journal_com_link',
+
     ];
 
 
@@ -37,6 +44,30 @@ class Podcast extends Model
                 ],
             ],
         ],
+        'coup_de_coeur_img' => [
+            'logo' => [
+                [
+                    'name' => 'logo',
+                    'ratio' => 0,
+                ],
+            ],
+        ],
+        'coup_de_com_img' => [
+            'logo' => [
+                [
+                    'name' => 'logo',
+                    'ratio' => 0,
+                ],
+            ],
+        ],
+        'journal_com_img' => [
+            'logo' => [
+                [
+                    'name' => 'logo',
+                    'ratio' => 0,
+                ],
+            ],
+        ],
     ];
 
     public $fileParams = [

diff --git a/config/twill-navigation.php b/config/twill-navigation.php
index a39fee17f836b95638c9d9fae916be7031cfdf2c..dce7278aa4d4745a28e8d2138c03d505b81ee694 100644 (file)
--- a/config/twill-navigation.php
+++ b/config/twill-navigation.php
@@ -70,20 +70,15 @@ return [
                 'params' => ['section' => 'strings'],
 
             ],
-            'podcasts' => [
-                'title' => 'Podcasts',
-                'route' => 'admin.settings',
-                'params' => ['section' => 'podcasts'],
-            ],
             'pillBoxSpaces' => [
                     'title' => 'Emplacement encadrés',
                     'module' => true
              ]
         ]
     ],
-    'other_content' => [
+    'other-content.socialArticles' => [
         'title' => 'Autre contenu',
-        'route' => 'admin.other-content.socialArticles.index',
+        'module' => true,
         'primary_navigation' => [
             'socialArticles' => [
                 'title' => 'Articles réseaux sociaux',

diff --git a/database/migrations/2020_08_15_083028_change_podcasts_table.php b/database/migrations/2020_08_15_083028_change_podcasts_table.php
new file mode 100644 (file)
index 0000000..fc06d22
--- /dev/null
+++ b/database/migrations/2020_08_15_083028_change_podcasts_table.php
@@ -0,0 +1,45 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangePodcastsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('podcasts', function (Blueprint $table) {
+            $table->text('coup_de_coeur_text');
+            $table->string('coup_de_coeur_link')->nullable();
+            $table->text('coup_de_com_text');
+            $table->string('coup_de_com_link')->nullable();
+            $table->text('journal_com_text');
+            $table->string('journal_com_link')->nullable();
+
+
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('podcasts', function (Blueprint $table) {
+            $table->dropColumn('coup_de_coeur_text');
+            $table->dropColumn('coup_de_coeur_link');
+            $table->dropColumn('coup_de_com_text');
+            $table->dropColumn('coup_de_com_link');
+            $table->dropColumn('journal_com_text');
+            $table->dropColumn('journal_com_link');
+        });
+    }
+}

diff --git a/public/css/app.css b/public/css/app.css
index 9b1186aa2824d465c6ca492aadf9e7f82f556cc6..f9179c4a683ab80d89ab756784cc255c53a7acfd 100644 (file)
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -11573,7 +11573,6 @@ article .content {
   max-width: 800px;
   font-size: larger;
   margin: auto;
-  text-align: justify;
 }
 
 article img.top-img {

diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index a2e18062a85395e0e185c4297ea2414c524461f8..b0afce1006c40ccf80cd392ac8a22f980ae16603 100644 (file)
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -114,7 +114,6 @@ article {
         max-width: 800px;
         font-size: larger;
         margin: auto;
-        text-align: justify;
     }
 
     img.top-img {

diff --git a/resources/views/admin/blocks/image.blade.php b/resources/views/admin/blocks/image.blade.php
index f5d5336f08f0b182b24ec935ffd063f1120f8806..37df23dd7d6c4394d7e879a1bd9309578752daf7 100644 (file)
--- a/resources/views/admin/blocks/image.blade.php
+++ b/resources/views/admin/blocks/image.blade.php
@@ -6,3 +6,8 @@
     'translated' => false,
 ])
 
+@formField('input', [
+    'name' => 'link',
+    'label' => 'Lien (facultatif)',
+    'hint' => 'https://',
+])

diff --git a/resources/views/admin/podcasts/form.blade.php b/resources/views/admin/podcasts/form.blade.php
index d09e6c071da90a11f1d61515d88c0abb5e1ffbb6..82f624c40fc77c17ade55b9b504e4d0ca77b6a07 100644 (file)
--- a/resources/views/admin/podcasts/form.blade.php
+++ b/resources/views/admin/podcasts/form.blade.php
@@ -8,6 +8,11 @@
             'fieldset' => 'sponsor',
             'label' => 'Partenaire',
         ],
+        [
+            'fieldset' => 'segments',
+            'label' => 'Segments',
+
+        ],
         [
             'fieldset' => 'file',
             'label' => 'Fichier',
@@ -54,6 +59,67 @@
 
 
     @endcomponent
+    @component('twill::partials.form.utils._fieldset', ['id' => 'segments', 'title' => 'Coups de coeur et com'])
+
+        @formField('wysiwyg', [
+            'label' => 'Le coup de coeur',
+            'name' => 'coup_de_coeur_text',
+            'maxlength' => 250,
+            'required' => true,
+        ])
+        @formField('input', [
+            'label' => 'Lien le coup de coeur',
+            'name' => 'coup_de_coeur_link',
+            'maxlength' => 250,
+        ])
+
+        @formField('medias', [
+            'name' => 'coup_de_coeur_img',
+            'label' => 'Logo coup de coeur',
+            'max' => 1,
+
+        ])
+
+        @formField('wysiwyg', [
+            'label' => 'Le coup de com',
+            'name' => 'coup_de_com_text',
+            'maxlength' => 250,
+            'required' => true,
+        ])
+        @formField('input', [
+            'label' => 'Lien le coup de com',
+            'name' => 'coup_de_com_link',
+            'maxlength' => 250,
+        ])
+
+        @formField('medias', [
+            'name' => 'coup_de_com_img',
+            'label' => 'Logo coup de com',
+            'max' => 1,
+
+        ])
+        @formField('wysiwyg', [
+            'label' => 'Le journal de la com santé',
+            'name' => 'journal_com_text',
+            'maxlength' => 450,
+            'required' => true,
+        ])
+        @formField('input', [
+            'label' => 'Lien le journal de la com santé',
+            'name' => 'journal_com_link',
+            'maxlength' => 250,
+        ])
+
+        @formField('medias', [
+            'name' => 'journal_com_img',
+            'label' => 'Image journal de la com santé',
+            'max' => 1,
+
+        ])
+
+
+    @endcomponent
+
 
     @component('twill::partials.form.utils._fieldset', ['id' => 'file', 'title' => 'Fichier audio'])
         @formField('files', [

diff --git a/resources/views/admin/settings/podcasts.blade.php b/resources/views/admin/settings/podcasts.blade.php
deleted file mode 100644 (file)
index 6d7c16d..0000000
--- a/resources/views/admin/settings/podcasts.blade.php
+++ /dev/null
@@ -1,64 +0,0 @@
-@extends('twill::layouts.settings', ['contentFieldsetLabel' => 'Modification de la page podcatss'])
-
-@section('contentFields')
-    @formField('wysiwyg', [
-        'label' => 'Le coup de coeur',
-        'name' => 'coup_de_coeur_text',
-        'maxlength' => 250,
-        'required' => true,
-    ])
-    @formField('input', [
-        'label' => 'Lien le coup de coeur',
-        'name' => 'coup_de_coeur_link',
-        'maxlength' => 250,
-    ])
-
-    @formField('medias', [
-        'name' => 'coup_de_coeur_img',
-        'label' => 'Logo coup de coeur',
-        'max' => 1,
-
-    ])
-
-
-
-    @formField('wysiwyg', [
-        'label' => 'Le coup de com',
-        'name' => 'coup_de_com_text',
-        'maxlength' => 250,
-        'required' => true,
-    ])
-    @formField('input', [
-        'label' => 'Lien le coup de com',
-        'name' => 'coup_de_com_link',
-        'maxlength' => 250,
-    ])
-
-    @formField('medias', [
-        'name' => 'coup_de_com_img',
-        'label' => 'Logo coup de com',
-        'max' => 1,
-
-    ])
-    @formField('wysiwyg', [
-        'label' => 'Le journal de la com santé',
-        'name' => 'journal_com_text',
-        'maxlength' => 450,
-        'required' => true,
-    ])
-    @formField('input', [
-        'label' => 'Lien le journal de la com santé',
-        'name' => 'journal_com_link',
-        'maxlength' => 250,
-    ])
-
-    @formField('medias', [
-        'name' => 'journal_com_img',
-        'label' => 'Image journal de la com santé',
-        'max' => 1,
-
-    ])
-
-
-
-@stop

diff --git a/resources/views/podcasts/index.blade.php b/resources/views/podcasts/index.blade.php
deleted file mode 100644 (file)
index ca2768a..0000000
--- a/resources/views/podcasts/index.blade.php
+++ /dev/null
@@ -1,138 +0,0 @@
-@extends('layouts.app')
-@inject('settings', App\Repositories\SettingRepository)
-
-@section('content')
-<div class="container psq-podcasts">
-    <h1>LA SEULE ÉMISSION « ON AIR » DÉDIÉE À LA COMMUNICATION DES ACTEURS DE LA SANTÉ</h1>
-
-
-    <div class="row mt-5">
-
-
-{{--        Static Mic Logo --}}
-        <div class="col-sm-3 mb-3">
-            <img src="{{asset('img/podcasts/microphone-temporary.png')}}" alt="Image microhpone" class="w-100">
-            <a target="_blank" href="#" class="click-here">Cliquez ici pour écouter l'émission</a>
-        </div>
-
-
-{{--        Description + weekly sponsor --}}
-        <div class="col-sm-5 mb-3 px-2">
-            <div class="box p-3">
-                <div class="text-justify mb-2">
-                    {!! $podcast->description !!}
-                    <hr>
-                </div>
-                <div class="row align-items-center">
-                    <div class="col-sm-6 text-center">
-                        <h2>Une émission en partenariat avec {{ $podcast->sponsor }}</h2>
-                    </div>
-                    <div class="col-sm-6">
-                        <a target="_blank" href="{{$podcast->sponsor_url}}">
-                            <img src="{{$podcast->image('sponsor_logo', 'logo')}}" alt="Logo partenaire" class="w-100">
-                        </a>
-                        <p class="small-text">Cliquez sur le logo pour accéder au site de notre partenaire</p>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-
-{{--        Guests --}}
-        <div class="col-sm-4 mb-3">
-                <h2 class="text-center">Nos « débatteurs »</h2>
-            <div class="row">
-                @foreach($podcast->guests as $guest)
-                    <div class="col-6 mb-2">
-                        <div class="card h-100">
-                            <img src="{!! $guest->image('profile') !!}" alt="Photo de {{$guest}}" class="card-img-top">
-                            <div class="p-1 text-center">
-                                <h3>{{$guest->name}}</h3>
-                                <h4>{{$guest->job}}</h4>
-                            </div>
-                        </div>
-                    </div>
-                @endforeach
-            </div>
-
-        </div>
-    </div>
-
-
-    <div class="row mt-4">
-        <div class="col-12 mb-3">
-            <h2 class="text-center">Nos rubriques du mois</h2>
-        </div>
-
-        <div class="col-sm-6 px-4">
-            <div class="row box mb-3 py-3">
-                <div class="col-12">
-                    <h3>Le coup de c&oelig;ur</h3>
-                </div>
-                <div class="col-8">
-                    {!! $settings->byKey('coup_de_coeur_text') !!}
-                </div>
-                <div class="col-4">
-                    <a target="_blank" href="{{ $settings->byKey('coup_de_coeur_link') ?? '#' }}">
-                        <img src="{{$settings->image('coup_de_coeur_img')}}" alt="Logo coup de coeur" class="w-100">
-                    </a>
-                    <p class="small-text">Cliquez sur le logo pour accéder au site de notre partenaire</p>
-
-                </div>
-            </div>
-        </div>
-        <div class="col-sm-6 px-4">
-            <div class="row box mb-4 py-3">
-                <div class="col-12">
-                    <h3>Le coup de com</h3>
-                </div>
-                <div class="col-8">
-                    {!! $settings->byKey('coup_de_com_text') !!}
-                </div>
-                <div class="col-4">
-                    <a target="_blank" href="{{ $settings->byKey('coup_de_com_link') ?? '#' }}">
-                        <img src="{{$settings->image('coup_de_com_img')}}" alt="Logo coup de com" class="w-100">
-                    </a>
-                    <p class="small-text">Cliquez sur le logo pour accéder au site de notre partenaire</p>
-
-                </div>
-            </div>
-        </div>
-
-
-
-        <div class="col-sm-6 px-4">
-            <div class="row box py-3">
-                <div class="col-12">
-                    <h3>Le journal de la com santé</h3>
-                </div>
-                <div class="col-8">
-                    {!! $settings->byKey('journal_com_text') !!}
-                </div>
-                <div class="col-4">
-                    <a target="_blank" href="{{ $settings->byKey('journal_com_link') ?? '#' }}">
-                        <img src="{{$settings->image('journal_com_img')}}" alt="Image coup de com santé" class="w-100">
-                    </a>
-                    <p class="small-text">Cliquez sur la une de la semaine pour accéder</p>
-
-                </div>
-            </div>
-        </div>
-                <div class="col-sm-6 mb-3">
-            <x-pill-box title="Lorem ipsum" color="cyan">
-                Haec dum oriens diu perferret, caeli reserato tepore Constantius consulatu suo septies et Caesaris ter egressus Arelate Valentiam petit, in
-            </x-pill-box>
-
-        </div>
-    </div>
-
-
-    </div>
-
-
-
-
-
-
-</div>
-@endsection

diff --git a/resources/views/podcasts/show.blade.php b/resources/views/podcasts/show.blade.php
new file mode 100644 (file)
index 0000000..9bec90f
--- /dev/null
+++ b/resources/views/podcasts/show.blade.php
@@ -0,0 +1,138 @@
+@extends('layouts.app')
+@inject('settings', App\Repositories\SettingRepository)
+
+@section('content')
+<div class="container psq-podcasts">
+    <h1>LA SEULE ÉMISSION « ON AIR » DÉDIÉE À LA COMMUNICATION DES ACTEURS DE LA SANTÉ</h1>
+
+
+    <div class="row mt-5">
+
+
+{{--        Static Mic Logo --}}
+        <div class="col-sm-3 mb-3">
+            <img src="{{asset('img/podcasts/microphone-temporary.png')}}" alt="Image microhpone" class="w-100">
+            <a target="_blank" href="#" class="click-here">Cliquez ici pour écouter l'émission</a>
+        </div>
+
+
+{{--        Description + weekly sponsor --}}
+        <div class="col-sm-5 mb-3 px-2">
+            <div class="box p-3">
+                <div class="text-justify mb-2">
+                    {!! $podcast->description !!}
+                    <hr>
+                </div>
+                <div class="row align-items-center">
+                    <div class="col-sm-6 text-center">
+                        <h2>Une émission en partenariat avec {{ $podcast->sponsor }}</h2>
+                    </div>
+                    <div class="col-sm-6">
+                        <a target="_blank" href="{{$podcast->sponsor_url}}">
+                            <img src="{{$podcast->image('sponsor_logo', 'logo')}}" alt="Logo partenaire" class="w-100">
+                        </a>
+                        <p class="small-text">Cliquez sur le logo pour accéder au site de notre partenaire</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+
+{{--        Guests --}}
+        <div class="col-sm-4 mb-3">
+                <h2 class="text-center">Nos « débatteurs »</h2>
+            <div class="row">
+                @foreach($podcast->guests as $guest)
+                    <div class="col-6 mb-2">
+                        <div class="card h-100">
+                            <img src="{!! $guest->image('profile') !!}" alt="Photo de {{$guest}}" class="card-img-top">
+                            <div class="p-1 text-center">
+                                <h3>{{$guest->name}}</h3>
+                                <h4>{{$guest->job}}</h4>
+                            </div>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
+
+        </div>
+    </div>
+
+
+    <div class="row mt-4">
+        <div class="col-12 mb-3">
+            <h2 class="text-center">Nos rubriques du mois</h2>
+        </div>
+
+        <div class="col-sm-6 px-4">
+            <div class="row box mb-3 py-3">
+                <div class="col-12">
+                    <h3>Le coup de c&oelig;ur</h3>
+                </div>
+                <div class="col-8">
+                    {!! $podcast->coup_de_coeur_text !!}
+                </div>
+                <div class="col-4">
+                    <a target="_blank" href="{{ $podcast->coup_de_coeur_link ?? '#' }}">
+                        <img src="{{$podcast->image('coup_de_coeur_img', 'logo')}}" alt="Logo coup de coeur" class="w-100">
+                    </a>
+                    <p class="small-text">Cliquez sur le logo pour accéder au site de notre partenaire</p>
+
+                </div>
+            </div>
+        </div>
+        <div class="col-sm-6 px-4">
+            <div class="row box mb-4 py-3">
+                <div class="col-12">
+                    <h3>Le coup de com</h3>
+                </div>
+                <div class="col-8">
+                    {!! $podcast->coup_de_com_text !!}
+                </div>
+                <div class="col-4">
+                    <a target="_blank" href="{{ $podcast->coup_de_com_link ?? '#' }}">
+                        <img src="{{$podcast->image('coup_de_com_img', 'logo')}}" alt="Logo coup de com" class="w-100">
+                    </a>
+                    <p class="small-text">Cliquez sur le logo pour accéder au site de notre partenaire</p>
+
+                </div>
+            </div>
+        </div>
+
+
+
+        <div class="col-sm-6 px-4">
+            <div class="row box py-3">
+                <div class="col-12">
+                    <h3>Le journal de la com santé</h3>
+                </div>
+                <div class="col-8">
+                    {!! $podcast->journal_com_text !!}
+                </div>
+                <div class="col-4">
+                    <a target="_blank" href="{{ $podcast->journal_com_link ?? '#' }}">
+                        <img src="{{$podcast->image('journal_com_img', 'logo')}}" alt="Image coup de com santé" class="w-100">
+                    </a>
+                    <p class="small-text">Cliquez sur la une de la semaine pour accéder</p>
+
+                </div>
+            </div>
+        </div>
+                <div class="col-sm-6 mb-3">
+            <x-pill-box title="Lorem ipsum" color="cyan">
+                Haec dum oriens diu perferret, caeli reserato tepore Constantius consulatu suo septies et Caesaris ter egressus Arelate Valentiam petit, in
+            </x-pill-box>
+
+        </div>
+    </div>
+
+
+    </div>
+
+
+
+
+
+
+</div>
+@endsection

diff --git a/resources/views/site/blocks/image.blade.php b/resources/views/site/blocks/image.blade.php
index 2fab201e0e07e9dd6edc43ed246c92b7be48e8d1..45ee488ebb2d687d39db43158365f84f1141cba3 100644 (file)
--- a/resources/views/site/blocks/image.blade.php
+++ b/resources/views/site/blocks/image.blade.php
@@ -1 +1,10 @@
+@php
+$link = $block->input('link');
+@endphp
+@if(!empty($link))
+<a href="{!! $link !!}" target="_blank">
+@endif
 <img src="{{$block->image('content', 'default')}}" alt="" class="block-img">
+@if(!empty($link))
+</a>
+@endif

diff --git a/routes/admin.php b/routes/admin.php
index 9c31dea09f9ef3de0ab01a5e153bf7ada454fbe8..53e3dbec8e6f8c13cb915936eb1c61cfe53779e5 100644 (file)
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -18,7 +18,7 @@ Route::prefix('settings')->group(function() {
     Route::module('pillBoxSpaces');
 });
 
-Route::prefix('other-content')->group(function () {
+Route::prefix('otherContent')->group(function () {
      Route::module('socialArticles');
 });