Skip to content
This repository was archived by the owner on Jan 3, 2023. It is now read-only.

Commit db5ffa2

Browse files
ctf0ctf0
committed
formating
fix colspan use perm cache add delete btn to model edit view style
1 parent a80dfe9 commit db5ffa2

17 files changed

+195
-111
lines changed

‎src/Controllers/Admin/PagesController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function index()
3333
public function create()
3434
{
3535
$roles = Role::pluck('name', 'name');
36-
$permissions = Permission::pluck('name', 'name');
36+
$permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
3737
$menus = $this->cache->tags('sm')->get('menus')->pluck('name', 'id');
3838
$templates = array_unique($this->cache->tags('sm')->get('pages')->pluck('template')->filter()->all());
3939

@@ -76,7 +76,7 @@ public function store(Request $request)
7676
public function edit($id)
7777
{
7878
$roles = Role::pluck('name', 'name');
79-
$permissions = Permission::pluck('name', 'name');
79+
$permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
8080
$page = $this->cache->tags('sm')->get('pages')->find($id) ?: abort(404);
8181
$menus = $this->cache->tags('sm')->get('menus')->pluck('name', 'id');
8282
$templates = array_unique($this->cache->tags('sm')->get('pages')->pluck('template')->filter()->all());

‎src/Controllers/Admin/PermissionsController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class PermissionsController extends BaseController
1818
*/
1919
public function index()
2020
{
21-
$permissions = Permission::get();
21+
$permissions = $this->cache->get('spatie.permission.cache');
2222

2323
return view("{$this->adminPath}.permissions.index", compact('permissions'));
2424
}
@@ -62,7 +62,7 @@ public function store(Request $request)
6262
*/
6363
public function edit($id)
6464
{
65-
$permission = Permission::find($id);
65+
$permission = $this->cache->get('spatie.permission.cache')->find($id);
6666

6767
return view("{$this->adminPath}.permissions.edit", compact('permission'));
6868
}
@@ -81,7 +81,7 @@ public function update($id, Request $request)
8181
'name' => 'required|unique:permissions,name,' . $id,
8282
]);
8383

84-
Permission::find($id)->update($request->all());
84+
$this->cache->get('spatie.permission.cache')->find($id)->update($request->all());
8585

8686
$this->clearCache();
8787

‎src/Controllers/Admin/RolesController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function index()
3131
*/
3232
public function create()
3333
{
34-
$permissions = Permission::pluck('name', 'name');
34+
$permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
3535

3636
return view("{$this->adminPath}.roles.create", compact('permissions'));
3737
}
@@ -69,7 +69,7 @@ public function store(Request $request)
6969
public function edit($id)
7070
{
7171
$role = Role::find($id);
72-
$permissions = Permission::pluck('name', 'name');
72+
$permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
7373

7474
return view("{$this->adminPath}.roles.edit", compact('role', 'permissions'));
7575
}

‎src/Controllers/Admin/UsersController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function index()
3232
public function create()
3333
{
3434
$roles = Role::pluck('name', 'name');
35-
$permissions = Permission::pluck('name', 'name');
35+
$permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
3636

3737
return view("{$this->adminPath}.users.create", compact('roles', 'permissions'));
3838
}
@@ -76,7 +76,7 @@ public function edit($id)
7676
{
7777
$user = $this->cache->get('sm-users')->find($id) ?: abort(404);
7878
$roles = Role::pluck('name', 'name');
79-
$permissions = Permission::pluck('name', 'name');
79+
$permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
8080

8181
return view("{$this->adminPath}.users.edit", compact('user', 'roles', 'permissions'));
8282
}

‎src/Models/Traits/SMUsers.php

-8
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,11 @@
33
namespace ctf0\SimpleMenu\Models\Traits;
44

55
use Spatie\Permission\Traits\HasRoles;
6-
use Illuminate\Database\Eloquent\Builder;
76

87
trait SMUsers
98
{
109
use HasRoles;
1110

12-
public static function bootSMUsers()
13-
{
14-
static::addGlobalScope('relations', function (Builder $builder) {
15-
$builder->with(['roles', 'permissions']);
16-
});
17-
}
18-
1911
// Mutator for Password
2012
public function setPasswordAttribute($value)
2113
{

‎src/Traits/MenusTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function query($name)
5454
return collect($this->cache->tags('sm')->get('menus')->where('name', $name)->first()->pages)
5555
->sortBy('pivot_order')
5656
->filter(function ($item) {
57-
return '' != $item->url;
57+
return $item->url != '';
5858
});
5959
});
6060
}

