From 6032297baabc47eab7d783b38a812f737eeb15b6 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Fri, 3 May 2019 07:50:56 +0800
Subject: [PATCH] Simplify routes of setup

---
 app/Providers/RouteServiceProvider.php |  9 +++------
 routes/setup.php                       | 18 ++++++++----------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 73b8fdfe..bc643ac2 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -78,12 +78,9 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected function mapSetupRoutes(Router $router)
     {
-        $router->group([
-            'middleware' => 'web',
-            'namespace' => $this->namespace,
-        ], function ($router) {
-            require base_path('routes/setup.php');
-        });
+        Route::prefix('setup')
+            ->namespace($this->namespace)
+            ->group(base_path('routes/setup.php'));
     }
 
     /**
diff --git a/routes/setup.php b/routes/setup.php
index b22c865d..b8ab20fe 100644
--- a/routes/setup.php
+++ b/routes/setup.php
@@ -14,14 +14,12 @@
 /**
  * Setup Wizard.
  */
-Route::group(['prefix' => 'setup'], function () {
-    Route::group(['middleware' => 'setup'], function () {
-        Route::any('/', 'SetupController@welcome');
-        Route::any('/database', 'SetupController@database');
-        Route::get('/info', 'SetupController@info');
-        Route::post('/finish', 'SetupController@finish');
-    });
-
-    Route::get('/update', 'SetupController@update');
-    Route::post('/update', 'SetupController@doUpdate');
+Route::group(['middleware' => 'setup'], function () {
+    Route::any('/', 'SetupController@welcome');
+    Route::any('/database', 'SetupController@database');
+    Route::get('/info', 'SetupController@info');
+    Route::post('/finish', 'SetupController@finish');
 });
+
+Route::get('/update', 'SetupController@update');
+Route::post('/update', 'SetupController@doUpdate');