From fe47b79a25ef48c00c9b61834cd2bbc62a7f8b4e Mon Sep 17 00:00:00 2001 From: Roberto Date: Wed, 3 Jun 2026 21:57:10 +0200 Subject: [PATCH] Fix controller cleanup issues --- app/Http/Controllers/EducationController.php | 5 ----- app/Http/Controllers/PersonaliaController.php | 7 +++---- app/Http/Controllers/SkillController.php | 7 ------- app/Http/Controllers/WorkExperienceController.php | 7 ------- resources/images/sitiweb.svg | 2 ++ resources/views/welcome.blade.php | 2 +- routes/web.php | 8 ++++---- .../Feature/Controllers/FrontendControllerTest.php | 2 +- .../Controllers/PersonaliaControllerTest.php | 13 +++++++------ 9 files changed, 18 insertions(+), 35 deletions(-) create mode 100644 resources/images/sitiweb.svg diff --git a/app/Http/Controllers/EducationController.php b/app/Http/Controllers/EducationController.php index fa454c6..58e7bbe 100644 --- a/app/Http/Controllers/EducationController.php +++ b/app/Http/Controllers/EducationController.php @@ -29,11 +29,6 @@ class EducationController extends Controller return redirect()->route('educations.index')->with('success', 'Opleiding toegevoegd.'); } - public function show(Education $education) - { - return view('educations.show', compact('education')); - } - public function edit(Education $education) { return view('educations.edit', compact('education')); diff --git a/app/Http/Controllers/PersonaliaController.php b/app/Http/Controllers/PersonaliaController.php index 9f3cb6b..fcba299 100644 --- a/app/Http/Controllers/PersonaliaController.php +++ b/app/Http/Controllers/PersonaliaController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers; use App\Models\Personalia; -use Illuminate\Http\Request; use App\Http\Requests\PersonaliaRequest; class PersonaliaController extends Controller @@ -38,7 +37,7 @@ class PersonaliaController extends Controller return view('personalia.edit', ['personalia' => $personalium]); } - public function update(Request $request, Personalia $personalium) + public function update(PersonaliaRequest $request, Personalia $personalium) { $validated = $request->validated(); @@ -49,9 +48,9 @@ class PersonaliaController extends Controller return redirect()->route('personalia.index')->with('success', 'Persoonlijk item bijgewerkt.'); } - public function destroy(Personalia $personalia) + public function destroy(Personalia $personalium) { - $personalia->delete(); + $personalium->delete(); return redirect()->route('personalia.index')->with('success', 'Persoonlijk item verwijderd.'); } diff --git a/app/Http/Controllers/SkillController.php b/app/Http/Controllers/SkillController.php index 6a647bb..0ac335f 100644 --- a/app/Http/Controllers/SkillController.php +++ b/app/Http/Controllers/SkillController.php @@ -3,10 +3,8 @@ namespace App\Http\Controllers; use App\Models\Skill; -use Illuminate\Http\Request; use App\Http\Requests\SkillRequest; - class SkillController extends Controller { public function index() @@ -31,11 +29,6 @@ class SkillController extends Controller return redirect()->route('skills.index')->with('success', 'Vaardigheid toegevoegd.'); } - public function show(Skill $skill) - { - return view('skills.show', compact('skill')); - } - public function edit(Skill $skill) { return view('skills.edit', compact('skill')); diff --git a/app/Http/Controllers/WorkExperienceController.php b/app/Http/Controllers/WorkExperienceController.php index e6d03b5..b8d7997 100644 --- a/app/Http/Controllers/WorkExperienceController.php +++ b/app/Http/Controllers/WorkExperienceController.php @@ -3,10 +3,8 @@ namespace App\Http\Controllers; use App\Models\WorkExperience; -use Illuminate\Http\Request; use App\Http\Requests\WorkExperienceRequest; - class WorkExperienceController extends Controller { public function index() @@ -32,11 +30,6 @@ class WorkExperienceController extends Controller return redirect()->route('work-experiences.index')->with('success', 'Ervaring toegevoegd.'); } - public function show(WorkExperience $workExperience) - { - return view('work_experiences.show', compact('workExperience')); - } - public function edit(WorkExperience $workExperience) { return view('work_experiences.edit', compact('workExperience')); diff --git a/resources/images/sitiweb.svg b/resources/images/sitiweb.svg new file mode 100644 index 0000000..e9eee5b --- /dev/null +++ b/resources/images/sitiweb.svg @@ -0,0 +1,2 @@ + +image/svg+xml diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 5551dd0..527e632 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -134,7 +134,7 @@ © {{ date('Y') }} Roberto Guagliardo. Alle rechten voorbehouden.
- {!! file_get_contents(public_path('storage/sitiweb.svg')) !!} + {!! file_get_contents(resource_path('images/sitiweb.svg')) !!}
diff --git a/routes/web.php b/routes/web.php index 910b6ac..f785310 100644 --- a/routes/web.php +++ b/routes/web.php @@ -19,10 +19,10 @@ Route::middleware('auth')->group(function () { Route::patch('/profile', [ProfileController::class, 'update'])->name('profile.update'); Route::delete('/profile', [ProfileController::class, 'destroy'])->name('profile.destroy'); - Route::resource('work-experiences', \App\Http\Controllers\WorkExperienceController::class); - Route::resource('skills', SkillController::class); - Route::resource('personalia', PersonaliaController::class); - Route::resource('educations', EducationController::class); + Route::resource('work-experiences', \App\Http\Controllers\WorkExperienceController::class)->except(['show']); + Route::resource('skills', SkillController::class)->except(['show']); + Route::resource('personalia', PersonaliaController::class)->except(['show']); + Route::resource('educations', EducationController::class)->except(['show']); }); diff --git a/tests/Feature/Controllers/FrontendControllerTest.php b/tests/Feature/Controllers/FrontendControllerTest.php index ce41a8d..355568e 100644 --- a/tests/Feature/Controllers/FrontendControllerTest.php +++ b/tests/Feature/Controllers/FrontendControllerTest.php @@ -41,7 +41,7 @@ test('the homepage shows the public cv data', function () { ->assertViewHas('personalia', fn ($personalia) => $personalia->contains($personalium)) ->assertViewHas('education', fn ($educations) => $educations->contains($education)) ->assertViewHas('experience', fn ($experiences) => $experiences->contains($experience)); -})->skip('Homepage currently depends on missing public/storage/sitiweb.svg.'); +}); test('a hidden personalia value can be requested and the click is queued for notification', function () { Queue::fake(); diff --git a/tests/Feature/Controllers/PersonaliaControllerTest.php b/tests/Feature/Controllers/PersonaliaControllerTest.php index 2a82461..0184cbe 100644 --- a/tests/Feature/Controllers/PersonaliaControllerTest.php +++ b/tests/Feature/Controllers/PersonaliaControllerTest.php @@ -88,11 +88,12 @@ test('an authenticated user can update personalia', function () { ->assertSessionHasNoErrors() ->assertRedirect(route('personalia.index')); - expect($personalium->refresh()) - ->value->toBe('new@example.com') - ->hidden->toBeFalse() - ->icon->toBe('fa-regular fa-envelope'); -})->skip('PersonaliaController::update currently uses Request instead of PersonaliaRequest.'); + $personalium->refresh(); + + expect($personalium->value)->toBe('new@example.com'); + expect($personalium->hidden)->toBeFalse(); + expect($personalium->icon)->toBe('fa-regular fa-envelope'); +}); test('an authenticated user can delete personalia', function () { $user = User::factory()->create(); @@ -104,4 +105,4 @@ test('an authenticated user can delete personalia', function () { ->assertRedirect(route('personalia.index')); $this->assertDatabaseMissing('personalia', ['id' => $personalium->id]); -})->skip('PersonaliaController::destroy currently does not match the resource route parameter binding.'); +});