podcatss page + not registered

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index f68480692e1c0aae727ba5b5b482d9b795c988c5..3208bb6ff35467fdf4a3a29c2571a68c5d1722e7 100644 (file)
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -8,6 +8,7 @@ use App\Models\Event;
 use App\Observers\PdfFileObserver;
 use App\Observers\UserObserver;
 use App\PdfFile;
+use App\Repositories\SettingRepository;
 use App\User;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Carbon;
@@ -40,9 +41,6 @@ class AppServiceProvider extends ServiceProvider
             return new HtmlConverter(['header_style'=>'atx']);
         });
 
-
-
-
     }
 
 

diff --git a/app/Repositories/SettingRepository.php b/app/Repositories/SettingRepository.php
new file mode 100644 (file)
index 0000000..5ba2715
--- /dev/null
+++ b/app/Repositories/SettingRepository.php
@@ -0,0 +1,18 @@
+<?php
+
+
+namespace App\Repositories;
+
+use A17\Twill\Repositories\SettingRepository as Repo;
+
+class SettingRepository extends Repo
+{
+
+    public function image($key, $section = null)
+    {
+        return ($setting = $this->model->where('key', $key)->first()) === null ?
+            null :
+            $setting->image($key);
+    }
+
+}

diff --git a/config/twill.php b/config/twill.php
index 4a7ebc4dbaa59a8e04eb918395d686e34b026955..086909f7045e1bee3e4e38014da0b474d64edbbd 100644 (file)
--- a/config/twill.php
+++ b/config/twill.php
@@ -22,6 +22,35 @@ return [
         'homepage' => 'content'
     ],
 
+    'settings' => [
+        'crops' => [
+            'coup_de_coeur_img' => [
+                'default' => [
+                    [
+                        'name' => 'default',
+                        'ratio' => 0
+                    ],
+                ],
+            ],
+            'coup_de_com_img' => [
+                'default' => [
+                    [
+                        'name' => 'default',
+                        'ratio' => 0
+                    ],
+                ],
+            ],
+            'journal_com_img' => [
+                'default' => [
+                    [
+                        'name' => 'default',
+                        'ratio' => 0
+                    ],
+                ],
+            ],
+        ],
+    ],
+
     'buckets' => [
         'homepage' => [
             'name' => 'Home',

diff --git a/public/css/app.css b/public/css/app.css
index 1d1e25b707af2b1f1159048b814adf44c89a398e..79d08c6010f3d85e23dcdeff011a98488717d411 100644 (file)
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -11306,6 +11306,7 @@ div.pill-box div > a {
 
 .small-text {
   font-size: xx-small;
+  text-align: left;
 }
 
 .spotlight-news {

diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index 07b519ce15bb5d14911b43a9cb9a742742a3ce24..0c8fcae45240c2d6a3cdbc507d9371486200965f 100644 (file)
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -40,6 +40,7 @@ a {
 
 .small-text {
     font-size: xx-small;
+    text-align: left;
 }
 
 

diff --git a/resources/views/admin/settings/podcasts.blade.php b/resources/views/admin/settings/podcasts.blade.php
index b4c9a8f54dfcdaec24fa3cc7921786aa87575049..6d7c16dc61fab4fca8ebd416be3cfe4a06703cc5 100644 (file)
--- a/resources/views/admin/settings/podcasts.blade.php
+++ b/resources/views/admin/settings/podcasts.blade.php
@@ -4,21 +4,60 @@
     @formField('wysiwyg', [
         'label' => 'Le coup de coeur',
         'name' => 'coup_de_coeur_text',
-        'maxlength' => 500,
+        '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' => 500,
+        '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' => 500,
+        '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,
+
+    ])
 
 
 

diff --git a/resources/views/not-registered.blade.php b/resources/views/not-registered.blade.php
index 7d57e23f242e867d2729ef28b5ec7e6ffad77c4a..d19b4977f5b2eef13c7d873c29fb7d9d8e267d09 100644 (file)
--- a/resources/views/not-registered.blade.php
+++ b/resources/views/not-registered.blade.php
@@ -5,11 +5,11 @@
 <div class="container">
     <h1>Pas encore abonné ?</h1>
 
-    <div class="row">
+    <div class="row align-items-center">
         <div class="col-sm-6">
             <img src="{{asset('img/not-registered.jpg')}}" alt="Image pas encore abonné" class="w-100">
         </div>
-        <div class="col-sm-6">
+        <div class="col-sm-6 pt-3">
             {!! $settings->byKey('not_registered_text') !!}
         </div>
 

diff --git a/resources/views/podcasts/index.blade.php b/resources/views/podcasts/index.blade.php
index 54c1f2810356e3fb662dbc802cc4f15e8f59d6dd..8217bd9a7c208f9541f1d4d781ca4ed20d6e5b2a 100644 (file)
--- a/resources/views/podcasts/index.blade.php
+++ b/resources/views/podcasts/index.blade.php
@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@inject('settings', App\Repositories\SettingRepository)
 
 @section('content')
 <div class="container">
@@ -11,25 +12,27 @@
 {{--        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 href="#" class="click-here">Cliquez ici pour écouter l'émission</a>
+            <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">
-            <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</h2>
+        <div class="col-sm-5 mb-3 px-2">
+            <div class="bg-white p-3">
+                <div class="text-justify mb-2">
+                    {!! $podcast->description !!}
+                    <hr>
                 </div>
-                <div class="col-sm-6">
-                    <a 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 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>
@@ -56,16 +59,66 @@
     </div>
 
 
-    <div class="row mt-4">
-        <div class="col-12">
+    <div class="row mt-4 text-justify">
+        <div class="col-12 mb-3">
             <h2 class="text-center">Nos rubriques du mois</h2>
         </div>
 
-        <div class="col-sm-4"></div>
-        <div class="col-sm-4">
+        <div class="col-sm-5 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 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-2 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 class="col-sm-5">
+            <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-4"></div>
 
 
     </div>