‎src/Traits/Ops.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ protected function createCaches()
3535
});
3636

3737
$this->cache->rememberForever('sm-users', function () {
38-
return app(config('simpleMenu.models.user'))->get();
38+
return app(config('simpleMenu.models.user'))->with(['roles', 'permissions'])->get();
3939
});
4040
}
4141

‎src/resources/views/admin/bulma/menus/edit.blade.php

+16-6
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,27 @@
1010
</h3>
1111
</div>
1212
<div class="level-right">
13-
<a href="{{ route($crud_prefix.'.menus.create') }}"
14-
class="button is-success">
15-
{{ trans('SimpleMenu::messages.add_new') }}
16-
</a>
13+
{{-- create new --}}
14+
<div class="level-item">
15+
<a href="{{ route($crud_prefix.'.menus.create') }}"
16+
class="button is-success">
17+
{{ trans('SimpleMenu::messages.add_new') }}
18+
</a>
19+
</div>
20+
21+
{{-- delete --}}
22+
<div class="level-item">
23+
{{ Form::open(['method' => 'DELETE', 'route' => [$crud_prefix.'.menus.destroy', $menu->id]]) }}
24+
<button type="submit" class="button is-danger">{{ trans('SimpleMenu::messages.delete') }}</button>
25+
{{ Form::close() }}
26+
</div>
1727
</div>
1828
</div>
1929
</h3>
2030

2131
<sm-menu inline-template
22-
get-menu-pages="{{ route($crud_prefix.'.menus.getMenuPages',['id' => $menu->id]) }}"
23-
del-page="{{ route($crud_prefix.'.menus.removePage',['id' => $menu->id]) }}"
32+
get-menu-pages="{{ route($crud_prefix.'.menus.getMenuPages', ['id' => $menu->id]) }}"
33+
del-page="{{ route($crud_prefix.'.menus.removePage', ['id' => $menu->id]) }}"
2434
del-child="{{ route($crud_prefix.'.menus.removeChild') }}"
2535
locale="{{ LaravelLocalization::getCurrentLocale() }}">
2636
<div>

‎src/resources/views/admin/bulma/menus/index.blade.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ class="cbx-checkbox"
8585
</td>
8686
<td class="data-sort-name">{{ $menu->name }}</td>
8787
<td>
88-
<a href="{{ route($crud_prefix.'.menus.edit',[$menu->id]) }}" class="button is-link is-inline-block">
88+
<a href="{{ route($crud_prefix.'.menus.edit', $menu->id) }}" class="button is-link is-inline-block">
8989
{{ trans('SimpleMenu::messages.edit') }}
9090
</a>
9191
<a class="is-inline-block">
9292
{{ Form::open([
93-
'method' => 'DELETE',
94-
'route' => [$crud_prefix.'.menus.destroy', $menu->id],
95-
'data-id' => 'menu-'.$menu->id,
96-
'@submit.prevent' => 'DelItem($event,"'.$menu->name.'")'
93+
'method' => 'DELETE',
94+
'route' => [$crud_prefix.'.menus.destroy', $menu->id],
95+
'data-id' => 'menu-'.$menu->id,
96+
'@submit.prevent' => 'DelItem($event, "'.$menu->name.'")'
9797
]) }}
9898
{{ Form::submit(trans('SimpleMenu::messages.delete'), ['class' => 'button is-danger']) }}
9999
{{ Form::close() }}
@@ -103,7 +103,7 @@ class="cbx-checkbox"
103103
@endforeach
104104

105105
<tr v-if="itemsCount == 0">
106-
<td colspan="2">{{ trans('SimpleMenu::messages.no_entries') }}</td>
106+
<td colspan="3" style="text-align: center">{{ trans('SimpleMenu::messages.no_entries') }}</td>
107107
</tr>
108108
</tbody>
109109
</table>

‎src/resources/views/admin/bulma/pages/edit.blade.php

