Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions app/Http/Controllers/V1/SuggestionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
namespace App\Http\Controllers\V1;

use App\Enums\SuggestionStatus;
use App\Enums\VoteType;
use App\Http\Controllers\Controller;
use App\Http\Requests\SuggestionRequest;
use App\Models\Suggestion;
Expand All @@ -31,25 +30,6 @@ public function store(Trip $trip, SuggestionRequest $suggestionRequest): Redirec
return redirect()->route('trips.show', ['trip' => $trip]);
}

/**
* This can and should be moved to its own controller
*
* one user can vote only once
*/
public function vote(Suggestion $suggestion, Request $request): RedirectResponse
{
$validated = $request->validate([
'type' => ['required', new Enum(VoteType::class)],
]);

$suggestion->vote()->updateOrCreate([
'user_id' => auth()->id(),
'suggestion_id' => $suggestion->id,
], $validated);

return redirect()->back();
}

/**
* updates status for a suggestion
*/
Expand Down
5 changes: 1 addition & 4 deletions app/Http/Controllers/V1/TripController.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,13 @@
use App\Models\Trip;
use App\Models\User;
use App\Repositories\Contracts\TripRepositoryContract;
use App\Repositories\TripRepository;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Facades\Cache;
use Illuminate\View\View;

class TripController extends Controller
{
/**
* @param TripRepository $trip
*/
public function __construct(
protected TripRepositoryContract $trip
) {}
Expand Down Expand Up @@ -93,6 +89,7 @@ public function update(TripRequest $tripRequest, Trip $trip): RedirectResponse

/**
* Caches users and retrieves them.
* this can be moved to a CacheService
*
* @return Collection<int, User>
*/
Expand Down
26 changes: 26 additions & 0 deletions app/Http/Controllers/VoteController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

namespace App\Http\Controllers;

use App\Enums\VoteType;
use App\Models\Suggestion;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Validation\Rules\Enum;

class VoteController extends Controller
{
public function vote(Suggestion $suggestion, Request $request): RedirectResponse
{
$validated = $request->validate([
'type' => ['required', new Enum(VoteType::class)],
]);

$suggestion->vote()->updateOrCreate([
'user_id' => auth()->id(),
'suggestion_id' => $suggestion->id,
], $validated);

return redirect()->back();
}
}
9 changes: 8 additions & 1 deletion resources/views/trips/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,14 @@

<div class="mt-4 flex flex-col">
@foreach($trips['owns'] as $trip)
<a href="{{ route('trips.show', $trip) }}" class="p-2 border-gray-500 border rounded hover:bg-gray-100 my-2">{{ $trip->title }}</a>
<a href="{{ route('trips.show', $trip) }}"
@class([
"p-2 border-gray-500 border rounded hover:bg-gray-100 my-2" => $trip->status === "active",
"p-2 opacity-50 border-gray-500 border rounded hover:bg-gray-100 my-2" => $trip->status === "completed"
])
class="p-2 border-gray-500 border rounded hover:bg-gray-100 my-2">{{ $trip->title }}
@if( $trip->status === "completed") - COMPLETED @endif
</a>
@endforeach
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use App\Http\Controllers\ProfileController;
use App\Http\Controllers\V1\SuggestionController;
use App\Http\Controllers\V1\TripController;
use App\Http\Controllers\VoteController;
use Illuminate\Support\Facades\Route;

Route::get('/', function () {
Expand Down Expand Up @@ -31,7 +32,7 @@
//
Route::middleware('can:view,suggestion.trip')->group(function () {
Route::get('/suggestions/{suggestion}/status', [SuggestionController::class, 'status'])->name('suggestions.status');
Route::get('/suggestions/{suggestion}/vote', [SuggestionController::class, 'vote'])->name('suggestions.vote');
Route::get('/suggestions/{suggestion}/vote', [VoteController::class, 'vote'])->name('suggestions.vote');
});

// They can update the trips
Expand Down