From ec42983e6e4e8bf30a50a270201fbaf832d60e5b Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Tue, 26 Oct 2021 15:14:38 +0530
Subject: [PATCH] Velocity Routes Improvement

---
 packages/Webkul/Velocity/src/Http/helpers.php  | 18 ++++++++++--------
 .../src/Providers/VelocityServiceProvider.php  |  5 ++---
 .../src/{Http => Routes}/admin-routes.php      | 11 +++++------
 .../src/{Http => Routes}/front-routes.php      |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)
 rename packages/Webkul/Velocity/src/{Http => Routes}/admin-routes.php (93%)
 rename packages/Webkul/Velocity/src/{Http => Routes}/front-routes.php (98%)

diff --git a/packages/Webkul/Velocity/src/Http/helpers.php b/packages/Webkul/Velocity/src/Http/helpers.php
index 6844a7d15..b55a44ccf 100644
--- a/packages/Webkul/Velocity/src/Http/helpers.php
+++ b/packages/Webkul/Velocity/src/Http/helpers.php
@@ -1,11 +1,13 @@
 <?php
 
-    use Webkul\Velocity\Velocity;
-
-    if (! function_exists('velocity')) {
-        function velocity()
-        {
-            return app()->make(Velocity::class);
-        }
+if (! function_exists('velocity')) {
+    /**
+     * Velocity helper.
+     *
+     * @return \Webkul\Velocity\Velocity
+     */
+    function velocity()
+    {
+        return app()->make(\Webkul\Velocity\Velocity::class);
     }
-?>
\ No newline at end of file
+}
diff --git a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php
index 77a0b014d..9ab592ca8 100644
--- a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php
+++ b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php
@@ -4,7 +4,6 @@ namespace Webkul\Velocity\Providers;
 
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Routing\Router;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\ServiceProvider;
 use Webkul\Velocity\Facades\Velocity as VelocityFacade;
 
@@ -19,9 +18,9 @@ class VelocityServiceProvider extends ServiceProvider
     {
         include __DIR__ . '/../Http/helpers.php';
 
-        include __DIR__ . '/../Http/admin-routes.php';
+        include __DIR__ . '/../Routes/admin-routes.php';
 
-        include __DIR__ . '/../Http/front-routes.php';
+        include __DIR__ . '/../Routes/front-routes.php';
 
         $this->app->register(EventServiceProvider::class);
 
diff --git a/packages/Webkul/Velocity/src/Http/admin-routes.php b/packages/Webkul/Velocity/src/Routes/admin-routes.php
similarity index 93%
rename from packages/Webkul/Velocity/src/Http/admin-routes.php
rename to packages/Webkul/Velocity/src/Routes/admin-routes.php
index fdfbfb27b..a5c44a941 100644
--- a/packages/Webkul/Velocity/src/Http/admin-routes.php
+++ b/packages/Webkul/Velocity/src/Routes/admin-routes.php
@@ -1,28 +1,27 @@
 <?php
 
-// Controllers
+use Illuminate\Support\Facades\Route;
 use Webkul\Velocity\Http\Controllers\Admin\ConfigurationController;
 use Webkul\Velocity\Http\Controllers\Admin\ContentController;
 
 Route::group(['middleware' => ['web', 'admin_locale']], function () {
     Route::prefix(config('app.admin_url') . '/velocity')->group(function () {
         Route::group(['middleware' => ['admin']], function () {
-            // Content Pages Route
             Route::get('/content', [ContentController::class, 'index'])->defaults('_config', [
                 'view' => 'velocity::admin.content.index'
             ])->name('velocity.admin.content.index');
 
             Route::get('/content/search', [ContentController::class, 'search'])->name('velocity.admin.content.search');
 
-            Route::get('/content/create', [ContentController::class, 'create'])->defaults('_config',[
+            Route::get('/content/create', [ContentController::class, 'create'])->defaults('_config', [
                 'view' => 'velocity::admin.content.create'
             ])->name('velocity.admin.content.create');
 
-            Route::post('/content/create', [ContentController::class, 'store'])->defaults('_config',[
+            Route::post('/content/create', [ContentController::class, 'store'])->defaults('_config', [
                 'redirect' => 'velocity.admin.content.index'
             ])->name('velocity.admin.content.store');
 
-            Route::get('/content/edit/{id}', [ContentController::class, 'edit'])->defaults('_config',[
+            Route::get('/content/edit/{id}', [ContentController::class, 'edit'])->defaults('_config', [
                 'view' => 'velocity::admin.content.edit'
             ])->name('velocity.admin.content.edit');
 
@@ -49,4 +48,4 @@ Route::group(['middleware' => ['web', 'admin_locale']], function () {
             ])->name('velocity.admin.store.meta-data');
         });
     });
-});
\ No newline at end of file
+});
diff --git a/packages/Webkul/Velocity/src/Http/front-routes.php b/packages/Webkul/Velocity/src/Routes/front-routes.php
similarity index 98%
rename from packages/Webkul/Velocity/src/Http/front-routes.php
rename to packages/Webkul/Velocity/src/Routes/front-routes.php
index c814791e6..c7478f303 100644
--- a/packages/Webkul/Velocity/src/Http/front-routes.php
+++ b/packages/Webkul/Velocity/src/Routes/front-routes.php
@@ -1,6 +1,6 @@
 <?php
 
-// Controllers
+use Illuminate\Support\Facades\Route;
 use Webkul\Velocity\Http\Controllers\Shop\CartController;
 use Webkul\Velocity\Http\Controllers\Shop\ComparisonController;
 use Webkul\Velocity\Http\Controllers\Shop\ShopController;