+69-33
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,46 @@
1313
</h3>
1414
</div>
1515
<div class="level-right">
16-
<a href="{{ route($crud_prefix.'.pages.create') }}"
17-
class="button is-success">
18-
{{ trans('SimpleMenu::messages.add_new') }}
19-
</a>
16+
{{-- create new --}}
17+
<div class="level-item">
18+
<a href="{{ route($crud_prefix.'.pages.create') }}"
19+
class="button is-success">
20+
{{ trans('SimpleMenu::messages.add_new') }}
21+
</a>
22+
</div>
23+
24+
@if ($page->trashed())
25+
{{-- restore --}}
26+
<div class="level-item">
27+
{{ Form::open(['method' => 'PUT', 'route' => [$crud_prefix.'.pages.restore', $page->id]]) }}
28+
<button type="submit" class="button is-link">
29+
{{ trans('SimpleMenu::messages.restore') }}
30+
</button>
31+
{{ Form::close() }}
32+
</div>
33+
34+
{{-- soft delete --}}
35+
<div class="level-item">
36+
{{ Form::open(['method' => 'DELETE', 'route' => [$crud_prefix.'.pages.destroy_force', $page->id]]) }}
37+
<button type="submit" class="button is-danger">
38+
{{ trans('SimpleMenu::messages.perm_delete') }}
39+
</button>
40+
{{ Form::close() }}
41+
</div>
42+
@else
43+
<div class="level-item">
44+
{{-- delete --}}
45+
@php
46+
$check = $page->route_name == $crud_prefix ? 'disabled' : '';
47+
@endphp
48+
49+
{{ Form::open(['method' => 'DELETE', 'route' => [$crud_prefix.'.pages.destroy', $page->id]]) }}
50+
<button type="submit" class="button is-danger" {{ $check }}>
51+
{{ trans('SimpleMenu::messages.delete') }}
52+
</button>
53+
{{ Form::close() }}
54+
</div>
55+
@endif
2056
</div>
2157
</div>
2258

