From 54db2e8e2bd833db01e6e2dd5189812d55a8e325 Mon Sep 17 00:00:00 2001 From: Kamil Niemczycki Date: Sun, 30 Jul 2023 12:10:23 +0200 Subject: [PATCH] -wip --- app/Http/Resources/CategoryCollection.php | 8 ++------ app/Http/Resources/CategoryResource.php | 11 +++-------- app/Http/Resources/FullCVCollection.php | 7 +++---- app/Http/Resources/ProjectCollection.php | 11 ++++------- app/Http/Resources/ProjectResource.php | 12 +++--------- resources/js/Pages/CV/Index.vue | 6 ------ 6 files changed, 15 insertions(+), 40 deletions(-) diff --git a/app/Http/Resources/CategoryCollection.php b/app/Http/Resources/CategoryCollection.php index 793b953..0377781 100644 --- a/app/Http/Resources/CategoryCollection.php +++ b/app/Http/Resources/CategoryCollection.php @@ -1,17 +1,13 @@ collection); diff --git a/app/Http/Resources/CategoryResource.php b/app/Http/Resources/CategoryResource.php index 08bf381..81ddd13 100644 --- a/app/Http/Resources/CategoryResource.php +++ b/app/Http/Resources/CategoryResource.php @@ -1,21 +1,16 @@ $this->id, diff --git a/app/Http/Resources/FullCVCollection.php b/app/Http/Resources/FullCVCollection.php index ab49796..6a8fd0e 100644 --- a/app/Http/Resources/FullCVCollection.php +++ b/app/Http/Resources/FullCVCollection.php @@ -4,14 +4,13 @@ declare(strict_types=1); namespace App\Http\Resources; +use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\ResourceCollection; class FullCVCollection extends ResourceCollection { - public function toArray($request): array + public function toArray($request): array|JsonResource { - return [ - 'data' => $this->collection, - ]; + return FullCVResource::collection($this->collection); } } diff --git a/app/Http/Resources/ProjectCollection.php b/app/Http/Resources/ProjectCollection.php index 0361d9a..6cc4f23 100644 --- a/app/Http/Resources/ProjectCollection.php +++ b/app/Http/Resources/ProjectCollection.php @@ -1,18 +1,15 @@ collection); } diff --git a/app/Http/Resources/ProjectResource.php b/app/Http/Resources/ProjectResource.php index 01fd678..6b1225d 100644 --- a/app/Http/Resources/ProjectResource.php +++ b/app/Http/Resources/ProjectResource.php @@ -1,21 +1,16 @@ $this->id, @@ -30,5 +25,4 @@ class ProjectResource extends JsonResource 'description' => $this->description, ]; } - } diff --git a/resources/js/Pages/CV/Index.vue b/resources/js/Pages/CV/Index.vue index 28c9316..3824e76 100644 --- a/resources/js/Pages/CV/Index.vue +++ b/resources/js/Pages/CV/Index.vue @@ -68,12 +68,6 @@ function copySlug(slug) { {{ cv.locations.join(' / ') }} {{ cv.phone.formattedNumber }} -