Skip to content

Commit 0d65404

Browse files
reziaminireziamini
committed
Fix routing problem
1 parent 617ed7d commit 0d65404

File tree

7 files changed

+20
-35
lines changed

7 files changed

+20
-35
lines changed

‎resources/views/layouts/child-sidebar-menu.blade.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<li class="list-divider"></li>
22
<li class="nav-small-cap"><span class="hide-menu">{{ __('CRUD Menu') }}</span></li>
33
@foreach(\EasyPanel\Models\CRUD::active() as $crud)
4-
<li class='sidebar-item @isActive([getRouteName().".{$crud->name}.read", getRouteName().".{$crud->name}.create", getRouteName().".{$crud->name}.update"], "selected")'>
4+
<li class='sidebar-item @isActive([getRouteName().".{$crud->route}.read", getRouteName().".{$crud->route}.create", getRouteName().".{$crud->route}.update"], "selected")'>
55
<a class='sidebar-link has-arrow' href="javascript:void(0)" aria-expanded="false">
66
<i data-feather="{{ get_icon($crud->name) }}" class="feather-icon"></i>
77
<span class="hide-menu">{{ __(\Illuminate\Support\Str::plural(ucfirst($crud->name))) }}</span>
88
</a>
99
<ul aria-expanded="false" class="collapse first-level base-level-line">
10-
<li class="sidebar-item @isActive(getRouteName().'.'.$crud->name.'.read')">
11-
<a href="@route(getRouteName().'.'.$crud->name.'.read')" class="sidebar-link @isActive(getRouteName().'.'.$crud->name.'.read')">
10+
<li class="sidebar-item @isActive(getRouteName().'.'.$crud->route.'.read')">
11+
<a href="@route(getRouteName().'.'.$crud->route.'.read')" class="sidebar-link @isActive(getRouteName().'.'.$crud->route.'.read')">
1212
<span class="hide-menu"> {{ __('List') }} </span>
1313
</a>
1414
</li>
15-
@if(getCrudConfig($crud->name))
16-
<li class="sidebar-item @isActive(getRouteName().'.'.$crud->name.'.create')">
17-
<a href="@route(getRouteName().'.'.$crud->name.'.create')" class="sidebar-link @isActive(getRouteName().'.'.$crud->name.'.create')">
15+
@if(getCrudConfig($crud->name)->create)
16+
<li class="sidebar-item @isActive(getRouteName().'.'.$crud->route.'.create')">
17+
<a href="@route(getRouteName().'.'.$crud->route.'.create')" class="sidebar-link @isActive(getRouteName().'.'.$crud->route.'.create')">
1818
<span class="hide-menu"> {{ __('Create') }} </span>
1919
</a>
2020
</li>

‎resources/views/livewire/crud/single.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
<div x-show="deleteModal" class="cs-modal animate__animated animate__fadeIn">
1212
<div class="bg-white shadow rounded p-5" @click.away="deleteModal = false" >
13-
<h5 class="pb-2 border-bottom">{{ __('DeleteTitle', ['name' => __('Article') ]) }}</h5>
14-
<p>{{ __('DeleteMessage', ['name' => __('Article') ]) }}</p>
13+
<h5 class="pb-2 border-bottom">{{ __('DeleteTitle', ['name' => __('CRUD') ]) }}</h5>
14+
<p>{{ __('DeleteMessage', ['name' => __('CRUD') ]) }}</p>
1515
<div class="mt-5 d-flex justify-content-between">
1616
<a wire:click.prevent="delete" class="text-white btn btn-success shadow">{{ __('Yes, Delete it.') }}</a>
1717
<a @click.prevent="deleteModal = false" class="text-white btn btn-danger shadow">{{ __('No, Cancel it.') }}</a>

‎src/Commands/stub/blade/create.blade.stub‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="px-2 mt-4">
55
<ul class="breadcrumb mt-3 py-3 px-4 rounded" style="background-color: #e9ecef!important;">
66
<li class="breadcrumb-item"><a href="@route(getRouteName().'.home')" class="text-decoration-none">{{ __('Dashboard') }}</a></li>
7-
<li class="breadcrumb-item"><a href="@route(getRouteName().'.{{ model }}.read')" class="text-decoration-none">{{ __(\Illuminate\Support\Str::plural('{{ modelName }}')) }}</a></li>
7+
<li class="breadcrumb-item"><a href="@route(getRouteName().'.'.crud('{{ model }}')->route.'.read')" class="text-decoration-none">{{ __(\Illuminate\Support\Str::plural('{{ modelName }}')) }}</a></li>
88
<li class="breadcrumb-item active">{{ __('Create') }}</li>
99
</ul>
1010
</div>
@@ -18,7 +18,7 @@
1818

