a1gard
/
xshop
mirror of https://github.com/4xmen/xshop.git
1
0
Fork 1
Code Issues 1 Packages Projects Releases Wiki Activity

fixed bug acl middleware

Browse Source 
fixed bug for any hasAnyAccess
optimized navbar blade
pull/6/head
A1Gard 2 years ago
parent 249a2ed913
commit a44c2f57b9
3 changed files with 383 additions and 340 deletions
Show Stats Download Patch File Download Diff File

2
app/Http/Middleware/Acl.php
Unescape Escape View File

@ -34,7 +34,7 @@ class Acl
return abort(403, __("You dont't have acccess this acction"));
}
// check delete or destroy with bulk action
if ($requestPath[2] == 'bulk' && $request->input('bulk') == 'delete') {
if (isset($requestPath[2]) && $requestPath[2] == 'bulk' && $request->input('bulk') == 'delete') {
$requestPath[2] = 'delete';
if (!auth()->user()->hasAccess(implode('.', $requestPath))) {
$requestPath[2] = 'destroy';

2
app/Models/User.php
Unescape Escape View File

@ -101,7 +101,7 @@ class User extends Authenticatable
return $this->hasMany(Access::class);
}
public function hasAnyAccess($name){
return $this->accesses()->where('route','LIKE','%'.$name.'%')->count() > 0;
return $this->accesses()->where('route','LIKE','%.'.$name.'.%')->count() > 0;
}
public function hasAccess($route){

719
resources/views/vendor/starter-kit/component/navbar.blade.php vendored
Unescape Escape View File

@ -13,156 +13,173 @@
{{__("Catalog")}}
</a>
<ul>
<li id="product-li">
<a>
<i class="fa fa-gem"></i>
{{__('Products')}}
</a>
<ul>
<li>
<a href="{{route('admin.product.index')}}">
{{__('Products list')}}
</a>
</li>
<li>
<a href="{{route('admin.product.create')}}">
{{__('New Product')}}
</a>
</li>
</ul>
</li>
<li id="invoices-li">
<a>
<i class="fa fa-file-invoice"></i>
{{__('Invoices')}}
</a>
<ul>
<li>
<a href="{{route('admin.invoice.index')}}">
{{__('Invoices list')}}
</a>
</li>
<li>
<a href="{{route('admin.invoice.create')}}">
{{__('New Invoice')}}
</a>
</li>
</ul>
</li>
<li>
<a>
<i class="fa fa-users"></i>
{{__('Customers')}}
</a>
<ul>
<li>
<a href="{{route('admin.customer.index')}}">
{{__('Customers list')}}
</a>
</li>
<li>
<a href="{{route('admin.customer.create')}}">
{{__('New Customer')}}
</a>
</li>
</ul>
</li>
<li id="discount-li">
<a>
<i class="fa fa-percent"></i>
{{__('Discounts')}}
</a>
<ul>
<li>
<a href="{{route('admin.discount.index')}}">
{{__('Discounts list')}}
</a>
</li>
<li>
<a href="{{route('admin.discount.create')}}">
{{__('New discount')}}
</a>
</li>
</ul>
</li>
<li id="questions-li">
<a href="{{route('admin.question.index')}}">
<i class="fa fa-question"></i>
{{__('Questions')}}
</a>
</li>
<li id="tickets-li">
<a href="{{route('admin.ticket.index')}}">
<i class="fa fa-envelope"></i>
{{__('Tickets')}}
</a>
</li>
<li>
<a>
<i class="fa fa-cubes"></i>
{{__('Product categories')}}
</a>
<ul>
<li>
<a href="{{route('admin.cat.index')}}">
{{__('Product categories list')}}
</a>
</li>
<li>
<a href="{{route('admin.cat.create')}}">
{{__('New Product category')}}
</a>
</li>
<li>
<a href="{{route('admin.cat.sort')}}">
{{__('Product categories node')}}
</a>
</li>
</ul>
</li>
<li>
<a>
<i class="fa fa-truck"></i>
{{__('Transports')}}
</a>
<ul>
<li>
<a href="{{route('admin.transport.index')}}">
{{__('Transports list')}}
</a>
</li>
<li>
<a href="{{route('admin.transport.create')}}">
{{__('New transport')}}
</a>
</li>
</ul>
</li>
<li>
<a >
<i class="fa fa-project-diagram"></i>
{{__("Properties meta")}}
</a>
<ul>
<li>
<a href="{{route('admin.props.index')}}">
{{__("Properties list")}}
</a>
</li>
<li>
<a href="{{route('admin.props.create')}}">
{{__("New Property")}}
</a>
</li>
</ul>
@if(auth()->user()->hasAnyAccess('product'))
<li id="product-li">
<a>
<i class="fa fa-gem"></i>
{{__('Products')}}
</a>
<ul>
<li>
<a href="{{route('admin.product.index')}}">
{{__('Products list')}}
</a>
</li>
<li>
<a href="{{route('admin.product.create')}}">
{{__('New Product')}}
</a>
</li>
</ul>
</li>
@endif
@if(auth()->user()->hasAnyAccess('invoice'))
<li id="invoices-li">
<a>
<i class="fa fa-file-invoice"></i>
{{__('Invoices')}}
</a>
<ul>
<li>
<a href="{{route('admin.invoice.index')}}">
{{__('Invoices list')}}
</a>
</li>
<li>
<a href="{{route('admin.invoice.create')}}">
{{__('New Invoice')}}
</a>
</li>
</ul>
</li>
@endif
@if(auth()->user()->hasAnyAccess('customer'))
<li>
<a>
<i class="fa fa-users"></i>
{{__('Customers')}}
</a>
<ul>
<li>
<a href="{{route('admin.customer.index')}}">
{{__('Customers list')}}
</a>
</li>
<li>
<a href="{{route('admin.customer.create')}}">
{{__('New Customer')}}
</a>
</li>
</ul>
</li>
@endif
@if(auth()->user()->hasAnyAccess('discount'))
<li id="discount-li">
<a>
<i class="fa fa-percent"></i>
{{__('Discounts')}}
</a>
<ul>
<li>
<a href="{{route('admin.discount.index')}}">
{{__('Discounts list')}}
</a>
</li>
<li>
<a href="{{route('admin.discount.create')}}">
{{__('New discount')}}
</a>
</li>
</ul>
</li>
@endif
@if(auth()->user()->hasAnyAccess('question'))
<li id="questions-li">
<a href="{{route('admin.question.index')}}">
<i class="fa fa-question"></i>
{{__('Questions')}}
</a>
</li>
@endif
@if(auth()->user()->hasAnyAccess('ticket'))
<li id="tickets-li">
<a href="{{route('admin.ticket.index')}}">
<i class="fa fa-envelope"></i>
{{__('Tickets')}}
</a>
</li>
@endif
@if(auth()->user()->hasAnyAccess('cat'))
<li>
<a>
<i class="fa fa-cubes"></i>
{{__('Product categories')}}
</a>
<ul>
<li>
<a href="{{route('admin.cat.index')}}">
{{__('Product categories list')}}
</a>
</li>
<li>
<a href="{{route('admin.cat.create')}}">
{{__('New Product category')}}
</a>
</li>
<li>
<a href="{{route('admin.cat.sort')}}">
{{__('Product categories node')}}
</a>
</li>
</ul>
</li>
@endif
@if(auth()->user()->hasAnyAccess('transport'))
</li>
<li>
<a>
<i class="fa fa-truck"></i>
{{__('Transports')}}
</a>
<ul>
<li>
<a href="{{route('admin.transport.index')}}">
{{__('Transports list')}}
</a>
</li>
<li>
<a href="{{route('admin.transport.create')}}">
{{__('New transport')}}
</a>
</li>
</ul>
</li>
@endif
@if(auth()->user()->hasAnyAccess('props'))
<li>
<a>
<i class="fa fa-project-diagram"></i>
{{__("Properties meta")}}
</a>
<ul>
<li>
<a href="{{route('admin.props.index')}}">
{{__("Properties list")}}
</a>
</li>
<li>
<a href="{{route('admin.props.create')}}">
{{__("New Property")}}
</a>
</li>
</ul>
</li>
@endif
</ul>
</li>
<li id="cms" class="main-nav">
<a>
<i class="fab fa-internet-explorer"></i>
@ -170,217 +187,243 @@
{{__("Website contents")}}
</a>
<ul>
<li id="posts-li">
<a>
<i class="fa fa-bullhorn"></i>
{{__('Post')}}
</a>
<ul>
<li>
<a href="{{route('admin.post.index')}}">
{{__('Post list')}}
</a>
</li>
<li>
<a href="{{route('admin.post.create')}}">
{{__('New Post')}}
</a>
</li>
</ul>
</li>
<li>
<a>
<i class="fa fa-book"></i>
{{__('Categories')}}
</a>
<ul>
<li>
<a href="{{route('admin.category.index')}}">
{{__('Categories list')}}
</a>
</li>
<li>
<a href="{{route('admin.category.create')}}">
{{__('New category')}}
</a>
</li>
<li>
<a href="{{route('admin.category.sort')}}">
{{__('Categories node')}}
</a>
</li>
</ul>
@if(auth()->user()->hasAnyAccess('post'))
<li id="posts-li">
<a>
<i class="fa fa-bullhorn"></i>
{{__('Post')}}
</a>
<ul>
<li>
<a href="{{route('admin.post.index')}}">
{{__('Post list')}}
</a>
</li>
<li>
<a href="{{route('admin.post.create')}}">
{{__('New Post')}}
</a>
</li>
</ul>
</li>
@endif
@if(auth()->user()->hasAnyAccess('category'))
<li>
<a>
<i class="fa fa-book"></i>
{{__('Categories')}}
</a>
<ul>
<li>
<a href="{{route('admin.category.index')}}">
{{__('Categories list')}}
</a>
</li>
<li>
<a href="{{route('admin.category.create')}}">
{{__('New category')}}
</a>
</li>
<li>
<a href="{{route('admin.category.sort')}}">
{{__('Categories node')}}
</a>
</li>
</ul>
</li>
</li>
@endif
@if(auth()->user()->hasAnyAccess('gallery'))
<li>
<a>
<i class="fa fa-images"></i>
{{__("Galleries")}}
</a>
<ul>
<li>
<a href="{{route('admin.gallery.all')}}">
{{-- <i class="fa fa-list-alt"></i> --}}
{{__("Gallery list")}}
</a>
</li>
<li>
<a href="{{route('admin.gallery.create')}}">
{{-- <i class="fa fa-plus-square"></i>--}}
{{__("New gallery")}}
</a>
</li>
</ul>
<li>
<a >
<i class="fa fa-images"></i>
{{__("Galleries")}}
</a>
<ul>
<li>
<a href="{{route('admin.gallery.all')}}">
{{-- <i class="fa fa-list-alt"></i> --}}
{{__("Gallery list")}}
</a>
</li>
<li>
<a href="{{route('admin.gallery.create')}}">
{{-- <i class="fa fa-plus-square"></i>--}}
{{__("New gallery")}}
</a>
</li>
</ul>
</li>
@endif
@if(auth()->user()->hasAnyAccess('clip'))
<li>
<a>
<i class="fa fa-file-video"></i>
{{__("Video clips")}}
</a>
<ul>
<li>
<a href="{{route('admin.clip.index')}}">
{{__("Video list")}}
</a>
</li>
<li>
<a href="{{route('admin.clip.create')}}">
{{__("New Video")}}
</a>
</li>
</ul>
</li>
<li>
<a >
<i class="fa fa-file-video"></i>
{{__("Video clips")}}
</a>
<ul>
<li>
<a href="{{route('admin.clip.index')}}">
{{__("Video list")}}
</a>
</li>
<li>
<a href="{{route('admin.clip.create')}}">
{{__("New Video")}}
</a>
</li>
</ul>
</li>
@endif
@if(auth()->user()->hasAnyAccess('adv'))
<li>
<a>
<i class="fa fa-atom"></i>
{{__("Advertise")}}
</a>
<ul>
<li>
<a href="{{route('admin.adv.index')}}">
{{__("Advertise list")}}
</a>
</li>
<li>
<a href="{{route('admin.adv.create')}}">
{{__("New Advertise")}}
</a>
</li>
</ul>
</li>
<li>
<a >
<i class="fa fa-atom"></i>
{{__("Advertise")}}
</a>
<ul>
<li>
<a href="{{route('admin.adv.index')}}">
{{__("Advertise list")}}
</a>
</li>
<li>
<a href="{{route('admin.adv.create')}}">
{{__("New Advertise")}}
</a>
</li>
</ul>
</li>
@endif
@if(auth()->user()->hasAnyAccess('menu'))
<li>
<a href="{{route('admin.menu.index')}}">
<i class="fa fa-list-alt"></i>
{{__("Menus")}}
</a>
</li>
@endif
@if(auth()->user()->hasAnyAccess('props'))
<li>
<a>
<i class="fa fa-file-image"></i>
{{__("Slider")}}
</a>
<ul>
<li>
<a href="{{route('admin.slider.index')}}">
{{__("Slider list")}}
</a>
</li>
<li>
<a href="{{route('admin.slider.create')}}">
{{__("New Slider")}}
</a>
</li>
</ul>
</li>
<li>
<a href="{{route('admin.menu.index')}}" >
<i class="fa fa-list-alt"></i>
{{__("Menus")}}
</a>
</li>
<li>
<a >
<i class="fa fa-file-image"></i>
{{__("Slider")}}
</a>
<ul>
<li>
<a href="{{route('admin.slider.index')}}">
{{__("Slider list")}}
</a>
</li>
<li>
<a href="{{route('admin.slider.create')}}">
{{__("New Slider")}}
</a>
</li>
</ul>
</li>
@endif
@if(auth()->user()->hasAnyAccess('poll'))
<li>
<a>
<i class="fa fa-vote-yea"></i>
{{__("Poll")}}
</a>
<ul>
<li>
<a href="{{route('admin.poll.index')}}">
{{__("Polls list")}}
</a>
</li>
<li>
<a href="{{route('admin.poll.create')}}">
{{__("New Poll")}}
</a>
</li>
</ul>
</li>
<li>
<a >
<i class="fa fa-vote-yea"></i>
{{__("Poll")}}
</a>
<ul>
<li>
<a href="{{route('admin.poll.index')}}">
{{__("Polls list")}}
</a>
</li>
<li>
<a href="{{route('admin.poll.create')}}">
{{__("New Poll")}}
</a>
</li>
</ul>
</li>
</li>
@endif
</ul>
</li>
<li>
<a href="{{route('admin.comment.index')}}">
<i class="fa fa-comments"></i>
{{__('Comments')}}
</a>
</li>
<li>
<a href="{{route('admin.setting.index')}}">
<i class="fa fa-cogs"></i>
{{__("Setting")}}
</a>
</li>
<li>
<a href="{{route('admin.attachment.index')}}">
<i class="fa fa-paperclip"></i>
{{__("Attachments")}}
</a>
</li>
<li>
<a href="{{route('admin.contact.index')}}">
<i class="fa fa-envelope"></i>
{{__("Contact us")}}
</a>
</li>
<li>
<a href="{{route('admin.logs.index')}}">
<i class="fa fa-list-alt"></i>
{{__('Logs')}}
</a>
</li>
<li>
<a >
<i class="fa fa-users"></i>
{{__("Users")}}
</a>
<ul>
<li>
<a href="{{route('admin.user.all')}}">
{{-- <i class="fa fa-list-alt"></i> --}}
{{__("Users list")}}
</a>
</li>
<li>
<a href="{{route('admin.user.create')}}">
{{-- <i class="fa fa-plus-square"></i>--}}
{{__("New user")}}
</a>
</li>
</ul>
@if(auth()->user()->hasAnyAccess('comment'))
<li>
<a href="{{route('admin.comment.index')}}">
<i class="fa fa-comments"></i>
{{__('Comments')}}
</a>
</li>
@endif
@if(auth()->user()->hasAnyAccess('setting'))
<li>
<a href="{{route('admin.setting.index')}}">
<i class="fa fa-cogs"></i>
{{__("Setting")}}
</a>
</li>
@endif
@if(auth()->user()->hasAnyAccess('attachment'))
<li>
<a href="{{route('admin.attachment.index')}}">
<i class="fa fa-paperclip"></i>
{{__("Attachments")}}
</a>
</li>
@endif
@if(auth()->user()->hasAnyAccess('contact'))
<li>
<a href="{{route('admin.contact.index')}}">
<i class="fa fa-envelope"></i>
{{__("Contact us")}}
</a>
</li>
@endif
@if(auth()->user()->hasAnyAccess('logs'))
<li>
<a href="{{route('admin.logs.index')}}">
<i class="fa fa-list-alt"></i>
{{__('Logs')}}
</a>
</li>
@endif
@if(auth()->user()->hasRole('super-admin'))
<li>
<a>
<i class="fa fa-users"></i>
{{__("Users")}}
</a>
<ul>
<li>
<a href="{{route('admin.user.all')}}">
{{-- <i class="fa fa-list-alt"></i> --}}
{{__("Users list")}}
</a>
</li>
<li>
<a href="{{route('admin.user.create')}}">
{{-- <i class="fa fa-plus-square"></i>--}}
{{__("New user")}}
</a>
</li>
</ul>
</li>
</li>
@endif
@guest
<li >
<li>
<a href="{{ route('login') }}"> <i class="fa fas fa-sign-in"></i> {{ __('Login') }}</a>
</li>
@if (Route::has('register'))
<li >
<li>
<a href="{{ route('register') }}"> <i class="fa fas fa-sign-in"></i> {{ __('Register') }}</a>
</li>
@endif

Write Preview
Loading…
Cancel
Save