diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 1a656da..4a19211 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -16,11 +16,8 @@ class HomeController extends Controller /** * Get only duty hours for today or later. * @var \Illuminate\Database\Eloquent\Builder $dutyhour - */ - $dutyhour = Dutyhour::where('date', '>', now()->modify('-1 day'))->orderBy('date', 'asc'); - - $dutyhourModels = $dutyhour->paginate(10); - + */ + $dutyhourModels = Dutyhour::where('date', '>', now()->modify('-1 day'))->orderBy('date', 'asc')->limit(10)->get(); return view('home', compact('dutyhourModels')); } } diff --git a/app/Http/Controllers/InformationController.php b/app/Http/Controllers/InformationController.php index e455f6b..5b05001 100644 --- a/app/Http/Controllers/InformationController.php +++ b/app/Http/Controllers/InformationController.php @@ -19,4 +19,34 @@ class InformationController extends Controller * @var string */ public static $layout = 'layout.app'; + + /** + * After store model middleware + * + * @return void + */ + public function storedModel() + { + cache()->put('infos', Information::all(), 3600); + } + + /** + * After update model middleware + * + * @return void + */ + public function updatedModel() + { + cache()->put('infos', Information::all(), 3600); + } + + /** + * After delete model middleware + * + * @return void + */ + public function deletedModel() + { + cache()->put('infos', Information::all(), 3600); + } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 591d691..4a02499 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -28,16 +28,16 @@ class AppServiceProvider extends ServiceProvider // * LOCAL FORCE eg: for Carbon // * Remove numeric to prevent float seperator to breaking numeric transactions \collect([\LC_TIME, \LC_MESSAGES, \LC_COLLATE, \LC_CTYPE, \LC_MONETARY]) - ->map(function ($contant) { - setlocale( - $contant, - \sprintf( - '%s_%s.UTF-8', - config('app.locale'), - \strtoupper(config('app.locale')) - ) - ); - }); + ->map(function ($contant) { + setlocale( + $contant, + \sprintf( + '%s_%s.UTF-8', + config('app.locale'), + \strtoupper(config('app.locale')) + ) + ); + }); Carbon::setLocale(config('app.locale')); // * Force bootstrap paginator @@ -52,18 +52,21 @@ class AppServiceProvider extends ServiceProvider }); if (!app()->runningInConsole()) { - $appInfos = Cache::remember('composer', 360, function () { + $appInfos = Cache::remember('composer', 3600, function () { return json_decode(File::get(\app_path('../composer.json'))); }); View::share('name', $appInfos->name); View::share('version', $appInfos->version); View::share('license', $appInfos->license); - View::share('informations', Information::all()); - // * Groups View::share('markerLabels', Cache::rememberForever('markerLabels', function () { return Marker::getCachedLabels() ?? []; })); - }//end if + // * Informations + $infos = Cache::remember('infos', 3600, function () { + return Information::all(); + }); + View::share('informations', $infos); + } //end if } } diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 3b84cb2..beb7ff7 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -2,11 +2,6 @@ @section('content')