diff --git a/app/Http/Controllers/BeerController.php b/app/Http/Controllers/BeerController.php index 1e28c41..c251364 100644 --- a/app/Http/Controllers/BeerController.php +++ b/app/Http/Controllers/BeerController.php @@ -37,6 +37,6 @@ class BeerController extends Controller $beer->save(); - return redirect('/profile'); + return back()->with('success', 'Beer added!'); } } diff --git a/app/Http/Controllers/BeerListController.php b/app/Http/Controllers/BeerListController.php index cbba8ee..2794a23 100644 --- a/app/Http/Controllers/BeerListController.php +++ b/app/Http/Controllers/BeerListController.php @@ -33,7 +33,7 @@ class BeerListController extends Controller $list->save(); - return redirect('/profile'); + return redirect("/list/" . $list->id); } public function addItem(Request $request, $id) @@ -41,8 +41,8 @@ class BeerListController extends Controller $beerId = $request->beer; $list = BeerList::findOrFail($id); - // $list->beer()->attach($beerId); + $list->beer()->attach($beerId); - dd($list->beer()); + return redirect("/list/" . $list->id); } } diff --git a/app/Models/Beer.php b/app/Models/Beer.php index 66c1a01..fa81afe 100644 --- a/app/Models/Beer.php +++ b/app/Models/Beer.php @@ -11,6 +11,6 @@ class Beer extends Model public function list() { - return $this->belongsToMany(BeerList::class, 'beer_list_pivot', 'list_id', 'beer_id'); + return $this->belongsToMany(BeerList::class, 'beer_list_pivot', 'beer_id', 'list_id'); } } diff --git a/app/Models/BeerList.php b/app/Models/BeerList.php index 1eb7742..1813144 100644 --- a/app/Models/BeerList.php +++ b/app/Models/BeerList.php @@ -21,6 +21,7 @@ class BeerList extends Model public function beer() { - return $this->belongsToMany(Beer::class, 'beer_list_pivot', 'beer_id', 'list_id'); + return $this->belongsToMany(Beer::class, 'beer_list_pivot', 'list_id', 'beer_id') + ->withTimestamps(); } } diff --git a/database/migrations/2021_09_04_231021_beer_list_pivot.php b/database/migrations/2021_09_04_231021_beer_list_pivot.php index 876df07..3db1af8 100644 --- a/database/migrations/2021_09_04_231021_beer_list_pivot.php +++ b/database/migrations/2021_09_04_231021_beer_list_pivot.php @@ -16,7 +16,8 @@ class BeerListPivot extends Migration Schema::create('beer_list_pivot', function (Blueprint $table) { $table->id(); $table->foreignId('beer_id')->constrained(); - $table->foreignId('list_id')->constrained(); + $table->foreignId('list_id')->constrained('beer_lists'); + $table->timestamps(); }); } diff --git a/resources/views/beer/create.blade.php b/resources/views/beer/create.blade.php index 0d0523b..6e447fd 100644 --- a/resources/views/beer/create.blade.php +++ b/resources/views/beer/create.blade.php @@ -23,7 +23,10 @@ - < - + + < + @if (session()->has('success')) +

{{ session()->get('success') }}

+ @endif @endsection diff --git a/resources/views/list/show.blade.php b/resources/views/list/show.blade.php index 99e9a2e..e8cd9d9 100644 --- a/resources/views/list/show.blade.php +++ b/resources/views/list/show.blade.php @@ -1,33 +1,70 @@ @extends('layouts.app') @section('content') - {{ $list->title }} + {{ $list->title }} -
- @csrf - + + @foreach ($beers as $beer) + + @endforeach + + +
+ + + + + + + + + + @foreach ($list->beer as $beer) + + + + + + @endforeach - - - - - Can't find your beer? - + + +
+ Beer + + Rating + + Country + + Type +
{{ $beer->beer }} -

-
-

- Rating: {{ $beer->rating }} -

- - +
+ {{ $beer->rating }} + + {{ $beer->country }} + + {{ $beer->type }} +
+ + + Can't find your beer? + @endsection