Page fix

inkomomutane · Jul 14, 2023 · 53c9192 · 53c9192
1 parent 6e0b082
commit 53c9192
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 10 deletions.
diff --git a/app/Actions/Page/GetPage.php b/app/Actions/Page/GetPage.php
@@ -4,18 +4,27 @@
 
 use App\Models\Page;
 use Inertia\Inertia;
+use Lorisleiva\Actions\Concerns\AsAction;
 use Lorisleiva\Actions\Concerns\AsController;
 
 class GetPage
 {
     use AsController;
+    use AsAction;
+
+
+    public function handle() :Page {
+
+        return  Page::first() ?? Page::create([]);
+    }
+
+
+
 
     public function asController()
     {
-        $page = Page::first() ?? Page::create([]);
-
         return Inertia::render('Page/Index', [
-            'pageData' => $page->getData(),
+            'pageData' => $this->handle()->getData(),
         ]);
     }
 }
diff --git a/app/Actions/Website/About.php b/app/Actions/Website/About.php
@@ -2,6 +2,7 @@
 
 namespace App\Actions\Website;
 
+use App\Actions\Page\GetPage;
 use App\Models\Page;
 use App\Support\Enums\Pages;
 use Lorisleiva\Actions\Concerns\AsController;
@@ -13,7 +14,7 @@ class About
     public function asController()
     {
         return view('website.about', [
-            'page' => Page::with('media')
+            'page' =>  GetPage::run()->with('media')
                 ->first()?->getFirstMedia(Pages::ABOUT),
         ]);
     }

diff --git a/app/Actions/Website/GetPolicies.php b/app/Actions/Website/GetPolicies.php
@@ -2,6 +2,7 @@
 
 namespace App\Actions\Website;
 
+use App\Actions\Page\GetPage;
 use App\Models\Page;
 use App\Models\Politica;
 use App\Support\Enums\Pages;
@@ -15,7 +16,7 @@ public function asController()
     {
         return view('website.policy', [
             'policy' => Politica::first(),
-            'page' => Page::with('media')->first()?->getFirstMedia(Pages::POLICY),
+            'page' =>  GetPage::run()->with('media')->first()?->getFirstMedia(Pages::POLICY),
         ]);
     }
 }
diff --git a/app/Actions/Website/GetTerms.php b/app/Actions/Website/GetTerms.php
@@ -2,6 +2,7 @@
 
 namespace App\Actions\Website;
 
+use App\Actions\Page\GetPage;
 use App\Models\Page;
 use App\Models\Termo;
 use App\Support\Enums\Pages;
@@ -15,7 +16,7 @@ public function asController()
     {
         return view('website.terms', [
             'terms' => Termo::first(),
-            'page' => Page::with('media')->first()?->getFirstMedia(Pages::TERMS),
+            'page' =>  GetPage::run()->with('media')->first()?->getFirstMedia(Pages::TERMS),
         ]);
     }
 }
diff --git a/app/Actions/Website/Welcome.php b/app/Actions/Website/Welcome.php
@@ -2,6 +2,7 @@
 
 namespace App\Actions\Website;
 
+use App\Actions\Page\GetPage;
 use App\Models\Banner;
 use App\Models\Imovel;
 use App\Models\Page;
@@ -16,8 +17,8 @@ public function asController()
     {
         //
         return view('website.welcome', [
-            'page' => Page::with('media')->first()?->getFirstMedia(Pages::HOME),
-            'thumb' => Page::with('media')->first()?->getFirstMedia(Pages::HOME)->responsiveImages()->getPlaceholderSvg(),
+            'page' => GetPage::run()->with('media')->first()?->getFirstMedia(Pages::HOME),
+            'thumb' =>  GetPage::run()->with('media')->first()?->getFirstMedia(Pages::HOME)->responsiveImages()->getPlaceholderSvg(),
             'relevantImovels' => $this->getRelevantImovels(),
             'lastestImovels' => Imovel::with(['bairro.cidade', 'intermediationRule', 'imovelFor', 'tipo_de_imovel', 'status', 'comentarios', 'ratings'])->latest('created_at')->get()->take(6),
             'banners' => Banner::with('media')->first(),

diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php
@@ -4,6 +4,7 @@
 
 use App\Actions\Imovel\ImovelTrashCount;
 use App\Actions\Message\MessageCount;
+use App\Actions\Page\GetPage;
 use App\Data\RoleData;
 use App\Models\Page;
 use Illuminate\Http\Request;
@@ -35,6 +36,7 @@ public function version(Request $request): string|null
      */
     public function share(Request $request): array
     {
+
         return array_merge(parent::share($request), [
             'auth' => [
                 'user' => $request->user()?->load('roles')->getData(),
@@ -43,7 +45,7 @@ public function share(Request $request): array
             'roles' => RoleData::collection(Role::all()),
             'mails' => MessageCount::run(),
             'trash' => ImovelTrashCount::run($request->user()),
-            'globals' => Page::first()->getData(),
+            'globals' =>  GetPage::run()->getData(),
             'site' => config('app.url'),
             'ziggy' => function () use ($request) {
                 return array_merge((new Ziggy)->toArray(), [

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use App\Actions\Page\GetPage;
 use App\Models\Page;
 use App\Models\TipoDeImovel;
 use Illuminate\Database\Eloquent\Builder;
@@ -33,7 +34,7 @@ public function boot()
     {
         Paginator::useBootstrapFive();
         view()->share([
-            'globals' => Page::first()?->getData(),
+            'globals' =>  GetPage::run()?->getData(),
             'imovelTypes' => TipoDeImovel::all(),
         ]);