From 2c7d90deef563455cd9908a08498fe994cdc06fa Mon Sep 17 00:00:00 2001 From: Pranshu Tomar Date: Tue, 16 Jun 2020 17:58:52 +0530 Subject: [PATCH] Homepage 404 issue fixed --- composer.json | 7 ++- composer.lock | 57 ++++++++++++++++++- .../ProductsCategoriesProxyController.php | 11 +++- 3 files changed, 70 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index dceaa40c2..7845a065e 100755 --- a/composer.json +++ b/composer.json @@ -18,10 +18,12 @@ "ext-pdo_mysql": "*", "ext-tokenizer": "*", "astrotomic/laravel-translatable": "^11.0.0", + "barryvdh/laravel-debugbar": "^3.1", "barryvdh/laravel-dompdf": "0.8.6", "doctrine/dbal": "2.9.2", "fideloper/proxy": "^4.2", "flynsarmy/db-blade-compiler": "^5.5", + "fzaninotto/faker": "^1.9.1", "guzzlehttp/guzzle": "~6.3", "intervention/image": "^2.4", "intervention/imagecache": "^2.3", @@ -29,11 +31,10 @@ "konekt/concord": "^1.2", "laravel/framework": "^7.0", "laravel/tinker": "^2.0", + "laravel/ui": "^2.0", "maatwebsite/excel": "3.1.19", "prettus/l5-repository": "^2.6", - "tymon/jwt-auth": "^1.0.0", - "barryvdh/laravel-debugbar": "^3.1", - "fzaninotto/faker": "^1.9.1" + "tymon/jwt-auth": "^1.0.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 44b6290d8..c97a7cf2f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f30430f65c1f5650515c1af10a9c5d9d", + "content-hash": "8aafae843c854c6ea581deb957563009", "packages": [ { "name": "astrotomic/laravel-translatable", @@ -1889,6 +1889,61 @@ ], "time": "2020-04-07T15:01:31+00:00" }, + { + "name": "laravel/ui", + "version": "v2.0.3", + "source": { + "type": "git", + "url": "https://github.com/laravel/ui.git", + "reference": "15368c5328efb7ce94f35ca750acde9b496ab1b1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/ui/zipball/15368c5328efb7ce94f35ca750acde9b496ab1b1", + "reference": "15368c5328efb7ce94f35ca750acde9b496ab1b1", + "shasum": "" + }, + "require": { + "illuminate/console": "^7.0", + "illuminate/filesystem": "^7.0", + "illuminate/support": "^7.0", + "php": "^7.2.5" + }, + "require-dev": { + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^8.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Laravel\\Ui\\UiServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Laravel\\Ui\\": "src/", + "Illuminate\\Foundation\\Auth\\": "auth-backend/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "Laravel UI utilities and presets.", + "keywords": [ + "laravel", + "ui" + ], + "time": "2020-04-29T15:06:45+00:00" + }, { "name": "lcobucci/jwt", "version": "3.3.2", diff --git a/packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php b/packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php index 6df648490..690471f32 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php @@ -67,8 +67,17 @@ class ProductsCategoriesProxyController extends Controller return view($this->_config['product_view'], compact('product', 'customer')); } + abort(404); } - abort(404); + $sliderRepository = app('Webkul\Core\Repositories\SliderRepository'); + + $sliderData = $sliderRepository + ->where('channel_id', core()->getCurrentChannel()->id) + ->where('locale', core()->getCurrentLocale()->code) + ->get() + ->toArray(); + + return view('shop::home.index', compact('sliderData')); } } \ No newline at end of file