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

Commit 7ce18e9

Browse files
ctf0ctf0
committed
styling
1 parent 405b56f commit 7ce18e9

File tree

10 files changed

+71
-86
lines changed

10 files changed

+71
-86
lines changed

‎src/Controllers/Admin/PagesController.php

+4-6
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
namespace ctf0\SimpleMenu\Controllers\Admin;
44

55
use Illuminate\Http\Request;
6-
use Spatie\Permission\Models\Role;
76
use ctf0\SimpleMenu\Facade\SimpleMenu;
8-
use Spatie\Permission\Models\Permission;
97
use ctf0\SimpleMenu\Controllers\BaseController;
108
use ctf0\SimpleMenu\Controllers\Admin\Traits\PageOps;
119
use ctf0\SimpleMenu\Controllers\Admin\Traits\UserPageOps;
@@ -34,8 +32,8 @@ public function index()
3432
public function create()
3533
{
3634
$locales = SimpleMenu::AppLocales();
37-
$roles = Role::pluck('name', 'name');
38-
$permissions = Permission::pluck('name', 'name');
35+
$roles = $this->roleModel->pluck('name', 'name');
36+
$permissions = $this->permissionModel->pluck('name', 'name');
3937
$menus = $this->cache->tags('sm')->get('menus')->pluck('name', 'id');
4038
$templates = array_unique($this->cache->tags('sm')->get('pages')->pluck('template')->filter()->all());
4139

@@ -78,8 +76,8 @@ public function store(Request $request)
7876
public function edit($id)
7977
{
8078
$locales = SimpleMenu::AppLocales();
81-
$roles = Role::pluck('name', 'name');
82-
$permissions = Permission::pluck('name', 'name');
79+
$roles = $this->roleModel->pluck('name', 'name');
80+
$permissions = $this->permissionModel->pluck('name', 'name');
8381
$page = $this->cache->tags('sm')->get('pages')->find($id) ?: abort(404);
8482
$menus = $this->cache->tags('sm')->get('menus')->pluck('name', 'id');
8583
$templates = array_unique($this->cache->tags('sm')->get('pages')->pluck('template')->filter()->all());

‎src/Controllers/Admin/PermissionsController.php

+6-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace ctf0\SimpleMenu\Controllers\Admin;
44

55
use Illuminate\Http\Request;
6-
use Spatie\Permission\Models\Permission;
76
use ctf0\SimpleMenu\Controllers\BaseController;
87
use ctf0\SimpleMenu\Controllers\Admin\Traits\RolePermOps;
98

@@ -18,7 +17,7 @@ class PermissionsController extends BaseController
1817
*/
1918
public function index()
2019
{
21-
$permissions = Permission::get();
20+
$permissions = $this->permissionModel->get();
2221

2322
return view("{$this->adminPath}.permissions.index", compact('permissions'));
2423
}
@@ -46,7 +45,7 @@ public function store(Request $request)
4645
'name' => 'required|unique:permissions,name',
4746
]);
4847

49-
Permission::create($request->all());
48+
$this->permissionModel->create($request->all());
5049

5150
return redirect()
5251
->route($this->crud_prefix . '.permissions.index')
@@ -62,7 +61,7 @@ public function store(Request $request)
6261
*/
6362
public function edit($id)
6463
{
65-
$permission = Permission::findOrFail($id);
64+
$permission = $this->permissionModel->findOrFail($id);
6665

6766
return view("{$this->adminPath}.permissions.edit", compact('permission'));
6867
}
@@ -81,7 +80,7 @@ public function update($id, Request $request)
8180
'name' => 'required|unique:permissions,name,' . $id,
8281
]);
8382

84-
Permission::findOrFail($id)->update($request->all());
83+
$this->permissionModel->findOrFail($id)->update($request->all());
8584

8685
$this->clearCache();
8786

