Merge pull request #1393 from krayin/routes-cleanup

chore: routes cleanup

Author: benjpaddock

packages/Webkul/Admin/src/Http/routes.php

@@ -2,12 +2,15 @@
 
 namespace Webkul\Admin\Providers;
 
+use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
+use Webkul\Admin\Exceptions\Handler;
+use Webkul\Admin\Http\Middleware\Bouncer as BouncerMiddleware;
 use Webkul\Admin\Http\Middleware\Locale;
 
 class AdminServiceProvider extends ServiceProvider
@@ -17,11 +20,13 @@ class AdminServiceProvider extends ServiceProvider
      */
     public function boot(Router $router): void
     {
-        include __DIR__.'/../Http/helpers.php';
+        $router->aliasMiddleware('user', BouncerMiddleware::class);
+
+        $router->aliasMiddleware('admin_locale', Locale::class);
 
-        Route::middleware('web')->group(__DIR__.'/../Routes/web.php');
+        include __DIR__.'/../Http/helpers.php';
 
-        $this->loadRoutesFrom(__DIR__.'/../Http/routes.php');
+        Route::middleware(['web', 'admin_locale'])->group(__DIR__.'/../Routes/web.php');
 
         $this->loadMigrationsFrom(__DIR__.'/../Database/Migrations');
 
@@ -31,19 +36,15 @@ public function boot(Router $router): void
 
         Blade::anonymousComponentPath(__DIR__.'/../Resources/views/components', 'admin');
 
-        $this->app->bind(\Illuminate\Contracts\Debug\ExceptionHandler::class, \Webkul\Admin\Exceptions\Handler::class);
-
-        $router->aliasMiddleware('user', \Webkul\Admin\Http\Middleware\Bouncer::class);
-
-        $router->aliasMiddleware('admin_locale', Locale::class);
+        $this->app->bind(ExceptionHandler::class, Handler::class);
 
         Relation::morphMap([
-            'leads'         => 'Webkul\Lead\Models\Lead',
-            'products'      => 'Webkul\Product\Models\Product',
-            'persons'       => 'Webkul\Contact\Models\Person',
-            'organizations' => 'Webkul\Contact\Models\Organization',
-            'quotes'        => 'Webkul\Quote\Models\Quote',
-            'warehouses'    => 'Webkul\Warehouse\Models\Warehouse',
+            'leads'         => \Webkul\Lead\Models\Lead::class,
+            'organizations' => \Webkul\Contact\Models\Organization::class,
+            'persons'       => \Webkul\Contact\Models\Person::class,
+            'products'      => \Webkul\Product\Models\Product::class,
+            'quotes'        => \Webkul\Quote\Models\Quote::class,
+            'warehouses'    => \Webkul\Warehouse\Models\Warehouse::class,
         ]);
 
         $this->app->register(EventServiceProvider::class);

packages/Webkul/Admin/src/Providers/AdminServiceProvider.php

@@ -6,6 +6,5 @@
 
 class ModuleServiceProvider extends BaseModuleServiceProvider
 {
-    protected $models = [
-    ];
+    protected $models = [];
 }

packages/Webkul/Admin/src/Providers/ModuleServiceProvider.php

@@ -6,7 +6,7 @@
 /**
  * Settings routes.
  */
-Route::group(['middleware' => ['web', 'user', 'admin_locale'], 'prefix' => config('app.admin_path')], function () {
+Route::group(['middleware' => ['user'], 'prefix' => config('app.admin_path')], function () {
     /**
      * Persons routes.
      */

packages/Webkul/Admin/src/Routes/activities-routes.php

@@ -6,25 +6,33 @@
 use Webkul\Admin\Http\Controllers\User\ResetPasswordController;
 use Webkul\Admin\Http\Controllers\User\SessionController;
 
+/**
+ * Home routes.
+ */
+Route::get('/', [Controller::class, 'redirectToLogin'])->name('krayin.home');
+
 /**
  * Auth routes.
  */
-Route::group(['middleware' => ['web', 'admin_locale'], 'prefix' => config('app.admin_path')], function () {
+Route::group(['prefix' => config('app.admin_path')], function () {
     /**
      * Redirect route.
      */
     Route::get('/', [Controller::class, 'redirectToLogin']);
 
-    Route::controller(SessionController::class)->prefix('login')->group(function () {
-        /**
-         * Login routes.
-         */
-        Route::get('', 'create')->name('admin.session.create');
+    /**
+     * Session routes.
+     */
+    Route::controller(SessionController::class)->group(function () {
+        Route::prefix('login')->group(function () {
+            Route::get('', 'create')->name('admin.session.create');
+
+            Route::post('', 'store')->name('admin.session.store');
+        });
 
-        /**
-         * Login post route to admin auth controller.
-         */
-        Route::post('', 'store')->name('admin.session.store');
+        Route::group(['middleware' => ['user']], function () {
+            Route::delete('logout', 'destroy')->name('admin.session.destroy');
+        });
     });
 
     /**

packages/Webkul/Admin/src/Routes/auth-routes.php

@@ -6,17 +6,14 @@
 /**
  * Configuration routes.
  */
-Route::group(['middleware' => ['web', 'user', 'admin_locale'], 'prefix' => config('app.admin_path')], function () {
+Route::group(['middleware' => ['user'], 'prefix' => config('app.admin_path')], function () {
     Route::get('configuration/search', [ConfigurationController::class, 'search'])->name('admin.configuration.search');
 
     Route::controller(ConfigurationController::class)->prefix('configuration/{slug?}/{slug2?}')->group(function () {
-
         Route::get('', 'index')->name('admin.configuration.index');
 
         Route::post('', 'store')->name('admin.configuration.store');
 
-        Route::get('{path}', 'download')->defaults('_config', [
-            'redirect' => 'admin.configuration.index',
-        ])->name('admin.configuration.download');
+        Route::get('{path}', 'download')->name('admin.configuration.download');
     });
 });

packages/Webkul/Admin/src/Routes/configuration-routes.php

@@ -9,7 +9,7 @@
 /**
  * Settings routes.
  */
-Route::group(['middleware' => ['web', 'user', 'admin_locale'], 'prefix' => config('app.admin_path')], function () {
+Route::group(['middleware' => ['user'], 'prefix' => config('app.admin_path')], function () {
     Route::prefix('contacts')->group(function () {
         /**
          * Persons routes.

packages/Webkul/Admin/src/Routes/contacts-routes.php

@@ -6,7 +6,7 @@
 /**
  * Extra routes.
  */
-Route::group(['middleware' => ['web', 'user', 'admin_locale'], 'prefix' => config('app.admin_path')], function () {
+Route::group(['middleware' => ['user'], 'prefix' => config('app.admin_path')], function () {
     /**
      * Dashboard routes.
      */

packages/Webkul/Admin/src/Routes/dashboard-routes.php

@@ -10,7 +10,7 @@
 /**
  * Settings routes.
  */
-Route::group(['middleware' => ['web', 'user', 'admin_locale'], 'prefix' => config('app.admin_path')], function () {
+Route::group(['middleware' => ['user'], 'prefix' => config('app.admin_path')], function () {
     /**
      * Leads routes.
      */

packages/Webkul/Admin/src/Routes/leads-routes.php

@@ -6,7 +6,7 @@
 /**
  * Settings routes.
  */
-Route::group(['middleware' => ['web', 'user', 'admin_locale'], 'prefix' => config('app.admin_path')], function () {
+Route::group(['middleware' => ['user'], 'prefix' => config('app.admin_path')], function () {
     /**
      * Email routes.
      */