Skip to content
This repository was archived by the owner on Mar 12, 2024. It is now read-only.

Commit af98a0e

Browse files
dietercoopmanactions-user
authored andcommitted
Fix styling
1 parent ea62c60 commit af98a0e

20 files changed

+49
-106
lines changed

src/Http/Livewire/Menu.php

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,43 +5,43 @@
55
use Livewire\Component;
66
use Spatie\Permission\Models\Permission;
77

8-
98
class Menu extends Component
109
{
11-
12-
public $menu;
10+
public $menu;
1311
private $parents;
1412

1513
protected function rules() : array
1614
{
1715
return [
18-
'menu.name' => 'required|string',
19-
'menu.route' => 'nullable|string',
20-
'menu.icon' => 'nullable|string',
21-
'menu.parent_id' => 'nullable',
16+
'menu.name' => 'required|string',
17+
'menu.route' => 'nullable|string',
18+
'menu.icon' => 'nullable|string',
19+
'menu.parent_id' => 'nullable',
2220
'menu.sort_order' => 'nullable|integer',
2321
];
2422
}
2523

2624
public function mount(\LLoadoutInforce\Models\Menu $menu) : void
2725
{
28-
$this->menu = $menu;
29-
$parents = \LLoadoutInforce\Models\Menu::with('parent')->get()->map(function ($menu) {
26+
$this->menu = $menu;
27+
$parents = \LLoadoutInforce\Models\Menu::with('parent')->get()->map(function ($menu) {
3028
$prefixInfo = $menu->prefixInfo;
31-
$order = (!($menu->parent) ? $menu->sort_order * 100 : ($prefixInfo['root']->sort_order * 100) + $prefixInfo['count']);
29+
$order = (! ($menu->parent) ? $menu->sort_order * 100 : ($prefixInfo['root']->sort_order * 100) + $prefixInfo['count']);
30+
3231
return [
33-
'id' => $menu->id,
34-
'name' => $prefixInfo['name'],
35-
'order' => $order
32+
'id' => $menu->id,
33+
'name' => $prefixInfo['name'],
34+
'order' => $order,
3635
];
3736
});
3837
$this->parents = $parents->sortBy('order')->pluck('name', 'id')->toArray();
3938
}
4039

4140
public function render() : \Illuminate\View\View
4241
{
43-
$menus = \LLoadoutInforce\Models\Menu::with('menu.menu.menu')->orderBy('sort_order')->get();
42+
$menus = \LLoadoutInforce\Models\Menu::with('menu.menu.menu')->orderBy('sort_order')->get();
4443
$parents = $this->parents;
44+
4545
return view('LLoadoutInforce-views::menu-ui.menu', compact('menus', 'parents'));
4646
}
4747

@@ -55,11 +55,11 @@ public function updateMenu() : void
5555
$this->validate();
5656
$this->menu->parent_id = $this->menu->parent_id == 0 ? null : $this->menu->parent_id;
5757

58-
if(!$this->menu->permission){
58+
if (! $this->menu->permission) {
5959
$this->menu->permission = $this->menu->prefixinfo['path'];
6060
Permission::firstOrCreate([
61-
'name' => $this->menu->permission,
62-
'guard_name' => 'web'
61+
'name' => $this->menu->permission,
62+
'guard_name' => 'web',
6363
]);
6464
}
6565

@@ -69,6 +69,4 @@ public function updateMenu() : void
6969
$this->emit('menuUpdated');
7070
$this->emit('saved');
7171
}
72-
73-
7472
}

src/Http/Livewire/Menus.php

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

77
class Menus extends Component
88
{
9-
109
public function render()
1110
{
1211
return view('LLoadoutInforce-views::menu-ui.menus');
1312
}
14-
1513
}

src/Http/Livewire/MenusTable.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace LLoadoutInforce\Http\Livewire;
44

5-
use App\User;
65
use Illuminate\Database\Eloquent\Builder;
76
use LLoadoutInforce\Models\Menu;
87
use Rappasoft\LaravelLivewireTables\DataTableComponent;
@@ -18,19 +17,16 @@ public function query(): Builder
1817
{
1918
return Menu::query()
2019
->when($this->getFilter('search'), fn ($query, $term) => $query->where('name', 'like', '%'.$term.'%')->orWhere('route', 'like', '%'.$term.'%'))->whereEditable(true);
21-
2220
}
2321

2422
public function columns(): array
2523
{
26-
2724
return [
2825
Column::make('Name', 'name')
2926
->sortable(),
3027
Column::make('Route', 'route')
3128
->sortable(),
3229
];
33-
3430
}
3531

3632
public function getTableRowUrl($row): string
@@ -41,9 +37,7 @@ public function getTableRowUrl($row): string
4137
public function deleteSelected()
4238
{
4339
if ($this->selectedRowsQuery->count() > 0) {
44-
$this->selectedRowsQuery->delete();
40+
$this->selectedRowsQuery->delete();
4541
}
4642
}
47-
48-
49-
}
43+
}

