feat: implement traits on models and resources and final adjusts

eng-gabrielscardoso · Jun 30, 2024 · 6c50475 · 6c50475
1 parent 111866b
commit 6c50475
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 15 deletions.
diff --git a/app/Filament/Resources/EducationResource.php b/app/Filament/Resources/EducationResource.php
@@ -3,6 +3,7 @@
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\EducationResource\Pages;
+use App\Support\UsesMonthYearDates;
 use App\Models\Education;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -14,6 +15,8 @@
 
 class EducationResource extends Resource
 {
+    use UsesMonthYearDates;
+
     protected static ?string $model = Education::class;
 
     protected static ?string $navigationIcon = 'heroicon-o-academic-cap';
@@ -44,8 +47,12 @@ public static function form(Form $form): Form
                     ->maxLength(1000)
                     ->columnSpanFull(),
                 Forms\Components\DatePicker::make('start_date')
-                    ->required(),
-                Forms\Components\DatePicker::make('end_date'),
+                    ->required()
+                    ->native(false)
+                    ->displayFormat('m/Y'),
+                Forms\Components\DatePicker::make('end_date')
+                    ->native(false)
+                    ->displayFormat('m/Y'),
             ]);
     }
 

diff --git a/app/Filament/Resources/ExperienceResource.php b/app/Filament/Resources/ExperienceResource.php
@@ -4,6 +4,7 @@
 
 use App\Enums\EmploymentType;
 use App\Filament\Resources\ExperienceResource\Pages;
+use App\Support\UsesMonthYearDates;
 use App\Models\Experience;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -15,6 +16,8 @@
 
 class ExperienceResource extends Resource
 {
+    use UsesMonthYearDates;
+
     protected static ?string $model = Experience::class;
 
     protected static ?string $navigationIcon = 'heroicon-o-briefcase';
@@ -45,8 +48,12 @@ public static function form(Form $form): Form
                     ->maxLength(1024)
                     ->columnSpanFull(),
                 Forms\Components\DatePicker::make('start_date')
-                    ->required(),
-                Forms\Components\DatePicker::make('end_date'),
+                    ->required()
+                    ->native(false)
+                    ->displayFormat('m/Y'),
+                Forms\Components\DatePicker::make('end_date')
+                    ->native(false)
+                    ->displayFormat('m/Y'),
             ]);
     }
 