@@ -97,7 +96,7 @@ public function update($id, Request $request)
9796
*/
9897
public function destroy($id, Request $request)
9998
{
100-
Permission::destroy($id);
99+
$this->permissionModel->destroy($id);
101100

102101
$this->clearCache();
103102

@@ -114,7 +113,7 @@ public function destroyMulti(Request $request)
114113
{
115114
$ids = explode(',', $request->ids);
116115

117-
Permission::destroy($ids);
116+
$this->permissionModel->destroy($ids);
118117

119118
return redirect()
120119
->route($this->crud_prefix . '.permissions.index')

‎src/Controllers/Admin/RolesController.php

+8-10
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
namespace ctf0\SimpleMenu\Controllers\Admin;
44

55
use Illuminate\Http\Request;
6-
use Spatie\Permission\Models\Role;
7-
use Spatie\Permission\Models\Permission;
86
use ctf0\SimpleMenu\Controllers\BaseController;
97
use ctf0\SimpleMenu\Controllers\Admin\Traits\RolePermOps;
108

@@ -19,7 +17,7 @@ class RolesController extends BaseController
1917
*/
2018
public function index()
2119
{
22-
$roles = Role::with('permissions')->get();
20+
$roles = $this->roleModel->with('permissions')->get();
2321

2422
return view("{$this->adminPath}.roles.index", compact('roles'));
2523
}
@@ -31,7 +29,7 @@ public function index()
3129
*/
3230
public function create()
3331
{
34-
$permissions = Permission::pluck('name', 'name');
32+
$permissions = $this->permissionModel->pluck('name', 'name');
3533

3634
return view("{$this->adminPath}.roles.create", compact('permissions'));
3735
}
@@ -49,7 +47,7 @@ public function store(Request $request)
4947
'name' => 'required|unique:roles,name',
5048
]);
5149

52-
$role = Role::create($request->except('permissions'));
50+
$role = $this->roleModel->create($request->except('permissions'));
5351
$permissions = $request->input('permissions') ?: [];
5452

5553
$role->givePermissionTo($permissions);
@@ -68,8 +66,8 @@ public function store(Request $request)
6866
*/
6967
public function edit($id)
7068
{
71-
$role = Role::findOrFail($id);
72-
$permissions = Permission::pluck('name', 'name');
69+
$role = $this->roleModel->findOrFail($id);
70+
$permissions = $this->permissionModel->pluck('name', 'name');
7371

7472
return view("{$this->adminPath}.roles.edit", compact('role', 'permissions'));
7573
}
@@ -88,7 +86,7 @@ public function update($id, Request $request)
8886
'name' => 'required|unique:roles,name,' . $id,
8987
]);
9088

91-
$role = Role::findOrFail($id);
89+
$role = $this->roleModel->findOrFail($id);
9290
$permissions = $request->input('permissions') ?: [];
9391

9492
$role->update($request->except('permissions'));
@@ -108,7 +106,7 @@ public function update($id, Request $request)
108106
*/
109107
public function destroy($id, Request $request)
110108
{
111-
Role::destroy($id);
109+
$this->roleModel->destroy($id);
112110

113111
$this->clearCache();
114112

@@ -125,7 +123,7 @@ public function destroyMulti(Request $request)
125123
{
126124
$ids = explode(',', $request->ids);
127125

128-
Role::destroy($ids);
126+
$this->roleModel->destroy($ids);
129127

130128
return redirect()
131129
->route($this->crud_prefix . '.roles.index')

‎src/Controllers/Admin/UsersController.php

+4-6
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
namespace ctf0\SimpleMenu\Controllers\Admin;
44

55
use Illuminate\Http\Request;
6-
use Spatie\Permission\Models\Role;
7-
use Spatie\Permission\Models\Permission;
86
use ctf0\SimpleMenu\Controllers\BaseController;
97
use ctf0\SimpleMenu\Controllers\Admin\Traits\UserPageOps;
108

@@ -31,8 +29,8 @@ public function index()
3129
*/
3230
public function create()
3331
{
34-
$roles = Role::pluck('name', 'name');
35-
$permissions = Permission::pluck('name', 'name');
32+
$roles = $this->roleModel->pluck('name', 'name');
33+
$permissions = $this->permissionModel->pluck('name', 'name');
3634

3735
return view("{$this->adminPath}.users.create", compact('roles', 'permissions'));
3836
}
@@ -75,8 +73,8 @@ public function store(Request $request)
7573
public function edit($id)
7674
{
7775
$user = $this->cache->get('sm-users')->find($id) ?: abort(404);
78-
$roles = Role::pluck('name', 'name');
79-
$permissions = Permission::pluck('name', 'name');
76+
$roles = $this->roleModel->pluck('name', 'name');
77+
$permissions = $this->permissionModel->pluck('name', 'name');
8078

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

‎src/Controllers/BaseController.php

+9-6
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@ public function __construct()
1919
parent::__construct();
2020
}
2121

22-
$this->cache = app('cache');
23-
$this->adminPath = 'SimpleMenu::admin';
24-
$this->crud_prefix = config('simpleMenu.crud_prefix');
25-
$this->userModel = app(config('simpleMenu.models.user'));
26-
$this->pageModel = app(config('simpleMenu.models.page'));
27-
$this->menuModel = app(config('simpleMenu.models.menu'));
22+
$this->cache = app('cache');
23+
$this->adminPath = 'SimpleMenu::admin';
24+
$this->crud_prefix = config('simpleMenu.crud_prefix');
25+
26+
$this->userModel = app(config('simpleMenu.models.user'));
27+
$this->pageModel = app(config('simpleMenu.models.page'));
28+
$this->menuModel = app(config('simpleMenu.models.menu'));
29+
$this->roleModel = app(config('permission.models.role'));
30+
$this->permissionModel = app(config('permission.models.permission'));
2831
}
2932
}