@@ -45,7 +81,7 @@ class="button is-success">
4581
name="meta[{{ $code }}]"
4682
class="input toggle-pad"
4783
v-show="showMeta('{{ $code }}')"
48-
value="{{ $page->getTranslationWithoutFallback('meta',$code) }}"
84+
value="{{ $page->getTranslationWithoutFallback('meta', $code) }}"
4985
placeholder="keyword1, etc..">
5086
@endforeach
5187
</div>
@@ -67,10 +103,10 @@ class="input toggle-pad"
67103
{{ Form::label('action', trans('SimpleMenu::messages.action'), ['class' => 'label']) }}
68104
<div class="control">
69105
{{ Form::text(
70-
'action',
71-
$page->action,
72-
['class' => 'input',
73-
'placeholder' => "Any\Name\Space\SomeController@methodName",
106+
'action',
107+
$page->action,
108+
['class' => 'input',
109+
'placeholder' => "Any\Name\Space\SomeController@methodName",
74110
'ref' => 'action'])
75111
}}
76112
<span class="help">
@@ -89,10 +125,10 @@ class="input toggle-pad"
89125
{{ Form::label('template', trans('SimpleMenu::messages.template'), ['class' => 'label']) }}
90126
<div class="control">
91127
{{ Form::text(
92-
'template',
93-
$page->template,
94-
['class' => 'input',
95-
'placeholder' => "ex.'folder.hero' or 'Vendor::xyz'",
128+
'template',
129+
$page->template,
130+
['class' => 'input',
131+
'placeholder' => "ex.'folder.hero' or 'Vendor::xyz'",
96132
'ref' => 'template'])
97133
}}
98134
</div>
@@ -115,9 +151,9 @@ class="input toggle-pad"
115151
{{ Form::label('route_name', trans('SimpleMenu::messages.route_name'), ['class' => 'label']) }}
116152
<div class="control">
117153
{{ Form::text(
118-
'route_name',
119-
$page->route_name,
120-
['class' => 'input','placeholder' => "route-name"])
154+
'route_name',
155+
$page->route_name,
156+
['class' => 'input', 'placeholder' => "route-name"])
121157
}}
122158
</div>
123159
@if($errors->has('route_name'))
@@ -132,9 +168,9 @@ class="input toggle-pad"
132168
{{ Form::label('middlewares', trans('SimpleMenu::messages.middlewares'), ['class' => 'label']) }}
133169
<div class="control">
134170
{{ Form::text(
135-
'middlewares',
136-
$page->middlewares,
137-
['class' => 'input','placeholder' => "some, other, middleware"])
171+
'middlewares',
172+
$page->middlewares,
173+
['class' => 'input', 'placeholder' => "some, other, middleware"])
138174
}}
139175
</div>
140176
</div>
@@ -183,7 +219,7 @@ class="input toggle-pad"
183219
<input type="text" name="title[{{ $code }}]"
184220
class="input toggle-pad"
185221
v-show="showTitle('{{ $code }}')"
186-
value="{{ $page->getTranslationWithoutFallback('title',$code) }}"
222+
value="{{ $page->getTranslationWithoutFallback('title', $code) }}"
187223
placeholder="Some Title">
188224
@endforeach
189225
</div>
@@ -210,7 +246,7 @@ class="input toggle-pad"
210246
name="body[{{ $code }}]"
211247
class="textarea"
212248
v-show="showBody('{{ $code }}')">
213-
{{ $page->getTranslationWithoutFallback('body',$code) }}
249+
{{ $page->getTranslationWithoutFallback('body', $code) }}
214250
</textarea>
215251
@endforeach
216252
</div>
@@ -232,7 +268,7 @@ class="textarea"
232268
name="desc[{{ $code }}]"
233269
class="textarea"
234270
v-show="showDesc('{{ $code }}')">
235-
{{ $page->getTranslationWithoutFallback('desc',$code) }}
271+
{{ $page->getTranslationWithoutFallback('desc', $code) }}
236272
</textarea>
237273
@endforeach
238274
</div>
@@ -265,7 +301,7 @@ class="textarea"
265301
name="prefix[{{ $code }}]"
266302
class="input toggle-pad"
267303
v-show="showPrefix('{{ $code }}')"
268-
value="{{ $page->getTranslationWithoutFallback('prefix',$code) }}"
304+
value="{{ $page->getTranslationWithoutFallback('prefix', $code) }}"
269305
placeholder="abc">
270306
@endforeach
271307
</div>
@@ -287,7 +323,7 @@ class="input toggle-pad"
287323
name="url[{{ $code }}]"
288324
class="input toggle-pad"
289325
v-show="showUrl('{{ $code }}')"
290-
value="{{ $page->getTranslationWithoutFallback('url',$code) }}"
326+
value="{{ $page->getTranslationWithoutFallback('url', $code) }}"
291327
placeholder="xyz/{someParam}">
292328
@endforeach
293329
</div>
@@ -303,9 +339,9 @@ class="input toggle-pad"
303339
{{ Form::label('menus', trans('SimpleMenu::messages.menus'), ['class' => 'label']) }}
304340
<div class="control">
305341
{{ Form::select(
306-
'menus[]',
307-
$menus,
308-
$page->menus->pluck('id', 'name'),
342+
'menus[]',
343+
$menus,
344+
$page->menus->pluck('id', 'name'),
309345
['class' => 'select2', 'multiple' => 'multiple'])
310346
}}
311347
</div>
@@ -327,9 +363,9 @@ class="input toggle-pad"
327363
{{ Form::label('roles', trans('SimpleMenu::messages.roles'), ['class' => 'label']) }}
328364
<div class="control">
329365
{{ Form::select(
330-
'roles[]',
331-
$roles,
332-
$page->roles->pluck('name', 'name'),
366+
'roles[]',
367+
$roles,
368+
$page->roles->pluck('name', 'name'),
333369
['class' => 'select2', 'multiple' => 'multiple'])
334370
}}
335371
</div>
@@ -340,9 +376,9 @@ class="input toggle-pad"
340376
{{ Form::label('permissions', trans('SimpleMenu::messages.permissions'), ['class' => 'label']) }}
341377
<div class="control">
342378
{{ Form::select(
343-
'permissions[]',
344-
$permissions,
345-
$page->permissions->pluck('name', 'name'),
379+
'permissions[]',
380+
$permissions,
381+
$page->permissions->pluck('name', 'name'),
346382
['class' => 'select2', 'multiple' => 'multiple'])
347383
}}
348384
</div>

0 commit comments

Comments
 (0)