From: soufiane Date: Mon, 16 Jun 2025 08:51:28 +0000 (+0200) Subject: wip #7411 @4:00 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=38aa7c262b8b8474adf637dca3e5c8cf0bb60a97;p=psq.git wip #7411 @4:00 --- diff --git a/app/Http/Controllers/ArchiveController.php b/app/Http/Controllers/ArchiveController.php index a3a7161..64d7c3e 100644 --- a/app/Http/Controllers/ArchiveController.php +++ b/app/Http/Controllers/ArchiveController.php @@ -11,10 +11,10 @@ class ArchiveController extends Controller { if(\Auth::check() && \Auth::user()->hasValidSubscription()) { - return redirect()->route('archives'); + \View::share('authorized'); } - $this->injectLastPdf(); + $this->injectAllPdf(); return view('archives.index'); diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index c9c31a8..7ede847 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -32,4 +32,15 @@ class Controller extends BaseController ); } + protected function injectAllPdf() + { + \View::share('all_pdf', FileCollection::where('slug', 'psq') + ->first() + ->files() + ->orderByDesc('created_at') + ->published() + ->take(20) + ->get() + ); + } } diff --git a/app/Http/Controllers/FileController.php b/app/Http/Controllers/FileController.php index c7a7b06..8302aab 100644 --- a/app/Http/Controllers/FileController.php +++ b/app/Http/Controllers/FileController.php @@ -22,7 +22,7 @@ class FileController extends Controller { if(\Auth::check() && \Auth::user()->hasValidSubscription()) { return view('layouts.vue', [ - 'extends' => 'layouts.app', + 'extends' => 'layouts.v2.app', 'component' => 'file-instant-search', 'class' => 'psq-archives', 'title' => 'Nos archives' diff --git a/public/img/close-popup.svg b/public/img/close-popup.svg new file mode 100644 index 0000000..60859d1 --- /dev/null +++ b/public/img/close-popup.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/public/img/ombre-magazine.svg b/public/img/ombre-magazine.svg new file mode 100644 index 0000000..49adee1 --- /dev/null +++ b/public/img/ombre-magazine.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/public/img/quotidien.jpg b/public/img/quotidien.jpg new file mode 100644 index 0000000..62a0820 Binary files /dev/null and b/public/img/quotidien.jpg differ diff --git a/public/img/search_icon.svg b/public/img/search_icon.svg new file mode 100644 index 0000000..8c2498a --- /dev/null +++ b/public/img/search_icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/sass/_covers.scss b/resources/sass/_covers.scss index 7de01a9..94e4555 100644 --- a/resources/sass/_covers.scss +++ b/resources/sass/_covers.scss @@ -27,7 +27,7 @@ div.cover { &.cover-pile-2 { img.cover-over { - width: 71%; + width: 100%; } } @@ -40,11 +40,6 @@ div.cover { } .cover-title { - - width: fit-content; - margin: auto; - height: 30px; - img { position: absolute; width: 50px; @@ -56,12 +51,7 @@ div.cover { p { color: $psq_logo_blue; - background-color: $psq_light_blue; - text-align: center; - font-weight: 900; display: table; - margin: auto; - padding: 0 6px; font-size: small; z-index: 10; position: relative; @@ -69,3 +59,14 @@ div.cover { } } +.item-pdf-archive { + width: calc(100% / 2 - 8px); + @include media-breakpoint-up(md) { + width: calc(100% / 5 - 26px); + } + .shadowcover { + height: 25px; + overflow: hidden; + @apply absolute bottom-0 translate-y-full + } +} diff --git a/resources/views/archives/index.blade.php b/resources/views/archives/index.blade.php index ae3e2cf..dda3941 100644 --- a/resources/views/archives/index.blade.php +++ b/resources/views/archives/index.blade.php @@ -1,17 +1,27 @@ @extends('layouts.v2.app') -@section('aside') - -

Prescription Santé Quotidien

-

L’actualité des acteurs du médicament et de ses partenaires en France et ailleurs dès 9h30 le matin dans votre boite mail

