From 7e544e2f301fc9afc499749a0ed590e9c1eefb26 Mon Sep 17 00:00:00 2001 From: Bayu Lukman Yusuf Date: Tue, 24 Feb 2026 16:30:55 +0700 Subject: [PATCH 1/3] hide brand if no logo --- .../components/grocery/top-header.blade.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/resources/views/components/grocery/top-header.blade.php b/resources/views/components/grocery/top-header.blade.php index bf7b1e7..8008056 100644 --- a/resources/views/components/grocery/top-header.blade.php +++ b/resources/views/components/grocery/top-header.blade.php @@ -4,15 +4,16 @@ From 0ca2f2d15a8df274cdf3102a3fbf95b0ba0d043b Mon Sep 17 00:00:00 2001 From: Bayu Lukman Yusuf Date: Wed, 25 Feb 2026 08:52:54 +0700 Subject: [PATCH 2/3] change header --- app/Http/Controllers/HomeController.php | 2 +- app/Http/Controllers/ProductController.php | 5 +- resources/views/checkout/v1-cart.blade.php | 2 +- .../checkout/v1-delivery-1-shipping.blade.php | 2 +- .../views/checkout/v1-delivery-1.blade.php | 2 +- resources/views/contact/v1.blade.php | 2 +- resources/views/help/topics-v2.blade.php | 2 +- resources/views/home/fashion-v1.blade.php | 2 +- resources/views/layouts/account.blade.php | 2 +- .../views/shop/catalog-fashion.blade.php | 2 +- .../views/shop/product-fashion.blade.php | 6 +- .../views/shop/product-grocery.blade.php | 730 +----------------- routes/web.php | 5 +- 13 files changed, 21 insertions(+), 743 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index bebfa47..ed77bb9 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -8,7 +8,7 @@ class HomeController extends Controller { - public function index(Request $request) + public function fashion(Request $request) { return view('home.fashion-v1'); } diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php index e143976..0bb3ad6 100644 --- a/app/Http/Controllers/ProductController.php +++ b/app/Http/Controllers/ProductController.php @@ -477,7 +477,7 @@ class ProductController extends Controller ]); } - public function detail($slug, Request $request, ProductRepository $productRepository) + public function detailFashion($slug, Request $request, ProductRepository $productRepository) { $product = $productRepository->show($slug); @@ -495,4 +495,7 @@ class ProductController extends Controller ]); } + + + } diff --git a/resources/views/checkout/v1-cart.blade.php b/resources/views/checkout/v1-cart.blade.php index 29d094a..e6b64e6 100644 --- a/resources/views/checkout/v1-cart.blade.php +++ b/resources/views/checkout/v1-cart.blade.php @@ -5,7 +5,7 @@ - +
diff --git a/resources/views/checkout/v1-delivery-1-shipping.blade.php b/resources/views/checkout/v1-delivery-1-shipping.blade.php index 80c07b5..b82ed26 100644 --- a/resources/views/checkout/v1-delivery-1-shipping.blade.php +++ b/resources/views/checkout/v1-delivery-1-shipping.blade.php @@ -1,7 +1,7 @@ @extends('layouts.landing', ['title' => 'Checkout v.1 - Delivery Info Step 1']) @section('content') - +
diff --git a/resources/views/checkout/v1-delivery-1.blade.php b/resources/views/checkout/v1-delivery-1.blade.php index 9b73b7a..f0fe1a4 100644 --- a/resources/views/checkout/v1-delivery-1.blade.php +++ b/resources/views/checkout/v1-delivery-1.blade.php @@ -1,7 +1,7 @@ @extends('layouts.landing', ['title' => 'Checkout v.1 - Delivery Info Step 1']) @section('content') - +
diff --git a/resources/views/contact/v1.blade.php b/resources/views/contact/v1.blade.php index a4d81d1..97797ed 100644 --- a/resources/views/contact/v1.blade.php +++ b/resources/views/contact/v1.blade.php @@ -1,7 +1,7 @@ @extends('layouts.landing', ['title' => 'Kontak']) @section('content') - +
diff --git a/resources/views/help/topics-v2.blade.php b/resources/views/help/topics-v2.blade.php index da08049..1afaaae 100644 --- a/resources/views/help/topics-v2.blade.php +++ b/resources/views/help/topics-v2.blade.php @@ -2,7 +2,7 @@ @section('content') - +
diff --git a/resources/views/home/fashion-v1.blade.php b/resources/views/home/fashion-v1.blade.php index 5aa5a3c..7bdb57c 100644 --- a/resources/views/home/fashion-v1.blade.php +++ b/resources/views/home/fashion-v1.blade.php @@ -3,7 +3,7 @@ @section('content') - +
diff --git a/resources/views/layouts/account.blade.php b/resources/views/layouts/account.blade.php index 795cc4c..0f5bf96 100644 --- a/resources/views/layouts/account.blade.php +++ b/resources/views/layouts/account.blade.php @@ -10,7 +10,7 @@ - +
diff --git a/resources/views/shop/catalog-fashion.blade.php b/resources/views/shop/catalog-fashion.blade.php index 247bc38..7e7bddf 100644 --- a/resources/views/shop/catalog-fashion.blade.php +++ b/resources/views/shop/catalog-fashion.blade.php @@ -1,7 +1,7 @@ @extends('layouts.landing', ['title' => 'Store - Catalog']) @section('content') - +
diff --git a/resources/views/shop/product-fashion.blade.php b/resources/views/shop/product-fashion.blade.php index 402d309..57ad017 100644 --- a/resources/views/shop/product-fashion.blade.php +++ b/resources/views/shop/product-fashion.blade.php @@ -4,7 +4,7 @@ - +
@@ -301,13 +301,13 @@ class="d-none d-md-inline"> {{ __('product_fashion.and_returns') }} - + --}}
diff --git a/resources/views/shop/product-grocery.blade.php b/resources/views/shop/product-grocery.blade.php index ff47bff..b22b15e 100644 --- a/resources/views/shop/product-grocery.blade.php +++ b/resources/views/shop/product-grocery.blade.php @@ -1,735 +1,7 @@ @extends('layouts.landing', ['title' => 'Grocery Store - Product Page']) @section('content') - @include('layouts.partials/offcanvas2') - -
- - -
-
-

