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

user on 404 page fixed

This commit is contained in:
jitendra 2018-10-18 11:54:36 +05:30
parent ef69538ccb
commit 258262935a
15 changed files with 96 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Kernel.php
View File

@ -19,6 +19,7 @@ class Kernel extends HttpKernel
\App\Http\Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\App\Http\Middleware\TrustProxies::class,
\Illuminate\Session\Middleware\StartSession::class,
];
/**
@ -31,7 +32,7 @@ class Kernel extends HttpKernel
\App\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
// \Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,

12
packages/Webkul/Admin/src/Http/routes.php
View File

@ -40,27 +40,27 @@ Route::group(['middleware' => ['web']], function () {
Route::get('dashboard', 'Webkul\Admin\Http\Controllers\DashboardController@index')->name('admin.dashboard.index');
//Customers Management Routes
Route::get('customer', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config', [
Route::get('customers', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config', [
'view' => 'admin::customers.index'
])->name('admin.customer.index');
Route::get('customer/orders', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config',[
Route::get('customers/orders', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config',[
'view' => 'admin::customers.orders.index'
])->name('admin.customer.orders.index');
Route::get('customer/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@create')->defaults('_config',[
Route::get('customers/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@create')->defaults('_config',[
'view' => 'admin::customers.create'
])->name('admin.customer.create');
Route::post('customer/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@store')->defaults('_config',[
Route::post('customers/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@store')->defaults('_config',[
'redirect' => 'admin.customer.index'
])->name('admin.customer.store');
Route::get('customer/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@edit')->defaults('_config',[
Route::get('customers/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@edit')->defaults('_config',[
'view' => 'admin::customers.edit'
])->name('admin.customer.edit');
Route::put('customer/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@update')->defaults('_config', [
Route::put('customers/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@update')->defaults('_config', [
'redirect' => 'admin.customer.index'
])->name('admin.customer.update');

22
packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
View File

@ -38,6 +38,15 @@ class AdminServiceProvider extends ServiceProvider
);
}
/**
* Register services.
*
* @return void
*/
public function register()
{
}
/**
* Bind the the data to the views
*
@ -76,19 +85,6 @@ class AdminServiceProvider extends ServiceProvider
});
}
/**
* Register services.
*
* @return void
*/
public function register()
{
// $this->mergeConfigFrom(
// __DIR__ . '/../Config/auth.php',
// 'auth'
// );
}
/**
* Merge the given configuration with the existing configuration.
*

BIN
packages/Webkul/Admin/src/Resources/assets/images/logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.2 KiB

24
packages/Webkul/Admin/src/Resources/assets/sass/app.scss vendored
View File

@ -526,30 +526,6 @@ body {
}
}
// customer oder css for admin start here
.sale-container {
.sale-section {

2
packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
View File

@ -7,6 +7,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="csrf-token" content="{{ csrf_token() }}">
<link rel="icon" sizes="16x16" href="{{ asset('vendor/webkul/ui/assets/images/favicon.ico') }}" />
<link rel="stylesheet" href="{{ asset('vendor/webkul/admin/assets/css/admin.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/webkul/ui/assets/css/ui.css') }}">

2
packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
View File

@ -14,7 +14,7 @@
<div class="dropdown-toggle">
<div style="display: inline-block; vertical-align: middle;">
<span class="name">
{{-- {{ auth()->guard('admin')->user()->name }} --}}
{{ auth()->guard('admin')->user()->name }}
</span>
<span class="role">

BIN
packages/Webkul/Shop/src/Resources/assets/images/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

5
packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue
View File

@ -7,11 +7,6 @@
:item="item"
:parent="index">
</category-item>
<li>
<img src="http://localhost/bagisto/public/vendor/webkul/shop/assets/images/offer-zone.svg"/>
<span>Offer Zone</span>
</li>
</ul>
</template>

2
packages/Webkul/Shop/src/Resources/assets/sass/components.scss vendored
View File

@ -1,5 +1,3 @@
@media only screen and (max-width: 425px) {
.product-card {
font-size: 90%;

98
packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
View File

@ -1,11 +1,14 @@
<div class="header" id="header">
<div class="header-top">
<div class="left-content">
<ul class="logo-container">
<li>
<a href="{{ route('shop.home.index') }}">
<img class="logo" src="{{ asset('vendor/webkul/shop/assets/images/logo.svg') }}" />
@if ($logo = core()->getCurrentChannel()->logo_url)
<img class="logo" src="{{ $logo }}" />
@else
<img class="logo" src="{{ bagisto_asset('images/logo.svg') }}" />
@endif
</a>
</li>
</ul>
@ -13,6 +16,7 @@
<ul class="search-container">
<li class="search-group">
<input type="search" class="search-field" placeholder="Search for products">
<div class="search-icon-wrapper">
<span class="icon icon-search"></span>
</div>
@ -29,6 +33,7 @@
<i class="icon arrow-down-icon active"></i>
</div>
</div>
@guest('customer')
<div class="dropdown-list bottom-right" style="display: none;">
<div class="dropdown-container">
@ -44,6 +49,7 @@
</div>
@endguest
@auth('customer')
<div class="dropdown-list bottom-right" style="display: none; max-width: 230px;">
<div class="dropdown-container">
@ -70,6 +76,7 @@
@endauth
</li>
</ul>
<ul class="cart-dropdown-container">
<?php $cart = cart()->getCart(); ?>
@ -79,27 +86,30 @@
<li class="cart-dropdown">
<span class="icon cart-icon"></span>
@if($cart)
@php
$items = $cart->items;
@endphp
<?php $items = $cart->items; ?>
<div class="dropdown-toggle">
<div style="display: inline-block; cursor: pointer;">
@if($cart->items_qty - intval($cart->items_qty) > 0)
<span class="name">
Cart
<span class="count"> ({{ $cart->items_qty }})</span>
</span>
@else
<span class="name">
Cart
<span class="count"> ({{ intval($cart->items_qty) }})</span>
</span>
@endif
</div>
<i class="icon arrow-down-icon active"></i>
</div>
<div class="dropdown-list" style="display: none; top: 50px; right: 0px">
<div class="dropdown-container">
<div class="dropdown-cart">
@ -110,41 +120,45 @@
<div class="dropdown-content">
@foreach($items as $item)
@if($item->type == "configurable")
<div class="item">
<div class="item-image" >
@php
$images = $productImageHelper->getProductBaseImage($item->child->product);
@endphp
<img src="{{ $images['small_image_url'] }}" />
<div class="item">
<div class="item-image" >
@php
$images = $productImageHelper->getProductBaseImage($item->child->product);
@endphp
<img src="{{ $images['small_image_url'] }}" />
</div>
<div class="item-details">
<div class="item-name">{{ $item->child->name }}</div>
<div class="item-price">{{ $item->total }}</div>
<div class="item-qty">Quantity - {{ $item->quantity }}</div>
</div>
</div>
<div class="item-details">
<div class="item-name">{{ $item->child->name }}</div>
<div class="item-price">{{ $item->total }}</div>
<div class="item-qty">Quantity - {{ $item->quantity }}</div>
</div>
</div>
@else
<div class="item">
<div class="item-image" >
@php
$images = $productImageHelper->getProductBaseImage($item->product);
@endphp
<img src="{{ $images['small_image_url'] }}" />
<div class="item">
<div class="item-image" >
@php
$images = $productImageHelper->getProductBaseImage($item->product);
@endphp
<img src="{{ $images['small_image_url'] }}" />
</div>
<div class="item-details">
<div class="item-name">{{ $item->name }}</div>
<div class="item-price">{{ $item->total }}</div>
<div class="item-qty">Quantity - {{ $item->quantity }}</div>
</div>
</div>
<div class="item-details">
<div class="item-name">{{ $item->name }}</div>
<div class="item-price">{{ $item->total }}</div>
<div class="item-qty">Quantity - {{ $item->quantity }}</div>
</div>
</div>
@endif
@endforeach
</div>
@ -157,7 +171,9 @@
</div>
</div>
</div>
@else
<div class="dropdown-toggle">
<div style="display: inline-block; cursor: pointer;">
@ -193,6 +209,7 @@
</div>
</div>
@endguest
@auth('customer')
<div class="dropdown-list bottom-right" style="display: none;">
<div class="dropdown-container">
@ -221,6 +238,7 @@
@endauth
</li>
</ul>
<ul class="resp-cart-dropdown-container">
<li class="cart-dropdown">
@ -277,23 +295,23 @@
hamMenu.addEventListener("click", header);
// for header responsive icon
function header(){
function header() {
var className = document.getElementById(this.id).className;
if(className === 'icon icon-search' ){
if(className === 'icon icon-search' ) {
search.classList.remove("icon-search");
search.classList.add("icon-menu-close");
hamMenu.classList.remove("icon-menu-close");
hamMenu.classList.add("icon-menu");
searchResponsive.style.display = 'block';
navResponsive.style.display = 'none';
}else if(className === 'icon icon-menu'){
} else if(className === 'icon icon-menu') {
hamMenu.classList.remove("icon-menu");
hamMenu.classList.add("icon-menu-close");
search.classList.remove("icon-menu-close");
search.classList.add("icon-search");
searchResponsive.style.display = 'none';
navResponsive.style.display = 'block';
}else{
} else {
search.classList.remove("icon-menu-close");
search.classList.add("icon-search");
hamMenu.classList.remove("icon-menu-close");

6
packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
View File

@ -11,6 +11,12 @@
<link rel="stylesheet" href="{{ bagisto_asset('css/shop.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/webkul/ui/assets/css/ui.css') }}">
@if ($favicon = core()->getCurrentChannel()->favicon_url)
<link rel="icon" sizes="16x16" href="{{ $favicon }}" />
@else
<link rel="icon" sizes="16x16" href="{{ bagisto_asset('images/favicon.ico') }}" />
@endif
@yield('head')
@section('seo')

BIN
packages/Webkul/Ui/src/Resources/assets/images/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

5
packages/Webkul/Ui/src/Resources/assets/sass/app.scss vendored
View File

@ -574,7 +574,12 @@ h2 {
}
.accordian {
display: inline-block;
width: 100%;
.accordian-header {
width: 100%;
display: inline-block;
font-size: 18px;
color: $font-color;
border-bottom: solid 1px $border-color;

40
public/themes/default/assets/js/shop.js vendored
View File

@ -30693,11 +30693,6 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
//
//
//
//
//
//
//
//
// define the item component
/* harmony default export */ __webpack_exports__["default"] = ({
@ -30735,36 +30730,15 @@ var render = function() {
return _c(
"ul",
{ staticClass: "nav" },
[
_vm._l(_vm.items, function(item, index) {
return _c("category-item", {
key: index,
attrs: { url: _vm.url, item: item, parent: index }
})
}),
_vm._v(" "),
_vm._m(0)
],
2
_vm._l(_vm.items, function(item, index) {
return _c("category-item", {
key: index,
attrs: { url: _vm.url, item: item, parent: index }
})
})
)
}
var staticRenderFns = [
function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
return _c("li", [
_c("img", {
attrs: {
src:
"http://localhost/bagisto/public/vendor/webkul/shop/assets/images/offer-zone.svg"
}
}),
_vm._v(" "),
_c("span", [_vm._v("Offer Zone")])
])
}
]
var staticRenderFns = []
render._withStripped = true
module.exports = { render: render, staticRenderFns: staticRenderFns }
if (false) {