From dc4ebad5a6cf0a5e167e2fcdcd372480a74475fa Mon Sep 17 00:00:00 2001 From: Bayu Lukman Yusuf Date: Wed, 4 Mar 2026 11:28:42 +0700 Subject: [PATCH] update menu, product card, fix wishlist error --- app/Models/Items.php | 3 + .../Grocery/HeaderGenderDropdown.php | 10 +- .../grocery/header-gender-dropdown.blade.php | 397 +++--------------- .../grocery/popular-products.blade.php | 8 +- .../grocery/special-products.blade.php | 6 +- .../components/home/product-card.blade.php | 2 +- 6 files changed, 79 insertions(+), 347 deletions(-) diff --git a/app/Models/Items.php b/app/Models/Items.php index 18b1be4..b04cccd 100644 --- a/app/Models/Items.php +++ b/app/Models/Items.php @@ -359,6 +359,9 @@ class Items extends Model public function isWishlist() : bool { + if (auth()->user()?->customer?->id == null) { + return false; + } return $this->hasOne(Wishlist::class, 'item_id', 'id')->where('customer_id', auth()->user()->customer->id)->exists(); } } diff --git a/app/View/Components/Grocery/HeaderGenderDropdown.php b/app/View/Components/Grocery/HeaderGenderDropdown.php index 1ad9694..ecc3159 100644 --- a/app/View/Components/Grocery/HeaderGenderDropdown.php +++ b/app/View/Components/Grocery/HeaderGenderDropdown.php @@ -4,6 +4,7 @@ namespace App\View\Components\Grocery; use App\Repositories\Catalog\CategoryRepository; use App\Repositories\Catalog\GenderRepository; +use App\Repositories\Catalog\BrandRepository; use Closure; use Illuminate\Contracts\View\View; use Illuminate\View\Component; @@ -13,13 +14,15 @@ class HeaderGenderDropdown extends Component protected $categories = []; protected $genders = []; + protected $brands = []; /** * Create a new component instance. */ - public function __construct(CategoryRepository $categoryRepository, GenderRepository $genderRepository) + public function __construct(CategoryRepository $categoryRepository, GenderRepository $genderRepository, BrandRepository $brandRepository) { $this->categories = $categoryRepository->getList([]); - $this->genders = $genderRepository->getList([]); + $this->genders = $genderRepository->getList([]); + $this->brands = $brandRepository->getList([]); } /** @@ -31,6 +34,7 @@ class HeaderGenderDropdown extends Component return view('components.grocery.header-gender-dropdown', [ 'categories' => $this->categories, 'genders' => $this->genders, - ]); + 'brands' => $this->brands, + ]); } } diff --git a/resources/views/components/grocery/header-gender-dropdown.blade.php b/resources/views/components/grocery/header-gender-dropdown.blade.php index 13c5a3e..40002c4 100644 --- a/resources/views/components/grocery/header-gender-dropdown.blade.php +++ b/resources/views/components/grocery/header-gender-dropdown.blade.php @@ -1,19 +1,18 @@ -
+
+ - @foreach ($categories as $key => $value) -
-
-
    + {{--
      -
    +
--}}
@@ -46,41 +45,20 @@
- Clothing + href="{{ route('product.index') }}"> + Brand
-
+ {{--
Shoes @@ -187,308 +165,55 @@ class="position-absolute top-0 start-0 w-100 h-100 object-fit-cover rtl-flip" alt="Image">
-
+
--}}
- -
-
-
- - Clothing - - -
-
- - Shoes - - -
-
- - Accessories - - -
-
-
Specialty Shops
- -
-
-
-
-
Men's
Sunglasses
Offers
-
- Shop now -
-
- Image -
-
-
-
- - -
-
-
- - Boys - - -
-
- - Girls - - -
-
- - Accessories - - -
-
-
Shop by Age
- -
-
-
-
-
Kids'
Spring
Collection
-
- Shop now -
-
- Image -
-
-
-
+
@endforeach + +
+ +
+ + + diff --git a/resources/views/components/grocery/popular-products.blade.php b/resources/views/components/grocery/popular-products.blade.php index 42d663b..435360c 100644 --- a/resources/views/components/grocery/popular-products.blade.php +++ b/resources/views/components/grocery/popular-products.blade.php @@ -44,7 +44,7 @@ -
+
@foreach ($products as $key => $value) @@ -56,7 +56,7 @@ aria-label="Add to Wishlist"> --}} - +
Image
@@ -82,7 +82,7 @@
--}} -
+
{{ $value->display_price_currency }}

@if ($value->variants->count() > 1) -
+
+{{ $value->variants->count() - 1 }} Varian
@endif
diff --git a/resources/views/components/grocery/special-products.blade.php b/resources/views/components/grocery/special-products.blade.php index a626a5d..984cbeb 100644 --- a/resources/views/components/grocery/special-products.blade.php +++ b/resources/views/components/grocery/special-products.blade.php @@ -69,7 +69,7 @@ aria-label="Add to Wishlist"> --}} - +
Image
@@ -95,7 +95,7 @@
--}} -
+
{{ $value->display_price_currency }}

@if ($value->variants->count() > 1) -
+
+{{ $value->variants->count() - 1 }} Varian
@endif
diff --git a/resources/views/components/home/product-card.blade.php b/resources/views/components/home/product-card.blade.php index 0e4098f..57992b3 100644 --- a/resources/views/components/home/product-card.blade.php +++ b/resources/views/components/home/product-card.blade.php @@ -11,7 +11,7 @@ aria-label="Add to Wishlist"> - +