Delivery options

- -
- -
- -
- - -
- - -
-
-
- - -
-
- -
- - -
-
-
- -
- - -
-
-
-
- - -
- -
-
Add an address to start ordering
- - - Find on map - -
-
- - -
-
- - -
-
- - -
- - -
- - - -
- - -
- - -
-
-
- -
-
- - -
-
8270 Delta Shores Cir S, Sacramento, CA 95832
-
Open: 07:00 - 22:00 -
-
-
-
- -
-
- - -
-
755 Riverpoint Ct, West Sacramento, CA 95605
-
Open: 07:00 - 21:00 -
-
-
-
- -
-
- - -
-
10655 Folsom Blvd, Rancho Cordova, CA 95670
-
Open: 08:00 - 23:00 -
-
-
-
-
- - -
- -
-
Select a suitable store
- - - Find on map - -
-
- - -
-
- - -
-
Found stores:
-
- -
- -
8270 Delta Shores Cir S, Sacramento, CA 95832
-
Open: 07:00 - 22:00 -
-
-
-
- -
- -
755 Riverpoint Ct, West Sacramento, CA 95605
-
Open: 07:00 - 21:00 -
-
-
-
- -
- -
10655 Folsom Blvd, Rancho Cordova, CA 95670
-
Open: 08:00 - 23:00 -
-
-
-
- - - -
-
- - -
- -
-
- - @include('layouts.partials/menu-offcanvas') - - - -
- -
+
diff --git a/routes/web.php b/routes/web.php index 2cd251c..24d76f5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -49,7 +49,10 @@ Route::get('/products/ajax/brands-with-images', [ProductController::class, 'bran Route::get('/products/ajax/categories', [ProductController::class, 'categories'])->name('product.ajax.categories'); Route::get('/products/ajax/genders', [ProductController::class, 'genders'])->name('product.ajax.genders'); Route::get('/products/ajax/announcements', [ProductController::class, 'announcements'])->name('product.ajax.announcements'); -Route::get('/product/{slug}', [ProductController::class, 'detail'])->name('product.detail'); + + +Route::get('/product/{slug}', [ProductController::class, 'detailFashion'])->name('product.detail'); +// Route::get('/product/{slug}', [ProductController::class, 'detailGrocery'])->name('product.detail'); From 459172dc73d596453e4c99c4a53ea9e1a5001b05 Mon Sep 17 00:00:00 2001 From: Bayu Lukman Yusuf Date: Wed, 25 Feb 2026 10:50:50 +0700 Subject: [PATCH 3/3] fix navbar --- .../Catalog/CategoryRepository.php | 1 + app/View/Components/Navbar/Categories.php | 34 + lang/en/navbar.php | 5 +- lang/id/navbar.php | 3 +- resources/views/404/fashion.blade.php | 2 +- .../views/checkout/marketplace.blade.php | 2 +- .../header-category-dropdown.blade.php | 10 +- .../grocery/popular-products.blade.php | 29 +- .../layout/header-grocery.blade.php | 11 +- .../components/navbar/categories.blade.php | 31 + resources/views/home/fashion-v2.blade.php | 2 +- resources/views/home/marketplace.blade.php | 2 +- resources/views/home/single-store.blade.php | 2 +- resources/views/index.blade.php | 2 +- .../layouts/partials/account-navbar.blade.php | 2 +- .../partials/marketplace-navbar.blade.php | 2 +- .../layouts/partials/menu-offcanvas.blade.php | 676 +++--------------- .../views/shop/product-fashion.blade.php | 8 +- 18 files changed, 210 insertions(+), 614 deletions(-) create mode 100644 app/View/Components/Navbar/Categories.php create mode 100644 resources/views/components/navbar/categories.blade.php diff --git a/app/Repositories/Catalog/CategoryRepository.php b/app/Repositories/Catalog/CategoryRepository.php index aafd7c9..0a68140 100644 --- a/app/Repositories/Catalog/CategoryRepository.php +++ b/app/Repositories/Catalog/CategoryRepository.php @@ -14,4 +14,5 @@ class CategoryRepository public function getList($params){ return Category::get(); } + } diff --git a/app/View/Components/Navbar/Categories.php b/app/View/Components/Navbar/Categories.php new file mode 100644 index 0000000..42edec5 --- /dev/null +++ b/app/View/Components/Navbar/Categories.php @@ -0,0 +1,34 @@ +categories = $categoryRepository->getList([]); + } + + /** + * Get the view / contents that represent the component. + */ + public function render(): View|Closure|string + { + + return view('components.navbar.categories', [ + 'categories' => $this->categories, + ]); + } +} diff --git a/lang/en/navbar.php b/lang/en/navbar.php index 114e838..ffd7c6e 100644 --- a/lang/en/navbar.php +++ b/lang/en/navbar.php @@ -13,5 +13,6 @@ return [ 'sign_in' => 'Sign In', 'sign_up' => 'Sign Up', 'contact' => 'Contact', - 'terms_conditions' => 'Terms & Conditions' -]; \ No newline at end of file + 'terms_conditions' => 'Terms & Conditions', + 'categories' => 'Categories' +]; diff --git a/lang/id/navbar.php b/lang/id/navbar.php index 8133d23..9054bce 100644 --- a/lang/id/navbar.php +++ b/lang/id/navbar.php @@ -13,5 +13,6 @@ return [ 'sign_in' => 'Masuk', 'sign_up' => 'Daftar', 'contact' => 'Kontak', - 'terms_conditions' => 'Syarat & Ketentuan' + 'terms_conditions' => 'Syarat & Ketentuan', + 'categories' => 'Kategori', ]; diff --git a/resources/views/404/fashion.blade.php b/resources/views/404/fashion.blade.php index 287f541..1a81b15 100644 --- a/resources/views/404/fashion.blade.php +++ b/resources/views/404/fashion.blade.php @@ -200,7 +200,7 @@