merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed slider controller namespace issue

This commit is contained in:
jitendra 2019-03-12 16:03:57 +05:30
parent 12a4c6dc09
commit 99e866d055
5 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/Webkul/Core/src/Http/Controllers/ChannelController.php
View File

@ -7,7 +7,6 @@ use Illuminate\Http\Response;
use Illuminate\Support\Facades\Event;
use Webkul\Core\Repositories\ChannelRepository as Channel;
/**
* Channel controller
*
@ -26,14 +25,14 @@ class ChannelController extends Controller
/**
* ChannelRepository object
*
* @var array
* @var Object
*/
protected $channel;
/**
* Create a new controller instance.
*
* @param Webkul\Core\Repositories\ChannelRepository $channel
* @param Webkul\Core\Repositories\ChannelRepository $channel
* @return void
*/
public function __construct(Channel $channel)

33
packages/Webkul/Core/src/Http/Controllers/SliderController.php
View File

@ -1,8 +1,6 @@
<?php
namespace Webkul\Shop\Http\Controllers;
use Webkul\Shop\Http\Controllers\Controller;
namespace Webkul\Core\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
@ -14,16 +12,36 @@ use Webkul\Core\Repositories\SliderRepository as Slider;
* @author Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
* @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
*/
class SliderController extends controller
{
/**
* Contains route related configuration
*
* @var array
*/
protected $_config;
/**
* SliderRepository object
* Object
*/
protected $slider;
/**
* @var array
*/
protected $channels;
/**
* Create a new controller instance.
*
* @param Webkul\Core\Repositories\SliderRepository $slider
* @return void
*/
public function __construct(Slider $slider)
{
$this->slider = $slider;
$this->_config = request('_config');
}
@ -32,7 +50,8 @@ class SliderController extends controller
*
* @return mixed
*/
public function index() {
public function index()
{
return view($this->_config['view']);
}
@ -41,8 +60,8 @@ class SliderController extends controller
*
* @return mixed
*/
public function create() {
public function create()
{
$channels = core()->getAllChannels();
return view($this->_config['view']);

2
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=391400bc9a994e60b97f",
"/css/shop.css": "/css/shop.css?id=f179c72a73d0f8996e4e"
"/css/shop.css": "/css/shop.css?id=8d6ebeb1d020909177df"
}

15
packages/Webkul/Shop/src/Resources/assets/sass/app.scss vendored
View File

@ -406,6 +406,7 @@ input {
.content-container {
display: block;
margin-bottom: 40px;
}
// product card, requires no changes for responsiveness.
@ -1435,6 +1436,10 @@ section.slider-block {
border-bottom: 1px solid $border-color;
padding-bottom: 10px;
&:last-child {
border-bottom: 0;
}
.filter-attributes-title {
padding: 10px 40px 0 10px;
color: $other-font-color;
@ -1483,6 +1488,16 @@ section.slider-block {
background-image: url("../images/checkbox-checked.svg");
}
}
.color-swatch {
display: inline-block;
margin-right: 5px;
min-width: 20px;
height: 20px;
border: 1px solid #c7c7c7;
border-radius: 3px;
float: right;
}
}
}