From 7c2722f414db64133ade928e7165f3ce27d83b23 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 12 Sep 2025 17:20:05 +0200 Subject: [PATCH] wip #7734 @2.5 --- app/Console/Commands/Migration.php | 3 ++ app/Console/Commands/UpdateDemoFluidbook.php | 35 +++++++++++++++++++ .../Controllers/Admin/SettingController.php | 6 ---- app/Http/Controllers/FluidbookController.php | 18 +--------- app/Providers/AppServiceProvider.php | 24 ------------- .../views/admin/settings/strings.blade.php | 7 ++++ resources/views/layouts/app.blade.php | 11 ------ 7 files changed, 46 insertions(+), 58 deletions(-) create mode 100644 app/Console/Commands/UpdateDemoFluidbook.php diff --git a/app/Console/Commands/Migration.php b/app/Console/Commands/Migration.php index 60900b6..7a19580 100644 --- a/app/Console/Commands/Migration.php +++ b/app/Console/Commands/Migration.php @@ -5,6 +5,7 @@ namespace App\Console\Commands; use Cubist\Util\CommandLine; use Cubist\Util\Files\Files; use Illuminate\Console\Command; +use Illuminate\Support\Facades\Artisan; class Migration extends Command { @@ -66,5 +67,7 @@ class Migration extends Command // Sync S3 `rclone sync olds3:prescription-sante s3:presquot`; `rclone sync olds3:prescription-sante/flowpaper/ /application/storage/app/flowpaper/`; + + Artisan::call('psq:fluidbook:archives'); } } diff --git a/app/Console/Commands/UpdateDemoFluidbook.php b/app/Console/Commands/UpdateDemoFluidbook.php new file mode 100644 index 0000000..61e0ee6 --- /dev/null +++ b/app/Console/Commands/UpdateDemoFluidbook.php @@ -0,0 +1,35 @@ +subDays(30))->orderBy('created_at', 'desc')->get() as $pdf) { + $fluidbook = $client->getFluidbookByReference($pdf->slug); + if ($fluidbook->pages <= 3) { + continue; + } + + /** @var SettingRepository $sr */ + $sr = app(SettingRepository::class); + dd($sr->where('key', 'fluidbook_demo_ref')->with('translations')->first()->forceFill(['value'=> $pdf->slug])->save()); + break; + } + } +} diff --git a/app/Http/Controllers/Admin/SettingController.php b/app/Http/Controllers/Admin/SettingController.php index eb6ac09..864955f 100644 --- a/app/Http/Controllers/Admin/SettingController.php +++ b/app/Http/Controllers/Admin/SettingController.php @@ -11,10 +11,4 @@ class SettingController extends Base return $this->index('strings'); } - public function podcasts() - { - return $this->index('podcasts'); - } - - } diff --git a/app/Http/Controllers/FluidbookController.php b/app/Http/Controllers/FluidbookController.php index 832de9b..99f259f 100644 --- a/app/Http/Controllers/FluidbookController.php +++ b/app/Http/Controllers/FluidbookController.php @@ -11,8 +11,6 @@ use Illuminate\View\View; class FluidbookController extends Controller { - - /** * @param PdfFile $file * @param Request $request @@ -22,6 +20,7 @@ class FluidbookController extends Controller */ public function view(PdfFile $file, string $path = '') { + $this->authorize('view', $file); // Add trailing slash if needed $request = request(); if ($request->getPathInfo() === '/view/' . $file->slug) { @@ -73,19 +72,4 @@ class FluidbookController extends Controller } return $file->view(); } - - /** - * @param PdfFile $file - * @param Request $request - * @return \Symfony\Component\HttpFoundation\StreamedResponse - */ - public function download(PdfFile $file, Request $request) - { - if (!$request->hasValidSignature()) { - abort(401); - } - return $file->getFinalVersion()->downloadFile(); - } - - } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 4212657..352342d 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -33,25 +33,12 @@ class AppServiceProvider extends ServiceProvider public function register() { - $this->app->singleton(Mailgun::class, function ($app) { - return Mailgun::create(config('mail.mailgun.api_key'), 'https://api.eu.mailgun.net'); - }); - - $this->app->singleton(Client::class, function ($app) { - return Client::prepare( - env('TIKA_HOST', 'localhost'), - env('TIKA_PORT', 9998) - ); - }); - $this->app->bind(HtmlConverter::class, function ($app) { return new HtmlConverter(['header_style' => 'atx']); }); Stripe::setApiKey(config('cashier.secret')); Paginator::useBootstrap(); - - } @@ -77,17 +64,6 @@ class AppServiceProvider extends ServiceProvider PdfFile::observe(PdfFileObserver::class); User::observe(UserObserver::class); - Blade::if('fuckIE', function () { - if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) { - return true; - } - - $HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT']; - - return preg_match('~MSIE|Internet Explorer~i', $HTTP_USER_AGENT) || - preg_match('~Trident/7.0(.*)?; rv:11.0~', $HTTP_USER_AGENT); - }); - \View::share('theme', 'logo-blue'); } diff --git a/resources/views/admin/settings/strings.blade.php b/resources/views/admin/settings/strings.blade.php index b8b71e6..d507bed 100644 --- a/resources/views/admin/settings/strings.blade.php +++ b/resources/views/admin/settings/strings.blade.php @@ -525,6 +525,13 @@ 'required' => true, ]) + @formField('input',[ + 'label'=>'Fluidbook de démo', + 'name'=>'fluidbook_demo_ref', + 'maxlength'=>30, + 'required'=>true, + ]) +

Mentions légales

@formField('wysiwyg', [ diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 8a3eae3..cd3a32a 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -106,17 +106,6 @@ - @fuckIE -
- -
- Attention ! Nous avons remarqué que vous utilisez un navigateur obsolète. Pour une expérience optimale, - merci d'utiliser un navigateur récent tel que Chrome, Edge, Firefox ou Safari. -
-
- - @endif -
@yield('content')
-- 2.39.5