src/Http/Livewire/Navigation.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@ class Navigation extends Component
1111

1212
protected $listeners = ['menuUpdated' => 'render'];
1313

14-
1514
public function render()
1615
{
1716
$menus = $this->getMenus();
17+
1818
return view('LLoadoutInforce-views::menu-ui.navigation', compact('menus'));
1919
}
2020

2121
private function getMenus()
2222
{
2323
return \LLoadoutInforce\Models\Menu::whereNull('parent_id')->with('menu')->orderBy('sort_order')->get()->toBase();
2424
}
25-
2625
}

src/Http/Livewire/Permission.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
namespace LLoadoutInforce\Http\Livewire;
44

5-
65
use Livewire\Component;
76

87
class Permission extends Component
98
{
10-
119
public $permission;
1210

1311
protected function rules()
@@ -35,15 +33,13 @@ public function delete()
3533
public function updatePermission()
3634
{
3735
$this->validate();
38-
if($this->permission->isDirty()){
36+
if ($this->permission->isDirty()) {
3937
$original = $this->permission->getOriginal('name');
4038
//update menu with this permission to new permission
4139
\LLoadoutInforce\Models\Menu::wherePermission($original)->update(['permission' => $this->permission->name]);
4240
}
4341

4442
$this->permission->save();
4543
$this->emit('saved');
46-
4744
}
48-
4945
}

src/Http/Livewire/Permissions.php

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

77
class Permissions extends Component
88
{
9-
109
public function render()
1110
{
1211
return view('LLoadoutInforce-views::permission-ui.permissions');
1312
}
14-
1513
}

src/Http/Livewire/PermissionsTable.php

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22

33
namespace LLoadoutInforce\Http\Livewire;
44

5-
use App\User;
6-
use Spatie\Permission\Models\Permission;
75
use Illuminate\Database\Eloquent\Builder;
8-
use Rappasoft\LaravelLivewireTables\Views\Column;
96
use Rappasoft\LaravelLivewireTables\DataTableComponent;
7+
use Rappasoft\LaravelLivewireTables\Views\Column;
8+
use Spatie\Permission\Models\Permission;
109

1110
class PermissionsTable extends DataTableComponent
1211
{
13-
14-
public $addRoute = "permission";
12+
public $addRoute = "permission";
1513

1614
public array $bulkActions = [
1715
'deleteSelected' => 'Delete selected',
@@ -25,12 +23,10 @@ public function query(): Builder
2523

2624
public function columns(): array
2725
{
28-
2926
return [
3027
Column::make('Name', 'name')
3128
->sortable(),
3229
];
33-
3430
}
3531

3632
public function getTableRowUrl($row): string
@@ -44,5 +40,4 @@ public function deleteSelected()
4440
$this->selectedRowsQuery->delete();
4541
}
4642
}
47-
48-
}
43+
}

src/Http/Livewire/Role.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,5 @@ public function updateRole()
4141
$this->validate();
4242
$this->role->save();
4343
$this->emit('saved');
44-
4544
}
46-
4745
}

src/Http/Livewire/Roles.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,12 @@
22

33
namespace LLoadoutInforce\Http\Livewire;
44

5-
65
use Livewire\Component;
76

87
class Roles extends Component
98
{
10-
11-
129
public function render()
1310
{
1411
return view('LLoadoutInforce-views::user-ui.roles');
1512
}
16-
17-
1813
}

src/Http/Livewire/RolesTable.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
namespace LLoadoutInforce\Http\Livewire;
44

5-
use App\User;
65
use Illuminate\Database\Eloquent\Builder;
76
use Rappasoft\LaravelLivewireTables\DataTableComponent;
8-
use Rappasoft\LaravelLivewireTables\Traits\HtmlComponents;
97
use Rappasoft\LaravelLivewireTables\Views\Column;
108
use Spatie\Permission\Models\Role;
119

1210
class RolesTable extends DataTableComponent
1311
{
14-
1512
public array $bulkActions = [
1613
'deleteSelected' => 'Delete selected',
1714
];
@@ -20,17 +17,14 @@ public function query(): Builder
2017
{
2118
return Role::query()
2219
->when($this->getFilter('search'), fn ($query, $term) => $query->where('name', 'like', '%'.$term.'%'));
23-
2420
}
2521

2622
public function columns(): array
2723
{
28-
2924
return [
3025
Column::make('Name', 'name')
3126
->sortable(),
3227
];
33-
3428
}
3529

3630
public function getTableRowUrl($row): string
@@ -44,4 +38,4 @@ public function deleteSelected()
4438
$this->selectedRowsQuery->delete();
4539
}
4640
}
47-
}
41+
}

0 commit comments

Comments
 (0)