From 3f32460d60d0eae0e6b9cb6909c8bfdfd476156d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 15 Dec 2023 09:24:07 +0100 Subject: [PATCH] Add View service provider (prepare to bump slowly) --- app/Providers/AppServiceProvider.php | 8 +++---- app/Providers/ViewServiceProvider.php | 34 +++++++++++++++++++++++++++ config/app.php | 5 ++-- 3 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 app/Providers/ViewServiceProvider.php diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 0a46f85..55c9905 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,7 +2,6 @@ namespace App\Providers; -use Illuminate\Pagination\Paginator; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\URL; @@ -26,10 +25,12 @@ class AppServiceProvider extends ServiceProvider return $url->current(); }); } + // * LOCAL HTTPS FIX if (!in_array(config('app.env'), ['local', 'testing'])) { URL::forceScheme('https'); } + // * HA PROXY FIX App::singleton('clientIp', function () { if (config('app.env') == 'local') { @@ -38,6 +39,7 @@ class AppServiceProvider extends ServiceProvider return request()->server('HTTP_X_FORWARDED_FOR') ?? request()->getClientIp(); } }); + // * LOCAL FORCE eg: for Carbon foreach ([\LC_TIME, \LC_MESSAGES, \LC_COLLATE, \LC_CTYPE, \LC_MONETARY] as $category) { setlocale( @@ -47,9 +49,5 @@ class AppServiceProvider extends ServiceProvider ); } Carbon::setLocale(config('app.locale')); - if (!app()->runningInConsole()) { - // * FORCE BOOTSTRAP PAGINATOR (or custom if in front) - Paginator::useBootstrap(); - }//end if } } diff --git a/app/Providers/ViewServiceProvider.php b/app/Providers/ViewServiceProvider.php new file mode 100644 index 0000000..e1fe485 --- /dev/null +++ b/app/Providers/ViewServiceProvider.php @@ -0,0 +1,34 @@ +name) and isset($appInfos->version)) { + View::share('cpsr_name', $appInfos->name); + View::share('cpsr_version', $appInfos->version); + } + + if (!app()->runningInConsole()) { + // * FORCE BOOTSTRAP PAGINATOR (or custom if in front) + Paginator::useBootstrap(); + } + } +} diff --git a/config/app.php b/config/app.php index d1b9bc4..a5b1743 100644 --- a/config/app.php +++ b/config/app.php @@ -169,7 +169,7 @@ return [ * Package Service Providers... */ - Elasticquent\ElasticquentServiceProvider::class, + Elasticquent\ElasticquentServiceProvider::class, /* * Application Service Providers... @@ -178,7 +178,8 @@ return [ App\Providers\AppServiceProvider::class, App\Providers\AuthServiceProvider::class, App\Providers\EventServiceProvider::class, - App\Providers\RouteServiceProvider::class + App\Providers\RouteServiceProvider::class, + App\Providers\ViewServiceProvider::class ],