1919
<div class="card-footer">
2020
<button type="submit" class="btn btn-info ml-4">{{ __('Create') }}</button>
21-
<a href="@route(getRouteName().'.{{ model }}.read')" class="btn btn-default float-left">{{ __('Cancel') }}</a>
21+
<a href="@route(getRouteName().'.'.crud('{{ model }}')->route.'.read')" class="btn btn-default float-left">{{ __('Cancel') }}</a>
2222
</div>
2323
</form>
2424
</div>

‎src/Commands/stub/blade/read.blade.stub‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<div class="row justify-content-between mt-4 mb-4">
1515
@if(getCrudConfig('{{ model }}')->create)
1616
<div class="col-md-4 right-0">
17-
<a href="@route(getRouteName().'.{{ model }}.create')" class="btn btn-success">{{ __('CreateTitle', ['name' => __('{{ modelName }}') ]) }}</a>
17+
<a href="@route(getRouteName().'.'.crud('{{ model }}')->route.'.create')" class="btn btn-success">{{ __('CreateTitle', ['name' => __('{{ modelName }}') ]) }}</a>
1818
</div>
1919
@endif
2020
@if(getCrudConfig('{{ model }}')->searchable())

‎src/Commands/stub/blade/single.blade.stub‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<td>
55

66
@if(getCrudConfig('{{ model }}')->update)
7-
<a href="@route(getRouteName().'.{{ model }}.update', ['{{ model }}' => ${{ model }}->id])" class="btn text-primary mt-1">
7+
<a href="@route(getRouteName().'.'.crud('{{ model }}')->route.'.update', ['{{ model }}' => ${{ model }}->id])" class="btn text-primary mt-1">
88
<i class="icon-pencil"></i>
99
</a>
1010
@endif

‎src/Commands/stub/blade/update.blade.stub‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="px-2 mt-4">
55
<ul class="breadcrumb mt-3 py-3 px-4 rounded" style="background-color: #e9ecef!important;">
66
<li class="breadcrumb-item"><a href="@route(getRouteName().'.home')" class="text-decoration-none">{{ __('Dashboard') }}</a></li>
7-
<li class="breadcrumb-item"><a href="@route(getRouteName().'.{{ model }}.read')" class="text-decoration-none">{{ __(\Illuminate\Support\Str::plural('{{ modelName }}')) }}</a></li>
7+
<li class="breadcrumb-item"><a href="@route(getRouteName().'.'.crud('{{ model }}')->route.'.read')" class="text-decoration-none">{{ __(\Illuminate\Support\Str::plural('{{ modelName }}')) }}</a></li>
88
<li class="breadcrumb-item active">{{ __('Update') }}</li>
99
</ul>
1010
</div>
@@ -20,7 +20,7 @@
2020

2121
<div class="card-footer">
2222
<button type="submit" class="btn btn-info ml-4">{{ __('Update') }}</button>
23-
<a href="@route(getRouteName().'.{{ model }}.read')" class="btn btn-default float-left">{{ __('Cancel') }}</a>
23+
<a href="@route(getRouteName().'.'.crud('{{ model }}')->route.'.read')" class="btn btn-default float-left">{{ __('Cancel') }}</a>
2424
</div>
2525
</form>
2626
</div>

‎src/helpers.php‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ function getCrudConfig($name){
2929
}
3030
}
3131

32+
if(! function_exists('crud')) {
33+
function crud($name){
34+
return \EasyPanel\Models\CRUD::query()->where('name', $name)->first();
35+
}
36+
}
37+
3238
if(! function_exists('get_icon')) {
3339
function get_icon($type){
3440
$array = [
@@ -55,24 +61,3 @@ function get_icon($type){
5561
return $val ?? 'grid';
5662
}
5763
}
58-
59-
if(! function_exists('registerActionRoutes')){
60-
function registerActionRoutes($prefix, $component, $crudConfig)
61-
{
62-
Route::prefix($prefix)->name("$prefix.")->group(function () use ($component, $crudConfig) {
63-
64-
if(@class_exists("$component\\Read")) {
65-
Route::get('/', "$component\\Read")->name('read');
66-
}
67-
68-
if (@$crudConfig->create and @class_exists("$component\\Create")) {
69-
Route::get('/create', "$component\\Create")->name('create');
70-
}
71-
72-
if (@$crudConfig->update and @class_exists("$component\\Update")) {
73-
Route::get('/update/{' . $action . '}', "$component\\Update")->name('update');
74-
}
75-
76-
});
77-
}
78-
}

0 commit comments

Comments
 (0)