Skip to content

Commit b015012

Browse files
committed
Refactor column.blade.php for improved readability and consistency in markup
1 parent 294cd38 commit b015012

File tree

1 file changed

+38
-36
lines changed

1 file changed

+38
-36
lines changed

resources/views/livewire/column.blade.php

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@
88
99
if(filled($column['color']) && isset($filamentColors[$column['color']])) {
1010
$nativeColor = $column['color'];
11-
}else{
11+
}elseif(filled($column['color'])){
1212
$color = Color::hex($column['color']);
13+
}else{
14+
$color = $filamentColors['primary'];
1315
}
1416
@endphp
1517

1618
<div
17-
class="w-[300px] min-w-[300px] flex-shrink-0 border border-gray-200 dark:border-gray-700 shadow-sm dark:shadow-md rounded-xl flex flex-col max-h-full overflow-hidden">
19+
class="w-[300px] min-w-[300px] flex-shrink-0 border border-gray-200 dark:border-gray-700 shadow-sm dark:shadow-md rounded-xl flex flex-col max-h-full overflow-hidden">
1820
<!-- Column Header -->
1921
<div class="flex items-center justify-between py-3 px-4 border-b border-gray-200 dark:border-gray-700">
2022
<div class="flex items-center">
@@ -23,26 +25,26 @@ class="w-[300px] min-w-[300px] flex-shrink-0 border border-gray-200 dark:border-
2325
</h3>
2426
@if($nativeColor)
2527
<x-filament::badge
26-
tag="div"
27-
:color="$nativeColor"
28-
class="ms-2"
28+
tag="div"
29+
:color="$nativeColor"
30+
class="ms-2"
2931
>
3032
{{ $column['total'] ?? (isset($column['items']) ? count($column['items']) : 0) }}
3133
</x-filament::badge>
3234
@else
3335
<div
34-
@style([
35-
"--light-bg-color: $color[50]",
36-
"--light-text-color: $color[700]",
37-
"--dark-bg-color: $color[600]",
38-
"--dark-text-color: $color[300]",
39-
])
40-
@class([
41-
'ms-2 items-center border px-2 py-0.5 rounded-md text-xs font-semibold',
42-
"bg-[var(--light-bg-color)] dark:bg-[var(--dark-bg-color)]/20",
43-
"text-[var(--light-text-color)] dark:text-[var(--dark-text-color)]",
44-
'border-[var(--light-text-color)]/30 dark:border-[var(--dark-text-color)]/30',
45-
])>
36+
@style([
37+
"--light-bg-color: $color[50]",
38+
"--light-text-color: $color[700]",
39+
"--dark-bg-color: $color[600]",
40+
"--dark-text-color: $color[300]",
41+
])
42+
@class([
43+
'ms-2 items-center border px-2 py-0.5 rounded-md text-xs font-semibold',
44+
"bg-[var(--light-bg-color)] dark:bg-[var(--dark-bg-color)]/20",
45+
"text-[var(--light-text-color)] dark:text-[var(--dark-text-color)]",
46+
'border-[var(--light-text-color)]/30 dark:border-[var(--dark-text-color)]/30',
47+
])>
4648
{{ $column['total'] ?? (isset($column['items']) ? count($column['items']) : 0) }}
4749
</div>
4850
@endif
@@ -67,25 +69,25 @@ class="ms-2"
6769

6870
<!-- Column Content -->
6971
<div
70-
data-column-id="{{ $columnId }}"
71-
@if($this->getBoard()->getPositionIdentifierAttribute())
72-
x-sortable
73-
x-sortable-group="cards"
74-
@end.stop="handleSortableEnd($event)"
75-
@endif
76-
@if(isset($column['total']) && $column['total'] > count($column['items']))
77-
@scroll.throttle.100ms="handleColumnScroll($event, '{{ $columnId }}')"
78-
@endif
79-
class="p-3 flex-1 overflow-y-auto overflow-x-hidden overscroll-contain kanban-cards"
80-
style="max-height: calc(100vh - 13rem);"
72+
data-column-id="{{ $columnId }}"
73+
@if($this->getBoard()->getPositionIdentifierAttribute())
74+
x-sortable
75+
x-sortable-group="cards"
76+
@end.stop="handleSortableEnd($event)"
77+
@endif
78+
@if(isset($column['total']) && $column['total'] > count($column['items']))
79+
@scroll.throttle.100ms="handleColumnScroll($event, '{{ $columnId }}')"
80+
@endif
81+
class="p-3 flex-1 overflow-y-auto overflow-x-hidden overscroll-contain kanban-cards"
82+
style="max-height: calc(100vh - 13rem);"
8183
>
8284
@if (isset($column['items']) && count($column['items']) > 0)
8385
@foreach ($column['items'] as $record)
8486
<x-flowforge::card
85-
:record="$record"
86-
:config="$config"
87-
:columnId="$columnId"
88-
wire:key="card-{{ $record['id'] }}"
87+
:record="$record"
88+
:config="$config"
89+
:columnId="$columnId"
90+
wire:key="card-{{ $record['id'] }}"
8991
/>
9092
@endforeach
9193

@@ -94,8 +96,8 @@ class="p-3 flex-1 overflow-y-auto overflow-x-hidden overscroll-contain kanban-ca
9496
@if(isset($column['total']) && $column['total'] > count($column['items']))
9597
{{-- More items available --}}
9698
<div
97-
x-intersect.margin.300px="handleSmoothScroll('{{ $columnId }}')"
98-
class="w-full">
99+
x-intersect.margin.300px="handleSmoothScroll('{{ $columnId }}')"
100+
class="w-full">
99101

100102
<div x-show="isLoadingColumn('{{ $columnId }}')"
101103
x-transition
@@ -107,8 +109,8 @@ class="text-xs text-primary-600 dark:text-primary-400 flex items-center justify-
107109
</div>
108110
@else
109111
<x-flowforge::empty-column
110-
:columnId="$columnId"
111-
:pluralCardLabel="$config['pluralCardLabel']"
112+
:columnId="$columnId"
113+
:pluralCardLabel="$config['pluralCardLabel']"
112114
/>
113115
@endif
114116
</div>

0 commit comments

Comments
 (0)