Skip to content

Commit 4c0e3ea

Browse files
lrljoelrljoe
committed
Cleaning Up Permissions
1 parent 23d9f0f commit 4c0e3ea

File tree

528 files changed

+222
-138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

528 files changed

+222
-138
lines changed

‎resources/views/components/bulk-actions/td.blade.php‎

100644100755
File mode changed.

‎resources/views/components/bulk-actions/th.blade.php‎

100644100755
File mode changed.

‎resources/views/components/bulk-actions/thead/button.blade.php‎

100644100755
File mode changed.

‎resources/views/components/bulk-actions/thead/thead.blade.php‎

100644100755
File mode changed.

‎resources/views/components/bulk-actions/thead/tr.blade.php‎

100644100755
File mode changed.

‎resources/views/components/collapsed-columns/collapsed-columns.blade.php‎

100644100755
Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
@aware([ 'tableName', 'isTailwind', 'isTailwind4','isBootstrap', 'collapsingColumnInfo', 'row', 'rowIndex', 'rowPk', 'tableRowDetails'])
22

33
@if ($collapsingColumnInfo['hasCollapsingColumns'] ?? false)
4-
<tr x-data
5-
@toggle-row-content.window="($event.detail.tableName === '{{ $tableName }}' && $event.detail.row === {{ $rowIndex }}) ? $el.classList.toggle('{{ $isBootstrap ? 'd-none' : 'hidden' }}') : null"
4+
<tr x-data @toggle-row-content.window="($event.detail.tableName === '{{ $tableName }}' && $event.detail.row === {{ $rowIndex }}) ? $el.classList.toggle('{{ $isBootstrap ? 'd-none' : 'hidden' }}') : null"
65
{{
76
$attributes->merge([
87
'wire:loading.class.delay' => 'opacity-50 dark:bg-gray-900 dark:opacity-60',
@@ -11,7 +10,7 @@
1110
->merge($tableRowDetails['attributes'])
1211
->class([
1312
'hidden rappasoft-striped-row' => $isTailwind && ($tableRowDetails['attributes']['default'] ?? true),
14-
13+
'tw4ph hidden rappasoft-striped-row' => $isTailwind4 && ($tableRowDetails['attributes']['default'] ?? true),
1514
1615
'd-none bg-light rappasoft-striped-row' => $isBootstrap && ($rowIndex % 2 === 0 && ($tableRowDetails['attributes']['default'] ?? true)),
1716
'd-none bg-white rappasoft-striped-row' => $isBootstrap && ($rowIndex % 2 !== 0 && ($tableRowDetails['attributes']['default'] ?? true)),
@@ -20,25 +19,27 @@
2019
->except(['default','default-styling','default-colors'])
2120
}}
2221
>
23-
<td colspan="{{ $collapsingColumnInfo['colspanCount'] }}" @class([
24-
'text-left pt-4 pb-2 px-4' => $isTailwind,
25-
'text-start pt-3 p-2' => $isBootstrap,
26-
])>
27-
<div >
28-
29-
22+
<td colspan="{{ $collapsingColumnInfo['colspanCount'] }}"
23+
@class([
24+
'text-left pt-4 pb-2 px-4' => $isTailwind,
25+
'tw4ph text-left pt-4 pb-2 px-4' => $isTailwind4,
26+
'text-start pt-3 p-2' => $isBootstrap,
27+
])
28+
>
29+
<div>
3030
@tableloop($collapsingColumnInfo['collapsingColumnDetails'] as $colIndex => $columnData)
31-
@php($key = $tableName . '_' . $rowIndex.'_'.$colIndex)
32-
<div wire:key="{{ $tableName }}-row-{{ $rowPk }}-collapsed-contents-{{ $colIndex }}"
31+
@php($key = $tableName . '_' . $rowIndex.'_'.$colIndex)
32+
<div wire:key="{{ $tableName }}-row-{{ $rowPk }}-collapsed-contents-{{ $colIndex }}" @class($columnData['classes'])
3333
x-data="{ value: '',
34-
init() {
35-
$watch('opening', val => {
36-
this.value = stripLivewireTags($refs.{{ $tableName . '_' . $rowIndex.'_'.$colIndex }});
37-
});
38-
}
39-
}" @class($columnData['classes'])>
40-
<strong>{{ $columnData['title'] }}</strong>: <br />
41-
<span @if($columnData['isHtml'])x-html="value" @else x-text="value"@endif></span>
34+
init() {
35+
$watch('opening', val => {
36+
this.value = stripLivewireTags($refs.{{ $tableName . '_' . $rowIndex.'_'.$colIndex }});
37+
});
38+
}
39+
}"
40+
>
41+
<strong>{{ $columnData['title'] }}</strong>: <br />
42+
<span @if($columnData['isHtml'])x-html="value" @else x-text="value"@endif> </span>
4243
</div>
4344
@endtableloop
4445
</div>

‎resources/views/components/collapsed-columns/td.blade.php‎

100644100755
Lines changed: 67 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,70 @@
11
@aware([ 'tableName','isTailwind','isTailwind4','isBootstrap','rowIndex', 'collapsingColumnInfo'])
22
@props(['hidden' => false])
33

4-
<td x-data="{open:false}" wire:key="{{ $tableName }}-collapsingIcon-{{ $rowIndex }}-{{ md5(now()) }}"
5-
{{
6-
$attributes
7-
->merge()
8-
->class([
9-
'p-3 table-cell text-center' => $isTailwind,
10-
'sm:hidden' => $isTailwind && (!($collapsingColumnInfo['shouldCollapseAlways'] ?? false) && !($collapsingColumnInfo['shouldCollapseOnTablet'] ?? false)),
11-
'md:hidden' => $isTailwind && (!($collapsingColumnInfo['shouldCollapseAlways'] ?? false) && !($collapsingColumnInfo['shouldCollapseOnTablet'] ?? false) && ($collapsingColumnInfo['shouldCollapseOnMobile'] ?? false)),
12-
'lg:hidden' => $isTailwind && (!($collapsingColumnInfo['shouldCollapseAlways'] ?? false) && (($collapsingColumnInfo['shouldCollapseOnTablet'] ?? false) || ($collapsingColumnInfo['shouldCollapseOnMobile'] ?? false))),
13-
14-
'd-sm-none' => $isBootstrap && (!($collapsingColumnInfo['shouldCollapseAlways'] ?? false) && !($collapsingColumnInfo['shouldCollapseOnTablet'] ?? false)),
15-
'd-md-none' => $isBootstrap && (!($collapsingColumnInfo['shouldCollapseAlways'] ?? false) && !($collapsingColumnInfo['shouldCollapseOnTablet'] ?? false) && ($collapsingColumnInfo['shouldCollapseOnMobile'] ?? false)),
16-
'd-lg-none' => $isBootstrap && (!($collapsingColumnInfo['shouldCollapseAlways'] ?? false) && (($collapsingColumnInfo['shouldCollapseOnTablet'] ?? false) || ($collapsingColumnInfo['shouldCollapseOnMobile'] ?? false))),
17-
18-
])
19-
}}
20-
:class="currentlyReorderingStatus ? 'laravel-livewire-tables-reorderingMinimised' : ''"
21-
>
22-
@if (! $hidden)
23-
<button
24-
x-cloak x-show="!currentlyReorderingStatus"
25-
@mouseover="if(opening != true) { opening = true }; "
26-
x-on:click.prevent="if(opening != true) { opening = true }; $dispatch('toggle-row-content', {'tableName': '{{ $tableName }}', 'row': {{ $rowIndex }}}); open = !open;"
27-
@class([
28-
'w-full h-full',
29-
'border-0 bg-transparent p-0' => $isBootstrap,
30-
])
31-
>
32-
<x-heroicon-o-plus-circle x-cloak x-show="!open" {{
33-
$attributes->merge($collapsingColumnInfo['buttonExpandAttributes'])
34-
->class([
35-
'h-6 w-6' => $isTailwind && ($collapsingColumnInfo['buttonExpandAttributes']['default-styling'] ?? true),
36-
'text-green-600' => $isTailwind && ($collapsingColumnInfo['buttonExpandAttributes']['default-colors'] ?? true),
37-
38-
'laravel-livewire-tables-btn-lg text-success' => $isBootstrap && ($collapsingColumnInfo['buttonExpandAttributes']['default-colors'] ?? true),
39-
])
40-
->except(['default','default-styling','default-colors'])
41-
}}
42-
/>
43-
<x-heroicon-o-minus-circle x-cloak x-show="open" {{
44-
$attributes->merge($collapsingColumnInfo['buttonCollapseAttributes'])
45-
->class([
46-
'h-6 w-6' => $isTailwind && ($collapsingColumnInfo['buttonCollapseAttributes']['default-styling'] ?? true),
47-
'text-yellow-600' => $isTailwind && ($collapsingColumnInfo['buttonCollapseAttributes']['default-colors'] ?? true),
48-
49-
50-
'laravel-livewire-tables-btn-lg text-warning' => $isBootstrap && ($collapsingColumnInfo['buttonCollapseAttributes']['default-colors'] ?? true),
51-
])
52-
->except(['default','default-styling','default-colors'])
53-
}}
54-
/>
55-
</button>
56-
@endif
57-
</td>
4+
<td x-data="{open:false}" wire:key="{{ $tableName }}-collapsingIcon-{{ $rowIndex }}-{{ md5(now()) }}"
5+
{{
6+
$attributes
7+
->merge()
8+
->class([
9+
'p-3 table-cell text-center' => $isTailwind,
10+
'sm:hidden' => $isTailwind && (!($collapsingColumnInfo['shouldCollapseAlways'] ?? false) && !($collapsingColumnInfo['shouldCollapseOnTablet'] ?? false)),
11+
'md:hidden' => $isTailwind && (!($collapsingColumnInfo['shouldCollapseAlways'] ?? false) && !($collapsingColumnInfo['shouldCollapseOnTablet'] ?? false) && ($collapsingColumnInfo['shouldCollapseOnMobile'] ?? false)),
12+
'lg:hidden' => $isTailwind && (!($collapsingColumnInfo['shouldCollapseAlways'] ?? false) && (($collapsingColumnInfo['shouldCollapseOnTablet'] ?? false) || ($collapsingColumnInfo['shouldCollapseOnMobile'] ?? false))),
13+
14+
'tw4ph p-3 table-cell text-center' => $isTailwind4,
15+
'tw4ph sm:hidden' => $isTailwind4 && (!($collapsingColumnInfo['shouldCollapseAlways'] ?? false) && !($collapsingColumnInfo['shouldCollapseOnTablet'] ?? false)),
16+
'tw4ph md:hidden' => $isTailwind4 && (!($collapsingColumnInfo['shouldCollapseAlways'] ?? false) && !($collapsingColumnInfo['shouldCollapseOnTablet'] ?? false) && ($collapsingColumnInfo['shouldCollapseOnMobile'] ?? false)),
17+
'tw4ph lg:hidden' => $isTailwind4 && (!($collapsingColumnInfo['shouldCollapseAlways'] ?? false) && (($collapsingColumnInfo['shouldCollapseOnTablet'] ?? false) || ($collapsingColumnInfo['shouldCollapseOnMobile'] ?? false))),
18+
19+
20+
'd-sm-none' => $isBootstrap && (!($collapsingColumnInfo['shouldCollapseAlways'] ?? false) && !($collapsingColumnInfo['shouldCollapseOnTablet'] ?? false)),
21+
'd-md-none' => $isBootstrap && (!($collapsingColumnInfo['shouldCollapseAlways'] ?? false) && !($collapsingColumnInfo['shouldCollapseOnTablet'] ?? false) && ($collapsingColumnInfo['shouldCollapseOnMobile'] ?? false)),
22+
'd-lg-none' => $isBootstrap && (!($collapsingColumnInfo['shouldCollapseAlways'] ?? false) && (($collapsingColumnInfo['shouldCollapseOnTablet'] ?? false) || ($collapsingColumnInfo['shouldCollapseOnMobile'] ?? false))),
23+
24+
])
25+
}}
26+
:class="currentlyReorderingStatus ? 'laravel-livewire-tables-reorderingMinimised' : ''"
27+
>
28+
@if (! $hidden)
29+
<button
30+
x-cloak x-show="!currentlyReorderingStatus"
31+
@mouseover="if(opening != true) { opening = true }; "
32+
x-on:click.prevent="if(opening != true) { opening = true }; $dispatch('toggle-row-content', {'tableName': '{{ $tableName }}', 'row': {{ $rowIndex }}}); open = !open;"
33+
@class([
34+
'w-full h-full',
35+
'border-0 bg-transparent p-0' => $isBootstrap,
36+
])
37+
>
38+
<x-heroicon-o-plus-circle x-cloak x-show="!open" {{
39+
$attributes->merge($collapsingColumnInfo['buttonExpandAttributes'])
40+
->class([
41+
'h-6 w-6' => $isTailwind && ($collapsingColumnInfo['buttonExpandAttributes']['default-styling'] ?? true),
42+
'text-green-600' => $isTailwind && ($collapsingColumnInfo['buttonExpandAttributes']['default-colors'] ?? true),
43+
44+
'tw4ph h-6 w-6' => $isTailwind4 && ($collapsingColumnInfo['buttonExpandAttributes']['default-styling'] ?? true),
45+
'tw4ph text-green-600' => $isTailwind4 && ($collapsingColumnInfo['buttonExpandAttributes']['default-colors'] ?? true),
46+
47+
48+
'laravel-livewire-tables-btn-lg text-success' => $isBootstrap && ($collapsingColumnInfo['buttonExpandAttributes']['default-colors'] ?? true),
49+
])
50+
->except(['default','default-styling','default-colors'])
51+
}}
52+
/>
53+
<x-heroicon-o-minus-circle x-cloak x-show="open" {{
54+
$attributes->merge($collapsingColumnInfo['buttonCollapseAttributes'])
55+
->class([
56+
'h-6 w-6' => $isTailwind && ($collapsingColumnInfo['buttonCollapseAttributes']['default-styling'] ?? true),
57+
'text-yellow-600' => $isTailwind && ($collapsingColumnInfo['buttonCollapseAttributes']['default-colors'] ?? true),
58+
59+
'tw4ph h-6 w-6' => $isTailwind4 && ($collapsingColumnInfo['buttonCollapseAttributes']['default-styling'] ?? true),
60+
'tw4ph text-yellow-600' => $isTailwind4 && ($collapsingColumnInfo['buttonCollapseAttributes']['default-colors'] ?? true),
61+
62+
63+
'laravel-livewire-tables-btn-lg text-warning' => $isBootstrap && ($collapsingColumnInfo['buttonCollapseAttributes']['default-colors'] ?? true),
64+
])
65+
->except(['default','default-styling','default-colors'])
66+
}}
67+
/>
68+
</button>
69+
@endif
70+
</td>

‎resources/views/components/collapsed-columns/th.blade.php‎

100644100755
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,16 @@
88
'md:hidden' => $isTailwind && (!$collapsingColumnInfo['shouldCollapseOnMobile'] && !$collapsingColumnInfo['shouldCollapseOnTablet'] && !$collapsingColumnInfo['shouldCollapseAlways']),
99
'lg:hidden' => $isTailwind && (!$collapsingColumnInfo['shouldCollapseAlways']),
1010
11+
'tw4ph table-cell dark:bg-gray-800 laravel-livewire-tables-reorderingMinimised' => $isTailwind4,
12+
'tw4ph sm:hidden' => $isTailwind4 && (!$collapsingColumnInfo['shouldCollapseOnTablet'] && !$collapsingColumnInfo['shouldCollapseAlways']),
13+
'tw4ph md:hidden' => $isTailwind4 && (!$collapsingColumnInfo['shouldCollapseOnMobile'] && !$collapsingColumnInfo['shouldCollapseOnTablet'] && !$collapsingColumnInfo['shouldCollapseAlways']),
14+
'tw4ph lg:hidden' => $isTailwind4 && (!$collapsingColumnInfo['shouldCollapseAlways']),
15+
1116
'd-table-cell laravel-livewire-tables-reorderingMinimised' => $isBootstrap,
1217
'd-sm-none' => $isBootstrap && (!$collapsingColumnInfo['shouldCollapseOnTablet'] && !$collapsingColumnInfo['shouldCollapseAlways']),
1318
'd-md-none' => $isBootstrap && (!$collapsingColumnInfo['shouldCollapseOnMobile'] && !$collapsingColumnInfo['shouldCollapseOnTablet']) && !$collapsingColumnInfo['shouldCollapseAlways'],
1419
'd-lg-none' => $isBootstrap && (!$collapsingColumnInfo['shouldCollapseAlways']),
1520
])
16-
}}></th>
21+
}}
22+
></th>
1723
@endif

