From 2f5ad521e274b38d7e5304514f533348bced523e Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Sun, 11 Nov 2018 22:58:35 +0800 Subject: [PATCH] Update UserMarriages and HomeController --- app/Http/Controllers/HomeController.php | 9 ++++----- app/Http/Controllers/UserMarriagesController.php | 11 +++++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index a100cb3..8abe910 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers; use App\User; -use Illuminate\Http\Request; class HomeController extends Controller { @@ -20,7 +19,7 @@ class HomeController extends Controller /** * Show the application dashboard. * - * @return \Illuminate\Http\Response + * @return \Illuminate\Contracts\View\View */ public function index() { @@ -35,10 +34,10 @@ class HomeController extends Controller $femalePersonList = User::where('gender_id', 2)->pluck('nickname', 'id'); return view('users.show', [ - 'user' => $user, + 'user' => $user, 'usersMariageList' => $usersMariageList, - 'malePersonList' => $malePersonList, - 'femalePersonList' => $femalePersonList + 'malePersonList' => $malePersonList, + 'femalePersonList' => $femalePersonList, ]); } } diff --git a/app/Http/Controllers/UserMarriagesController.php b/app/Http/Controllers/UserMarriagesController.php index adf6e0a..fcdfe9e 100644 --- a/app/Http/Controllers/UserMarriagesController.php +++ b/app/Http/Controllers/UserMarriagesController.php @@ -3,13 +3,20 @@ namespace App\Http\Controllers; use App\User; -use Illuminate\Http\Request; class UserMarriagesController extends Controller { + /** + * Show user marriage list. + * + * @param \App\User $user + * @return \Illuminate\View\View + */ public function index(User $user) { - $marriages = $user->marriages()->with('husband', 'wife')->withCount('childs')->get(); + $marriages = $user->marriages()->with('husband', 'wife') + ->withCount('childs')->get(); + return view('users.marriages', compact('user', 'marriages')); } }