‎src/Traits/Ops.php

+7-3
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,14 @@ protected function createCaches()
4646
*/
4747
protected static function create_LFD($dir)
4848
{
49-
$dir_name = dirname($dir);
49+
$files = app('files');
5050

51-
if (!app('files')->exists($dir_name)) {
52-
return app('files')->makeDirectory($dir_name, 0755, true);
51+
if ($files->exists(config_path('simpleMenu.php'))) {
52+
$dir_name = dirname($dir);
53+
54+
if (!$files->exists($dir_name)) {
55+
return $files->makeDirectory($dir_name, 0755, true);
56+
}
5357
}
5458
}
5559

‎src/database/seeds/RolePermSeeder.php

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?php
22

33
use Illuminate\Database\Seeder;
4-
use Spatie\Permission\Models\Role;
5-
use Spatie\Permission\Models\Permission;
64

75
class RolePermSeeder extends Seeder
86
{
@@ -11,17 +9,20 @@ class RolePermSeeder extends Seeder
119
*/
1210
public function run()
1311
{
14-
$userModel = app(config('simpleMenu.models.user'));
15-
$pageModel = app(config('simpleMenu.models.page'));
16-
$roles = ['guest', 'admin', 'user'];
12+
$userModel = app(config('simpleMenu.models.user'));
13+
$pageModel = app(config('simpleMenu.models.page'));
14+
$roleModel = app(config('permission.models.role'));
15+
$permissionModel = app(config('permission.models.permission'));
16+
17+
$roles = ['guest', 'admin', 'user'];
18+
$perms = ['guest', 'access_backend'];
1719

1820
foreach ($roles as $role) {
19-
Role::create(['name' => $role]);
21+
$roleModel->create(['name' => $role]);
2022
}
2123

22-
$perms = ['guest', 'access_backend'];
2324
foreach ($perms as $perm) {
24-
Permission::create(['name' => $perm]);
25+
$permissionModel->create(['name' => $perm]);
2526
}
2627

2728
// foreach ($pageModel->all() as $page) {

‎src/resources/assets/js/menu.vue

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
background-color: unset !important;
66
}
77
}
8+
9+
.icon.is-medium {
10+
height: unset;
11+
}
812
</style>
913

1014
<script>

‎src/resources/assets/js/menu_child.vue

+13-9
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<li v-for="item in childs" :key="item.id">
1111
<!-- main -->
12-
<div class="notification is-dark menu-item" :class="classObj(item)">
12+
<div :class="classObj(item)" class="notification is-dark menu-item">
1313
<p>
1414
{{ getTitle(item.title) }}
1515
<a :href="goTo(item.id)" class="is-inline-block is-paddingless">
@@ -18,18 +18,18 @@
1818
</p>
1919

2020
<!-- ops -->
21-
<button type="button"
21+
<button v-tippy
2222
v-if="checkFrom(item)"
23-
class="delete"
24-
@click="undoItem(item)"
2523
:title="trans('undo')"
26-
v-tippy/>
27-
<button type="button"
28-
v-else
24+
type="button"
2925
class="delete"
30-
@click.prevent="deleteChild(item)"
26+
@click="undoItem(item)"/>
27+
<button v-tippy
28+
v-else
3129
:title="trans('remove_child')"
32-
v-tippy/>
30+
type="button"
31+
class="delete"
32+
@click.prevent="deleteChild(item)"/>
3333
</div>
3434

3535
<!-- childs -->
@@ -50,6 +50,10 @@
5050
margin-right: 0 !important;
5151
/*border-left: none !important;*/
5252
}
53+
54+
.icon.is-medium {
55+
height: unset;
56+
}
5357
</style>
5458

5559
<script>

0 commit comments

Comments
 (0)