From a325357a87ef7d4fb69ee027ec6d212b01dc7080 Mon Sep 17 00:00:00 2001
From: Devansh Bawari <devansh.bawari419@webkul.in>
Date: Thu, 22 Jun 2023 22:39:35 +0530
Subject: [PATCH] some more cleanup done

---
 .../Shop/src/Http/Controllers/API/CategoryController.php  | 7 ++++---
 .../views/components/categories/carousel.blade.php        | 8 ++++++--
 .../components/shimmer/categories/carousel.blade.php      | 6 +++---
 .../views/components/shimmer/products/carousel.blade.php  | 2 +-
 packages/Webkul/Shop/src/Routes/api.php                   | 7 ++-----
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/packages/Webkul/Shop/src/Http/Controllers/API/CategoryController.php b/packages/Webkul/Shop/src/Http/Controllers/API/CategoryController.php
index 427f23a3bdc..b30d7fbbad9 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/API/CategoryController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/API/CategoryController.php
@@ -29,9 +29,10 @@ public function __construct(
      */
     public function index(): JsonResource
     {
-        $categories = $this->categoryRepository->scopeQuery(function ($query) {
-            return $query->whereNotNull('parent_id')->where('status', 1);
-        })->paginate();
+        $categories = $this->categoryRepository
+            ->whereNotNull('parent_id')
+            ->where('status', 1)
+            ->paginate();
 
         return CategoryResource::collection($categories);
     }
diff --git a/packages/Webkul/Shop/src/Resources/views/components/categories/carousel.blade.php b/packages/Webkul/Shop/src/Resources/views/components/categories/carousel.blade.php
index 19ab8f3a0de..022e45a07a4 100644
--- a/packages/Webkul/Shop/src/Resources/views/components/categories/carousel.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/components/categories/carousel.blade.php
@@ -3,7 +3,7 @@
     title="{{ $title }}"
     navigation-link="{{ $navigationLink ?? '' }}"
 >
-    <x-shop::shimmer.products.carousel :navigation-link="$navigationLink ?? false"></x-shop::shimmer.products.carousel>
+    <x-shop::shimmer.categories.carousel :navigation-link="$navigationLink ?? false"></x-shop::shimmer.categories.carousel>
 </v-categories-carousel>
 
 @pushOnce('scripts')
@@ -55,7 +55,11 @@ class="bs-carousal-prev flex border border-black items-center justify-center rou
 
         <!-- category carousel shimmer -->
         <template v-if="isLoading">
-            <x-shop::shimmer.categories.carousel :count="7" :navigation-link="$navigationLink ?? false"></x-shop::shimmer.categories.carousel>
+            <x-shop::shimmer.categories.carousel
+                :count="7"
+                :navigation-link="$navigationLink ?? false"
+            >
+            </x-shop::shimmer.categories.carousel>
         </template>
     </script>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/components/shimmer/categories/carousel.blade.php b/packages/Webkul/Shop/src/Resources/views/components/shimmer/categories/carousel.blade.php
index bf6eb977d75..805d6633c92 100644
--- a/packages/Webkul/Shop/src/Resources/views/components/shimmer/categories/carousel.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/components/shimmer/categories/carousel.blade.php
@@ -2,13 +2,13 @@
 
 <div class="container mt-[60px] max-lg:px-[30px] max-sm:mt-[20px]">
     <div class="bs-item-carousal-wrapper relative">
-        <div class="flex gap-10 overflow-auto scrollbar-hide justify-center">
+        <div class="flex gap-10 overflow-auto scrollbar-hide">
             @for ($i = 0;  $i < $count; $i++)
                 <div class="grid grid-cols-1 justify-items-center gap-[15px] min-w-[120px]">
                     <div class="relative overflow-hidden rounded-full w-[110px] h-[110px] bg-[#E9E9E9] shimmer">
-                        <img 
+                        <img
                             class="rounded-sm bg-[#F5F5F5]"
-                            src="" 
+                            src=""
                             alt=""
                         >
                     </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/components/shimmer/products/carousel.blade.php b/packages/Webkul/Shop/src/Resources/views/components/shimmer/products/carousel.blade.php
index d34e39a2f4c..b473049bab5 100644
--- a/packages/Webkul/Shop/src/Resources/views/components/shimmer/products/carousel.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/components/shimmer/products/carousel.blade.php
@@ -27,4 +27,4 @@ class="min-w-[291px]"
         <a class="block mx-auto w-[150.172px] h-[48px] rounded-[18px] mt-[60px] shimmer">
         </a>
     @endif
-</div>
\ No newline at end of file
+</div>
diff --git a/packages/Webkul/Shop/src/Routes/api.php b/packages/Webkul/Shop/src/Routes/api.php
index d8af18b159b..7555ef6bac6 100644
--- a/packages/Webkul/Shop/src/Routes/api.php
+++ b/packages/Webkul/Shop/src/Routes/api.php
@@ -59,7 +59,7 @@
         Route::post('move-to-wishlist', 'moveToWishlist')->name('shop.api.compare.move_to_wishlist');
     });
 
-    Route::group(['middleware' => ['customer']], function () {
+    Route::group(['middleware' => ['customer'], 'prefix' => 'customer'], function () {
         Route::controller(WishlistController::class)->prefix('wishlist')->group(function () {
             Route::get('', 'index')->name('shop.api.customers.account.wishlist.index');
 
@@ -70,9 +70,6 @@
             Route::delete('{id}', 'destroy')->name('shop.api.customers.account.wishlist.destroy');
         });
 
-        Route::get('compare-items/{product_id}', [CompareController::class, 'store'])
-            ->name('shop.customers.account.compare.store');
-
-        Route::get('/customer/addresses', [AddressController::class, 'index'])->name('api.shop.customers.account.addresses.index');
+        Route::get('addresses', [AddressController::class, 'index'])->name('api.shop.customers.account.addresses.index');
     });
 });