Enhance FindSliderBySlugTask to filter slides based on current time, ensuring only active slides within the valid time range are retrieved; update SlidesRelationManager to set default and minimum dates for start and end times. Improve Slider component styling for better visibility during loading state.

This commit is contained in:
F4ilji
2025-09-27 14:11:25 +05:00
parent 7c47b36c77
commit 02fb2554c1
4 changed files with 11 additions and 8 deletions
@@ -4,6 +4,7 @@ namespace App\Containers\Widget\Tasks;
use App\Containers\Widget\Models\Slider;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Carbon;
class FindSliderBySlugTask
{
@@ -12,15 +13,19 @@ class FindSliderBySlugTask
$cacheKey = 'slider_' . $slug;
return Cache::remember($cacheKey, now()->addHour(), function () use ($slug) {
$now = Carbon::now(); // Получаем текущее время один раз
$slider = Slider::query()
->where('slug', $slug)
->where('is_active', true)
->with(['slides' => function($query) {
$query->where('is_active', true);
->with(['slides' => function($query) use ($now) {
$query->where('is_active', true)
->where('start_time', '<=', $now)
->where('end_time', '>=', $now);
}])
->firstOrFail();
return $slider ?: null;
});
}
}
}
@@ -206,8 +206,7 @@ class SlidesRelationManager extends RelationManager
->native(false)
->displayFormat('d/m/Y H:i')
->seconds(false)
->default(Carbon::now())
->minDate(fn($record, $context) => $context === 'edit' ? $record?->start_time : Carbon::now()),
->default(Carbon::now()),
DateTimePicker::make('end_time')
->label('Дата окончания показа')
@@ -216,7 +215,6 @@ class SlidesRelationManager extends RelationManager
->displayFormat('d/m/Y H:i')
->seconds(false)
->default(Carbon::now()->addWeeks(2))
->minDate(fn (Forms\Get $get) => $get('start_time') ?: Carbon::now()),
]),
TextInput::make('link')