diff --git a/app/Filament/Resources/ProjectResource.php b/app/Filament/Resources/ProjectResource.php
@@ -3,6 +3,7 @@
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\ProjectResource\Pages;
+use App\Support\UsesMonthYearDates;
 use App\Models\Project;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -17,6 +18,8 @@
 
 class ProjectResource extends Resource
 {
+    use UsesMonthYearDates;
+
     protected static ?string $model = Project::class;
 
     protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
@@ -44,8 +47,12 @@ public static function form(Form $form): Form
                     ->maxLength(1024)
                     ->columnSpanFull(),
                 Forms\Components\DatePicker::make('start_date')
-                    ->required(),
-                Forms\Components\DatePicker::make('end_date'),
+                    ->required()
+                    ->native(false)
+                    ->displayFormat('m/Y'),
+                Forms\Components\DatePicker::make('end_date')
+                    ->native(false)
+                    ->displayFormat('m/Y'),
                 Forms\Components\FileUpload::make('image')
                     ->required()
                     ->directory('projects')

diff --git a/app/Models/Education.php b/app/Models/Education.php
@@ -2,13 +2,14 @@
 
 namespace App\Models;
 
+use App\Support\HasMonthYearDates;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Education extends Model
 {
-    use HasFactory, SoftDeletes;
+    use HasFactory, HasMonthYearDates, SoftDeletes;
 
     /**
      * The attributes that are mass assignable.

diff --git a/app/Models/Experience.php b/app/Models/Experience.php
@@ -3,13 +3,14 @@
 namespace App\Models;
 
 use App\Enums\EmploymentType;
+use App\Support\HasMonthYearDates;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Experience extends Model
 {
-    use HasFactory, SoftDeletes;
+    use HasFactory, HasMonthYearDates, SoftDeletes;
 
     /**
      * The attributes that are mass assignable.

diff --git a/app/Models/Project.php b/app/Models/Project.php
@@ -2,13 +2,14 @@
 
 namespace App\Models;
 
+use App\Support\HasMonthYearDates;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Project extends Model
 {
-    use HasFactory, SoftDeletes;
+    use HasFactory, HasMonthYearDates, SoftDeletes;
 
     /**
      * The attributes that are mass assignable.

diff --git a/app/helpers.php b/app/helpers.php
@@ -0,0 +1 @@
+<?php
diff --git a/composer.json b/composer.json
@@ -40,7 +40,10 @@
     "autoload-dev": {
         "psr-4": {
             "Tests\\": "tests/"
-        }
+        },
+        "files": [
+            "app/helpers.php"
+        ]
     },
     "scripts": {
         "post-autoload-dump": [
@@ -82,4 +85,4 @@
     "minimum-stability": "stable",
     "prefer-stable": true,
     "version": "0.0.1"
-}
+}
diff --git a/resources/views/components/home/educations.blade.php b/resources/views/components/home/educations.blade.php
@@ -8,7 +8,10 @@
                 <div class="card-body h-80 md:h-64">
                     <strong class="card-title">{{ $education->course }}</strong>
                     <i>{{ $education->degree }}</i>
-                    <span><b class="text-accent">{{ $education->school }}</b> | {{ $education->start_date }} to {{ $education->end_date ?? 'Present' }}</span>
+                    <span>
+                        <b class="text-accent">{{ $education->school }}</b> | {{ $education->start_date->format('M Y') }} to
+                        {{ $education->end_date ? $education->end_date->format('M Y') : 'Present' }}
+                    </span>
                     <br>
                     <p class="overflow-y-scroll">{{ $education->description }}</p>
                 </div>

diff --git a/resources/views/components/home/experiences.blade.php b/resources/views/components/home/experiences.blade.php
@@ -8,7 +8,7 @@
                 <div class="card-body h-80 md:h-64">
                     <strong class="card-title">{{ $experience->title }}</strong>
                     <i>{{ $experience->company }}</i>
-                    <span><b class="text-accent">{!! $experience->employment_type->getLabel() !!}</b> | {{ $experience->start_date }} to {{ $experience->end_date ?? 'Present' }}</span>
+                    <span><b class="text-accent">{!! $experience->employment_type->getLabel() !!}</b> | {{ $experience->start_date->format('M Y') }} to {{ $experience->end_date ? $experience->end_date->format('M Y') : 'Present' }}</span>
                     <br>
                     <p class="overflow-y-scroll">{{ $experience->description }}</p>
                 </div>

diff --git a/resources/views/components/home/headline.blade.php b/resources/views/components/home/headline.blade.php
@@ -1,7 +1,7 @@
 <div class="relative px-4 h-full min-h-screen w-full flex items-center justify-center bg-home-hero bg-cover bg-center">
     <article class="prose lg:prose-xl text-center">
         <div class="avatar">
-            <figure class="w-60 h-60 relative rounded-full ring ring-primary ring-offset-base-100 ring-offset-2 rounded-full">
+            <figure class="w-60 h-60 relative rounded-full ring ring-primary ring-offset-base-100 ring-offset-2">
                 <span class="absolute top-0 right-16 w-4 h-4 rounded-full bg-success animate-pulse"></span>
                 <img src="https://pt.gravatar.com/userimage/199484219/012c5298d952c34d6699a3d280e3a4f3.png?size=350" class="rounded-full" />
             </figure>

diff --git a/resources/views/projects.blade.php b/resources/views/projects.blade.php
@@ -4,7 +4,7 @@ class="p-4 h-full min-h-screen w-full flex flex-col items-center justify-center
         <article class="prose lg:prose-xl text-center">
             <div class="avatar">
                 <figure
-                    class="w-60 h-60 relative rounded-full ring ring-primary ring-offset-base-100 ring-offset-2 rounded-full">
+                    class="w-60 h-60 relative rounded-full ring ring-primary ring-offset-base-100 ring-offset-2">
                     <span class="absolute top-0 right-16 w-4 h-4 rounded-full bg-success animate-pulse"></span>
                     <img src="https://pt.gravatar.com/userimage/199484219/012c5298d952c34d6699a3d280e3a4f3.png?size=350"
                         class="rounded-full" />