-

4 ÉDITIONS PAR SEMAINE
8 À 12 PAGES PAR ÉDITION

-

Depuis 13 ans, plus de 2300 ABONNÉS, au sein de 95 laboratoires pharmaceutiques et 50 entreprises partenaires de l’industrie du médicament.

- +@section('title') +
+
+

Nos archives

+
+
+ Lancer la recherche +
+ +
+
+
@endsection - @section('main') -

ACCÉDER AUX ARCHIVES DE PRESCRIPTION SANTÉ

-

CE SERVICE EST RÉSERVÉ AUX ABONNÉS

- - +
+
+ @foreach($all_pdf as $key => $pdf) +
+ + +
+ @endforeach +
+
@endsection diff --git a/resources/views/components/cover.blade.php b/resources/views/components/cover.blade.php index dd57854..bd1bb6b 100644 --- a/resources/views/components/cover.blade.php +++ b/resources/views/components/cover.blade.php @@ -1,8 +1,12 @@
- + -
-

{{$pdf->title}} - {{$pdf->created_at->format('d/m/Y')}}

+
+
+
+

{{$pdf->title}}

+ Lire cette édition +
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index bcb7ca3..3358c4d 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -2,12 +2,9 @@ @section('title', __('Not Found')) @section('content') - -
- - -

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

- - +
+
+

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

+
@endsection diff --git a/resources/views/home/index.blade.php b/resources/views/home/index.blade.php index 905b6ce..7355131 100644 --- a/resources/views/home/index.blade.php +++ b/resources/views/home/index.blade.php @@ -22,7 +22,6 @@
@endif - @if (session('resent'))
{{--@foreach($last_pdf->first()->headlines ?? [] as $headline) - - @endforeach--}}
@@ -69,6 +66,9 @@
{!! $settings->byKey('text_discover_home') !!}
+
+ +
Offre découverte @@ -110,8 +110,8 @@ -
-
+
+
@@ -125,12 +125,12 @@ {!! $settings->byKey('not_register_link') !!}
-
-
+
+

{{ $settings->byKey('title_quotidien_home') }}

- - Feuilleter un quotidien + Feuilleter un quotidien
+
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 772e235..8ea0977 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -77,7 +77,7 @@ @endif - +
diff --git a/resources/views/layouts/v2/app.blade.php b/resources/views/layouts/v2/app.blade.php index 9ef7c41..6f48bb4 100644 --- a/resources/views/layouts/v2/app.blade.php +++ b/resources/views/layouts/v2/app.blade.php @@ -1,11 +1,7 @@ @extends('layouts.v2.center') -@section('center_content') - -
- @yield('main') -
+@section('content') + @yield('title') + @yield('main') @endsection diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php index 012dbe7..ca41a7c 100644 --- a/resources/views/partials/footer.blade.php +++ b/resources/views/partials/footer.blade.php @@ -2,6 +2,6 @@

Copyright © Prescription santé Quotidien.

- Mentions légales + Mentions légales
diff --git a/routes/web.php b/routes/web.php index c817b00..9cc6f5b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -86,7 +86,7 @@ Route::domain(env('CLIENT_DOMAIN_NAME'))->group(function() { Route::get('archives', 'ArchiveController@index')->name('archives.index'); - Route::get('search', 'FileController@search')->name('archives'); + //Route::get('search', 'FileController@search')->name('archives'); Route::prefix('campagnes-et-communication')->group(function() { Route::get('/', 'AdCampaignController@index')->name('com-campaign.index'); @@ -157,13 +157,12 @@ Route::domain('{client_domains}')->group(function() { Route::post('mailgun-event', 'WebhookController@mailgunEvent'); Route::get('mailgun-event-test', 'WebhookController@mailgunEventTest'); Route::post('stripe', 'StripeWebhookController@handleWebhook'); - }); }); Route::get('mentions-legales', function() { return view('mentions.index'); -}); +})->name("mentions.index"); if(config('app.env') === 'local') { Route::get('debug', 'DebugController@test');