wip on bugfix

code4romania · Nov 24, 2023 · 8e35cae · 8e35cae
1 parent 43c1f14
commit 8e35cae
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -21,6 +21,7 @@
 /storage/framework/testing/*
 /storage/framework/views/*
 /storage/logs/*
+/.scannerwork
 /vendor
 _ide_helper_models.php
 _ide_helper.php

diff --git a/app/Console/Commands/Import/Command.php b/app/Console/Commands/Import/Command.php
@@ -136,7 +136,7 @@ public function parseDate(?string $input): ?Carbon
         return Carbon::createFromFormat('M d Y H:i:s:A', $input);
     }
 
-    public function mapCounty($oldCountyId): int
+    public function mapCounty(int $oldCountyId): int
     {
         $countiesMap = [
             1 => 1,//Alba

diff --git a/app/Console/Commands/Import/ImportProjectsCommand.php b/app/Console/Commands/Import/ImportProjectsCommand.php
@@ -116,7 +116,9 @@ protected function importProjects(): void
                             'end' => $this->parseDate($row->EndDate),
                             'accepting_volunteers' => (bool) $row->HasVolunteering,
                             'accepting_comments' => (bool) $row->AcceptComments,
-                            //                            'why_donate' => Sanitize::text($row->WhyDonate),
+                            'reason_to_donate' => Sanitize::text($row->WhyDonate),
+                            'scope' => Sanitize::text($row->ProjectPurpose),
+                            'beneficiaries' => Sanitize::text($row->ToWhomDoIDonate),
 
                             'created_at' => $created_at,
                             'updated_at' => $created_at,
@@ -132,8 +134,11 @@ protected function importProjects(): void
                         ]);
 
                         $project->categories()->attach($row->ProjectCategoryId);
+
                         $mappedCounties = collect(explode(',', $row->Counties ?? ''))
-                            ->map(fn ($county) => $this->mapCounty($county))->all();
+                            ->filter(fn (string $county) => $county !== '')
+                            ->map(fn (int $county) => $this->mapCounty($county))
+                            ->all();
                         $project->counties()->attach($mappedCounties);
 
                         if (! $this->option('skip-files')) {

diff --git a/app/Http/Resources/Project/ShowProjectResource.php b/app/Http/Resources/Project/ShowProjectResource.php
@@ -48,8 +48,6 @@ public function toArray(Request $request): array
                 return [
                     'src' => $media->getFullUrl(),
                     'thumbnail' => $media->getFullUrl('preview'),
-                    'w' => 1200,
-                    'h' => 800,
                 ];
             })->toArray(),
             'is_active' => $this->is_active,

diff --git a/resources/js/Pages/Public/Articles/Articles.vue b/resources/js/Pages/Public/Articles/Articles.vue
@@ -54,7 +54,7 @@
         </Carousel>
 
         <section class="container grid grid-cols-12 gap-12">
-            <div class="grid col-span-8 gap-10">
+            <div class="grid col-span-8 gap-10 mt-2">
                 <header v-if="!category">
                     <Head :title="$t('articles.index')" />
                     <h1 v-text="$t('articles.index')" class="text-3xl font-bold text-cyan-900" />

diff --git a/resources/js/Pages/Public/Articles/Show.vue b/resources/js/Pages/Public/Articles/Show.vue
@@ -12,7 +12,7 @@
             <div
                 class="inline-flex items-center justify-start px-3 py-1 mt-10 text-base font-semibold rounded-full cursor-pointer text-primary-500 bg-primary-50 gap-x-1"
             >
-                {{ resource.category.name }}
+                {{ resource.category }}
             </div>
 
             <div class="prose-sm prose max-w-none sm:prose-lg xl:prose-xl">