diff --git a/app/Http/Controllers/ClosetController.php b/app/Http/Controllers/ClosetController.php index ec6c91d2..03f5f953 100644 --- a/app/Http/Controllers/ClosetController.php +++ b/app/Http/Controllers/ClosetController.php @@ -14,7 +14,6 @@ class ClosetController extends Controller public function index() { return view('user.closet') - ->with('user', Auth::user()) ->with('extra', ['unverified' => option('require_verification') && ! $user->verified]); } diff --git a/app/Http/Controllers/PlayerController.php b/app/Http/Controllers/PlayerController.php index 71b2c637..3a88539e 100644 --- a/app/Http/Controllers/PlayerController.php +++ b/app/Http/Controllers/PlayerController.php @@ -52,11 +52,7 @@ class PlayerController extends Controller public function index() { - $user = Auth::user(); - return view('user.player') - ->with('players', $user->players->toArray()) - ->with('user', $user) ->with('extra', [ 'rule' => trans('user.player.player-name-rule.'.option('player_name_rule')), 'length' => trans( diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 7638fafe..2efeb307 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -40,11 +40,6 @@ class ReportController extends Controller return json(trans('skinlib.report.success'), 0); } - public function viewTrack() - { - return view('user.report', ['user' => auth()->user()]); - } - public function track() { return Report::where('reporter', auth()->id()) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 81d50059..b64c3c02 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -32,7 +32,6 @@ class UserController extends Controller $user = Auth::user(); return view('user.index')->with([ - 'user' => $user, 'statistics' => [ 'players' => $this->calculatePercentageUsed($user->players->count(), option('score_per_player')), 'storage' => $this->calculatePercentageUsed($user->getStorageUsed(), option('score_per_storage')), @@ -160,7 +159,6 @@ class UserController extends Controller { $user = Auth::user(); return view('user.profile') - ->with('user', $user) ->with('extra', [ 'unverified' => option('require_verification') && ! $user->verified, 'admin' => $user->isAdmin(), diff --git a/resources/views/user/master.blade.php b/resources/views/user/master.blade.php index 82c8880c..10aa2d86 100644 --- a/resources/views/user/master.blade.php +++ b/resources/views/user/master.blade.php @@ -14,6 +14,10 @@ @yield('style') +@php + $user = auth()->user(); +@endphp +
diff --git a/routes/web.php b/routes/web.php index 705533f6..3f5a4d01 100644 --- a/routes/web.php +++ b/routes/web.php @@ -49,7 +49,7 @@ Route::group([ Route::get('/score-info', 'UserController@scoreInfo'); Route::post('/sign', 'UserController@sign'); - Route::get('/reports', 'ReportController@viewTrack'); + Route::view('/reports', 'user.report'); Route::get('/report-list', 'ReportController@track'); // Profile diff --git a/tests/ClosetControllerTest.php b/tests/ClosetControllerTest.php index e1ba75e4..9bbcc4f7 100644 --- a/tests/ClosetControllerTest.php +++ b/tests/ClosetControllerTest.php @@ -24,7 +24,7 @@ class ClosetControllerTest extends TestCase public function testIndex() { - $this->get('/user/closet')->assertViewHas('user'); + $this->get('/user/closet')->assertViewIs('user.closet'); } public function testGetClosetData() diff --git a/tests/PlayerControllerTest.php b/tests/PlayerControllerTest.php index d8d2e063..5a40240e 100644 --- a/tests/PlayerControllerTest.php +++ b/tests/PlayerControllerTest.php @@ -21,9 +21,7 @@ class PlayerControllerTest extends TestCase public function testIndex() { - $this->get('/user/player?pid=5') - ->assertViewHas('players') - ->assertViewHas('user'); + $this->get('/user/player?pid=5')->assertViewIs('user.player'); } public function testListAll() diff --git a/tests/ReportControllerTest.php b/tests/ReportControllerTest.php index 3f5267ab..91677e60 100644 --- a/tests/ReportControllerTest.php +++ b/tests/ReportControllerTest.php @@ -71,12 +71,6 @@ class ReportControllerTest extends TestCase ]); } - public function testViewTrack() - { - $user = factory(User::class)->create(); - $this->actAs($user)->get('/user/reports')->assertViewIs('user.report'); - } - public function testTrack() { $user = factory(User::class)->create(); diff --git a/tests/UserControllerTest.php b/tests/UserControllerTest.php index acaae78b..dc10bce3 100644 --- a/tests/UserControllerTest.php +++ b/tests/UserControllerTest.php @@ -21,7 +21,6 @@ class UserControllerTest extends TestCase $this->actAs($user) ->get('/user') - ->assertViewHas('user') ->assertViewHas('statistics') ->assertSee((new Parsedown())->text(option_localized('announcement'))) ->assertSee((string) $user->score); @@ -200,9 +199,7 @@ class UserControllerTest extends TestCase public function testProfile() { - $this->actAs('normal') - ->get('/user/profile') - ->assertViewHas('user'); + $this->actAs('normal')->get('/user/profile')->assertViewIs('user.profile'); } public function testHandleProfile()