From 8c4e1bbc3bd33535cd459f8a55d38cf728c608fb Mon Sep 17 00:00:00 2001 From: ghermans Date: Wed, 29 Jul 2020 22:23:15 +0200 Subject: [PATCH] Fixed #3595 --- .env.example | 1 + config/app.php | 12 ++++++++++++ packages/Webkul/Admin/src/Http/routes.php | 2 +- packages/Webkul/Velocity/src/Http/admin-routes.php | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index c12561de2..bfb76ce72 100644 --- a/.env.example +++ b/.env.example @@ -4,6 +4,7 @@ APP_VERSION=1.1.2 APP_KEY= APP_DEBUG=true APP_URL=http://localhost +APP_ADMIN_URL=admin APP_TIMEZONE=Asia/Kolkata APP_LOCALE=en LOG_CHANNEL=stack diff --git a/config/app.php b/config/app.php index 83a642e1d..40f4c99bc 100755 --- a/config/app.php +++ b/config/app.php @@ -54,6 +54,18 @@ return [ 'url' => env('APP_URL', 'http://localhost'), + /* + |-------------------------------------------------------------------------- + | Application Admin URL + |-------------------------------------------------------------------------- + | + | This URL suffix is used to define the admin url for example + | admin/ or backend/ + | + */ + + 'admin_url' => env('APP_ADMIN_URL', 'admin'), + /* |-------------------------------------------------------------------------- | Application Timezone diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index f9fa5a75b..d6bcd0d89 100755 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -1,7 +1,7 @@ ['web']], function () { - Route::prefix('admin')->group(function () { + Route::prefix(config('app.admin_url'))->group(function () { Route::get('/', 'Webkul\Admin\Http\Controllers\Controller@redirectToLogin'); diff --git a/packages/Webkul/Velocity/src/Http/admin-routes.php b/packages/Webkul/Velocity/src/Http/admin-routes.php index ee90c2d07..a7f8573c4 100644 --- a/packages/Webkul/Velocity/src/Http/admin-routes.php +++ b/packages/Webkul/Velocity/src/Http/admin-routes.php @@ -1,7 +1,7 @@ ['web']], function () { - Route::prefix('admin/velocity')->group(function () { + Route::prefix(config('app.admin_url') . '/velocity')->group(function () { Route::group(['middleware' => ['admin']], function () { Route::namespace('Webkul\Velocity\Http\Controllers\Admin')->group(function () { // Content Pages Route