From 7820616b771fd0ff830b87bd02dfe10752c66c72 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Tue, 17 Jul 2018 17:17:31 +0800
Subject: [PATCH] use `Route::view` and `Route::redirect`

---
 app/Http/Controllers/AdminController.php  | 22 ----------------------
 app/Http/Controllers/PluginController.php | 15 ---------------
 routes/web.php                            | 18 +++++++++---------
 3 files changed, 9 insertions(+), 46 deletions(-)

diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 8d5b9dfb..eee9a325 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -232,17 +232,6 @@ class AdminController extends Controller
         return view('admin.options')->with('forms', compact('general', 'resources', 'announ'));
     }
 
-    /**
-     * Show Manage Page of Users.
-     *
-     * @param  Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function users(Request $request)
-    {
-        return view('admin.users');
-    }
-
     public function getUserData(Request $request)
     {
         $users = collect();
@@ -265,17 +254,6 @@ class AdminController extends Controller
         ->make(true);
     }
 
-    /**
-     * Show Manage Page of Players.
-     *
-     * @param  Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function players(Request $request)
-    {
-        return view('admin.players');
-    }
-
     public function getPlayerData(Request $request)
     {
         $players = collect();
diff --git a/app/Http/Controllers/PluginController.php b/app/Http/Controllers/PluginController.php
index 7961220f..56ef1760 100644
--- a/app/Http/Controllers/PluginController.php
+++ b/app/Http/Controllers/PluginController.php
@@ -11,21 +11,6 @@ use App\Services\PluginManager;
 
 class PluginController extends Controller
 {
-    /**
-     * @codeCoverageIgnore
-     */
-    public function showMarket()
-    {
-        return redirect('/')->setTargetUrl(
-            'https://github.com/printempw/blessing-skin-server/wiki/Plugins'
-        );
-    }
-
-    public function showManage()
-    {
-        return view('admin.plugins');
-    }
-
     public function config($name, Request $request)
     {
         $plugin = plugin($name);
diff --git a/routes/web.php b/routes/web.php
index 43d95ed6..079a477d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -23,7 +23,7 @@ Route::group(['prefix' => 'auth'], function ()
 {
     Route::group(['middleware' => 'guest'], function ()
     {
-        Route::get ('/login',     'AuthController@login');
+        Route::view('/login',     'auth.login');
         Route::get ('/register',  'AuthController@register');
         Route::get ('/forgot',    'AuthController@forgot');
         Route::get ('/reset',     'AuthController@reset');
@@ -63,7 +63,7 @@ Route::group(['middleware' => 'auth', 'prefix' => 'user'], function ()
     Route::post('/player/delete',        'PlayerController@delete');
 
     // Closet
-    Route::get ('/closet',               'ClosetController@index');
+    Route::view('/closet',               'ClosetController@index');
     Route::get ('/closet-data',          'ClosetController@getClosetData');
     Route::post('/closet/add',           'ClosetController@add');
     Route::post('/closet/remove',        'ClosetController@remove');
@@ -102,12 +102,12 @@ Route::group(['middleware' => 'admin', 'prefix' => 'admin'], function ()
     Route::any('/score',       'AdminController@score');
     Route::any('/options',     'AdminController@options');
 
-    Route::get('/users',       'AdminController@users');
-    Route::get('/user-data',   'AdminController@getUserData');
+    Route::view('/users',       'admin.users');
+    Route::get ('/user-data',   'AdminController@getUserData');
 
-    Route::get('/players',     'AdminController@players');
-    Route::get('/player-data', 'AdminController@getPlayerData');
-    Route::get('/user/{uid}',  'AdminController@getOneUser');
+    Route::view('/players',     'admin.players');
+    Route::get ('/player-data', 'AdminController@getPlayerData');
+    Route::get ('/user/{uid}',  'AdminController@getOneUser');
 
     // ajax handlers
     Route::post('/users',      'AdminController@userAjaxHandler');
@@ -115,9 +115,9 @@ Route::group(['middleware' => 'admin', 'prefix' => 'admin'], function ()
 
     Route::group(['prefix' => 'plugins'], function () {
         Route::get ('/data',   'PluginController@getPluginData');
-        Route::any ('/market', 'PluginController@showMarket');
+        Route::redirect('/market', 'https://github.com/printempw/blessing-skin-server/wiki/Plugins');
 
-        Route::get ('/manage', 'PluginController@showManage');
+        Route::view('/manage', 'admin.plugins');
         Route::post('/manage', 'PluginController@manage');
         Route::any ('/config/{name}', 'PluginController@config');
     });