From cfa8b0b7d24b6a4d6e84c0362e6d056ca47dcbdd Mon Sep 17 00:00:00 2001 From: Lupu Gheorghe Date: Mon, 16 Oct 2023 14:59:36 +0300 Subject: [PATCH] fix stasuse in front --- .../Resources/Project/EditProjectResource.php | 5 +-- app/Http/Resources/ProjectCardResource.php | 1 + lang/ro.json | 2 + resources/js/Components/cards/ProjectCard.vue | 44 ++++++++++++------- 4 files changed, 33 insertions(+), 19 deletions(-) diff --git a/app/Http/Resources/Project/EditProjectResource.php b/app/Http/Resources/Project/EditProjectResource.php index 617a3c07..f38e1c13 100644 --- a/app/Http/Resources/Project/EditProjectResource.php +++ b/app/Http/Resources/Project/EditProjectResource.php @@ -13,7 +13,6 @@ class EditProjectResource extends Resource public function toArray(Request $request): array { - return [ 'id' => $this->id, // 'type' => $this->type, @@ -39,8 +38,8 @@ public function toArray(Request $request): array 'description' => $this->description ?? '', 'scope' => $this->scope ?? '', 'reason_to_donate' => $this->reason_to_donate ?? '', - 'accepting_volunteers' =>$this->accepting_volunteers ? __('field.boolean.true'): __('field.boolean.false'), - 'accepting_comments' => $this->accepting_comments ? __('field.boolean.true'): __('field.boolean.false'), + 'accepting_volunteers' => $this->accepting_volunteers ? __('field.boolean.true') : __('field.boolean.false'), + 'accepting_comments' => $this->accepting_comments ? __('field.boolean.true') : __('field.boolean.false'), 'videos' => '', 'external_links' => $this->external_links, 'counties' => $this->counties->pluck('id')->toArray(), diff --git a/app/Http/Resources/ProjectCardResource.php b/app/Http/Resources/ProjectCardResource.php index 2cace0f5..40dbeab6 100644 --- a/app/Http/Resources/ProjectCardResource.php +++ b/app/Http/Resources/ProjectCardResource.php @@ -33,6 +33,7 @@ public function toArray(Request $request): array 'is_pending' => $this->is_pending, 'is_ending_soon' => $this->is_ending_soon, 'is_draft' => $this->is_draft, + 'is_starting_soon' => $this->isStartingSoon(), 'can_be_archived' => $this->can_be_archived, 'championship' => [ 'troffees_count' => 2, diff --git a/lang/ro.json b/lang/ro.json index c85bdab2..e9c92e3b 100644 --- a/lang/ro.json +++ b/lang/ro.json @@ -189,6 +189,8 @@ "range": "Aria de acoperire", "project_ends": "Se incheie in", "project_ending_soon": "Se încheie curând", + "project_starting_soon": "Se deschide in curând", + "project_active": "Proiect activ", "days": "zile", "donate_to_project": "Donează către proiectul", "donate_form_intro": "Completează datele de mai jos pentru a face donația", diff --git a/resources/js/Components/cards/ProjectCard.vue b/resources/js/Components/cards/ProjectCard.vue index 56f1ed68..bd0c8562 100644 --- a/resources/js/Components/cards/ProjectCard.vue +++ b/resources/js/Components/cards/ProjectCard.vue @@ -21,27 +21,39 @@ - -
- - - - - - -
- + + + + + + + + + + + + + + + + + + +