‎resources/views/components/collapsed-columns/tr.blade.php‎

100644100755
Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,36 @@
1111
->merge($tableRowDetails['attributes'])
1212
->class([
1313
'hidden rappasoft-striped-row' => $isTailwind && ($tableRowDetails['attributes']['default'] ?? true),
14-
14+
'tw4ph hidden rappasoft-striped-row' => $isTailwind4 && ($tableRowDetails['attributes']['default'] ?? true),
15+
1516
'd-none bg-light rappasoft-striped-row' => $isBootstrap && ($rowIndex % 2 === 0 && ($tableRowDetails['attributes']['default'] ?? true)),
1617
'd-none bg-white rappasoft-striped-row' => $isBootstrap && ($rowIndex % 2 !== 0 && ($tableRowDetails['attributes']['default'] ?? true)),
1718
])
1819
->except(['default','default-styling','default-colors'])
1920
}}
2021
>
21-
<td colspan="{{ $collapsingColumnInfo['colspanCount'] }}" @class([
22+
<td colspan="{{ $collapsingColumnInfo['colspanCount'] }}"
23+
@class([
2224
'text-left pt-4 pb-2 px-4' => $isTailwind,
23-
'text-start pt-3 p-2' => $isBootstrap,
24-
])>
25-
<div >
26-
27-
25+
'tw4ph text-left pt-4 pb-2 px-4' => $isTailwind4,
26+
'text-start pt-3 p-2' => $isBootstrap,
27+
])
28+
>
29+
<div>
2830
@tableloop($collapsingColumnInfo['collapsingColumnDetails'] as $colIndex => $columnData)
29-
@php($key = $tableName . '_' . $rowIndex.'_'.$colIndex)
30-
<div wire:key="{{ $tableName }}-row-{{ $rowPk }}-collapsed-contents-{{ $colIndex }}"
31+
@php($key = $tableName . '_' . $rowIndex.'_'.$colIndex)
32+
<div wire:key="{{ $tableName }}-row-{{ $rowPk }}-collapsed-contents-{{ $colIndex }}" @class($columnData['classes'])
3133
x-data="{ value: '',
3234
init() {
3335
$watch('opening', val => {
3436
this.value = stripLivewireTags($refs.{{ $tableName . '_' . $rowIndex.'_'.$colIndex }});
3537
});
3638
}
37-
}" @class($columnData['classes'])>
38-
<strong>{{ $columnData['title'] }}</strong>: <br />
39-
<span @if($columnData['isHtml'])x-html="value" @else x-text="value"@endif></span>
39+
}"
40+
41+
>
42+
<strong>{{ $columnData['title'] }}</strong>: <br />
43+
<span @if($columnData['isHtml'])x-html="value" @else x-text="value"@endif> </span>
4044
</div>
4145
@endtableloop
4246
</div>

‎resources/views/components/external/filters/livewire-array-filter.blade.php‎

100644100755
File mode changed.

0 commit comments

Comments
 (0)