From 4fcc41e36e94031336763c2e8c451f73f8ce97f0 Mon Sep 17 00:00:00 2001
From: F4ilji <f4ilj@yandex.ru>
Date: Wed, 16 Apr 2025 15:27:02 +0500
Subject: [PATCH] small fixing, added throw errors in widgets

---
 .../Controllers/ClientWidgetContactController.php     |  2 +-
 app/Http/Controllers/ClientWidgetFormController.php   |  2 +-
 app/Http/Controllers/ClientWidgetPageController.php   |  4 ++--
 .../ClientWidgetPageReferenceListController.php       |  2 +-
 app/Http/Controllers/ClientWidgetPostController.php   |  2 +-
 app/Http/Controllers/ClientWidgetSliderController.php |  2 +-
 .../shared/contactSection/ContactSectionBlock.vue     | 11 ++++++-----
 .../shared/pageResource/PageResourceList.vue          |  2 +-
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/ClientWidgetContactController.php b/app/Http/Controllers/ClientWidgetContactController.php
index 7655a2c..f09bbfb 100644
--- a/app/Http/Controllers/ClientWidgetContactController.php
+++ b/app/Http/Controllers/ClientWidgetContactController.php
@@ -19,7 +19,7 @@ class ClientWidgetContactController extends Controller
                 return new ClientContactWidgetResource(
                     ContactWidget::query()
                         ->where('slug', $slug)
-                        ->first()
+                        ->firstOrFail()
                 );
             }
         );
diff --git a/app/Http/Controllers/ClientWidgetFormController.php b/app/Http/Controllers/ClientWidgetFormController.php
index 4a7aed9..fd48d9a 100644
--- a/app/Http/Controllers/ClientWidgetFormController.php
+++ b/app/Http/Controllers/ClientWidgetFormController.php
@@ -15,7 +15,7 @@ class ClientWidgetFormController extends Controller
 {
     public function single(string $id)
     {
-        return new ClientFormResource(CustomForm::query()->where('status', CustomFormStatus::PUBLISHED)->where('form_id', $id)->first());
+        return new ClientFormResource(CustomForm::query()->where('status', CustomFormStatus::PUBLISHED)->where('form_id', $id)->firstOrFail());
     }
 
     public function submit(int $id, Request $request)
diff --git a/app/Http/Controllers/ClientWidgetPageController.php b/app/Http/Controllers/ClientWidgetPageController.php
index 502da6f..1e9b918 100644
--- a/app/Http/Controllers/ClientWidgetPageController.php
+++ b/app/Http/Controllers/ClientWidgetPageController.php
@@ -10,7 +10,7 @@ use Illuminate\Support\Facades\Cache;
 
 class ClientWidgetPageController extends Controller
 {
-    public function single(int $id)
+    public function single(int $id): \Illuminate\Http\JsonResponse
     {
         $cacheKey = 'page_' . md5($id);
 
@@ -18,7 +18,7 @@ class ClientWidgetPageController extends Controller
         $page = Cache::remember($cacheKey, now()->addHours(1), function () use ($id) {
             return Page::where('id', '=', $id)
                 ->with('section.pages.section', 'section.mainSection')
-                ->first();
+                ->firstOrFail();
         });
 
         if (isset($page->section)) {
diff --git a/app/Http/Controllers/ClientWidgetPageReferenceListController.php b/app/Http/Controllers/ClientWidgetPageReferenceListController.php
index 422f30c..755c5cf 100644
--- a/app/Http/Controllers/ClientWidgetPageReferenceListController.php
+++ b/app/Http/Controllers/ClientWidgetPageReferenceListController.php
@@ -19,7 +19,7 @@ class ClientWidgetPageReferenceListController extends Controller
                 return new ClientPageReferenceListResource(
                     PageReferenceList::query()
                         ->where('slug', $slug)
-                        ->first()
+                        ->firstOrFail()
                 );
             }
         );
diff --git a/app/Http/Controllers/ClientWidgetPostController.php b/app/Http/Controllers/ClientWidgetPostController.php
index 4a29494..6779aee 100644
--- a/app/Http/Controllers/ClientWidgetPostController.php
+++ b/app/Http/Controllers/ClientWidgetPostController.php
@@ -39,7 +39,7 @@ class ClientWidgetPostController extends Controller
 
         return Cache::remember($cacheKey, now()->addMinutes(10), function () use ($id) {
             return new PostThumbnailResource(
-                Post::query()->with('category')->find($id)
+                Post::query()->with('category')->find($id)->firstOrFail()
             );
         });
     }
diff --git a/app/Http/Controllers/ClientWidgetSliderController.php b/app/Http/Controllers/ClientWidgetSliderController.php
index d1d6951..20ed9e5 100644
--- a/app/Http/Controllers/ClientWidgetSliderController.php
+++ b/app/Http/Controllers/ClientWidgetSliderController.php
@@ -18,7 +18,7 @@ class ClientWidgetSliderController extends Controller
                 ->with(['slides' => function($query) {
                     $query->where('is_active', true);
                 }])
-                ->first();
+                ->firstOrFail();
 
             return $slider ?: null;
         });
diff --git a/resources/js/componentss/shared/contactSection/ContactSectionBlock.vue b/resources/js/componentss/shared/contactSection/ContactSectionBlock.vue
index aa022a6..549d57c 100644
--- a/resources/js/componentss/shared/contactSection/ContactSectionBlock.vue
+++ b/resources/js/componentss/shared/contactSection/ContactSectionBlock.vue
@@ -1,14 +1,14 @@
 <template>
 	<div v-if="loading" class="flex flex-col space-y-4">
-		<div class="group block rounded-xl overflow-hidden animate-pulse">
-			<div class="flex flex-col sm:flex-row sm:items-center gap-3 sm:gap-5">
-				<div class="shrink-0 relative rounded-xl overflow-hidden w-full sm:w-56 h-44">
+		<div class="group block p-4 overflow-hidden animate-pulse">
+			<div class="w-full">
+				<div class="shrink-0 relative rounded-xl overflow-hidden w-full h-44">
 					<div class="w-full h-full bg-gray-200"></div>
 				</div>
 			</div>
 		</div>
 	</div>
-	<div v-else-if="!loading & contacts">
+	<div v-else-if="!loading && contacts">
 		<section class="bg-[#F5F5F5] w-full py-10">
 			<div class="max-w-screen-xl md:flex justify-around w-full mx-auto px-4 md:py-[50px] flex-wrap space-y-7 md:space-y-0">
 							<ContactGroup v-for="contact in contacts.data.content"
@@ -43,7 +43,8 @@ export default {
 						this.loading = false; // Установить состояние загрузки в false
 					})
 					.catch(error => {
-						console.error('Ошибка:', error);
+            this.loading = false; // Установить состояние загрузки в false
+            console.error('Ошибка:', error);
 					});
 		},
 	},
diff --git a/resources/js/componentss/shared/pageResource/PageResourceList.vue b/resources/js/componentss/shared/pageResource/PageResourceList.vue
index 30cc217..fb6dfa7 100644
--- a/resources/js/componentss/shared/pageResource/PageResourceList.vue
+++ b/resources/js/componentss/shared/pageResource/PageResourceList.vue
@@ -9,7 +9,7 @@
 		</div>
 	</div>
 
-	<div v-else-if="!loading & resource">
+	<div v-else-if="!loading && resource">
 
 		<!-- Card Blog -->
 		<div class="px-0 py-10 sm:px-2 lg:py-14 mx-auto">