diff --git a/app/Http/Controllers/Bo/PictosController.php b/app/Http/Controllers/Bo/PictosController.php index 472e1a8..ad82063 100644 --- a/app/Http/Controllers/Bo/PictosController.php +++ b/app/Http/Controllers/Bo/PictosController.php @@ -42,6 +42,9 @@ class PictosController extends Controller public function store(StorePictoRequest $request) { $picto = new Picto($request->validated()); + if (is_a($request->picture,"SplFileInfo")) { + $picto->picture = Utils::storeImage($request->picture, $picto->getTable()); + } $picto->page = Page::marqueBloc2(); if (!$picto->saveOrFail()) { @@ -72,6 +75,9 @@ class PictosController extends Controller public function update(Picto $picto, StorePictoRequest $request) { $picto->fill($request->validated()); + if (is_a($request->picture,"SplFileInfo")) { + $picto->picture = Utils::storeImage($request->picture, $picto->getTable()); + } if (!$picto->saveOrFail()) { return redirect()->route('bo.pictos.edit', $picto->id) @@ -91,9 +97,9 @@ class PictosController extends Controller public function destroy(Picto $picto) { if (!$picto->delete()) { - return redirect()->route('bo.pictos.index')->with('error', trans('La suppression a échoué')); + return redirect()->route('bo.pictos.content', $picto->page)->with('error', trans('La suppression a échoué')); } - return redirect()->route('bo.pictos.index')->with('success', trans('Suppression faite avec succès')); + return redirect()->route('bo.pictos.content', $picto->page)->with('success', trans('Suppression faite avec succès')); } } diff --git a/app/Models/Picto.php b/app/Models/Picto.php index db8347f..c30a342 100644 --- a/app/Models/Picto.php +++ b/app/Models/Picto.php @@ -4,15 +4,15 @@ namespace App\Models; use App\Enums\Page; use App\Lib\Utils; +use App\Traits\CastsEnumsHasTranslations; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\File; -use Kwaadpepper\Enum\Traits\CastsEnums; class Picto extends Model { use HasFactory; - use CastsEnums; + use CastsEnumsHasTranslations; public $enumCasts = [ 'page' => Page::class @@ -24,16 +24,22 @@ class Picto extends Model 'text', ]; + public $translatable = [ + 'picture', + 'alt_text_picture', + 'text', + ]; + protected static function boot() { static::creating(function (Picto $picto) { - if ($picto->picture) { + if (is_a($picto->picture,"SplFileInfo")) { $picto->picture = Utils::storeImage($picto->picture, $picto->getTable()); } }); static::updating(function (Picto $picto) { - if ($picto->picture) { + if (is_a($picto->picture,"SplFileInfo")) { $picto->picture = Utils::storeImage($picto->picture, $picto->getTable()); } }); diff --git a/database/factories/PictoFactory.php b/database/factories/PictoFactory.php index b53795d..d35ebb4 100644 --- a/database/factories/PictoFactory.php +++ b/database/factories/PictoFactory.php @@ -2,6 +2,8 @@ namespace Database\Factories; +use App\Lib\Utils; +use App\Models\Picto; use Illuminate\Database\Eloquent\Factories\Factory; use SplFileInfo; @@ -22,8 +24,12 @@ class PictoFactory extends Factory */ public function definition() { + $upload = new SplFileInfo(resource_path('assets/images/qualite.png')); + $picto = new Picto(); + $imgpath = Utils::storeImage($upload, $picto->getTable()); + return [ - 'picture' => new SplFileInfo(resource_path('assets/images/qualite.png')), + 'picture' => $imgpath, 'alt_text_picture' => $this->faker->sentence(10), 'text' => $this->faker->text(10), ]; diff --git a/database/seeders/PictosSeeder.php b/database/seeders/PictosSeeder.php index 0c9c45a..80c89d5 100644 --- a/database/seeders/PictosSeeder.php +++ b/database/seeders/PictosSeeder.php @@ -3,6 +3,7 @@ namespace Database\Seeders; use App\Enums\Page; +use App\Lib\Utils; use App\Models\Picto; use Illuminate\Database\Seeder; use SplFileInfo; @@ -21,11 +22,15 @@ class PictosSeeder extends Seeder Page::foodBloc2() ]; + $upload = new SplFileInfo(resource_path('assets/images/qualite.png')); + $picto = new Picto(); + $imgpath = Utils::storeImage($upload, $picto->getTable()); + foreach ($tabEncarts as $key => $value) { for ($i = 0; $i < 5; $i++) { $picto = new Picto(); $picto->page = $value; - $picto->picture = new SplFileInfo(resource_path('assets/images/qualite.png')); + $picto->picture = $imgpath; $picto->alt_text_picture = 'lorem ipsum set doloris at em gorbicus'; $picto->text = 'lorem ipsum set doloris'; $picto->save(); diff --git a/resources/views/back/pictos/create.blade.php b/resources/views/back/pictos/create.blade.php index e9198c1..f437e67 100644 --- a/resources/views/back/pictos/create.blade.php +++ b/resources/views/back/pictos/create.blade.php @@ -5,7 +5,7 @@ @csrf