Merge routes (#436)

manelgavalda · web-flow · commit 44cda7e28e57 · 2020-10-31T14:38:24.000+01:00
* Merge routes

* Remove routes.php

Co-authored-by: Manel Gavaldà &lt;manel@cyber-duck.co.uk&gt;
diff --git a/routes/web.php b/routes/web.php
@@ -1,5 +1,7 @@
 <?php
 
+use App\Http\Controllers\HomeController;
+
 /*
 |--------------------------------------------------------------------------
 | Web Routes
@@ -16,8 +18,10 @@
     return view('welcome');
 });
 
+Route::get('/home', [HomeController::class, 'index']);
+
 Route::group(['middleware' => 'auth'], function () {
-    //    Route::get('/link1', function ()    {
+//    Route::get('/link1', function ()    {
 //        // Uses Auth Middleware
 //    });
 
diff --git a/src/Http/routes.php b/src/Http/routes.php
diff --git a/src/Providers/AdminLTETemplateServiceProvider.php b/src/Providers/AdminLTETemplateServiceProvider.php
@@ -3,7 +3,6 @@
 namespace Acacha\AdminLTETemplateLaravel\Providers;
 
 use Illuminate\Routing\Router;
-use Illuminate\Container\Container;
 use Illuminate\Support\ServiceProvider;
 use Creativeorange\Gravatar\Facades\Gravatar;
 use Acacha\AdminLTETemplateLaravel\Facades\AdminLTE;
@@ -76,10 +75,6 @@ public function boot(Router $router)
     {
         $router->pushMiddlewareToGroup('web', GuestUser::class);
 
-        if (config('adminlte.install_routes', true)) {
-            $this->defineRoutes();
-        }
-
         //Publish
         $this->publishHomeController();
         $this->changeRegisterController();
@@ -102,20 +97,6 @@ public function boot(Router $router)
         $this->enableSpatieMenu();
     }
 
-    /**
-     * Define the AdminLTETemplate routes.
-     */
-    protected function defineRoutes()
-    {
-        if (!$this->app->routesAreCached()) {
-            $router = app('router');
-
-            $router->group(['namespace' => Container::getInstance()->getNamespace().'Http\Controllers'], function () {
-                require __DIR__.'/../Http/routes.php';
-            });
-        }
-    }
-
     /**
      * Publish Home Controller.
      */
