diff --git a/app/Http/Controllers/ClientScheduleController.php b/app/Http/Controllers/ClientScheduleController.php index 274103a..8e262dc 100644 --- a/app/Http/Controllers/ClientScheduleController.php +++ b/app/Http/Controllers/ClientScheduleController.php @@ -23,6 +23,7 @@ class ClientScheduleController extends Controller $query->whereRaw('LOWER(title) like ?', ["%".strtolower($search)."%"]); }) ->with('schedules') + ->with('faculty') ->orderBy('title') ->get()); } diff --git a/app/Http/Resources/ClientEducationalGroupResource.php b/app/Http/Resources/ClientEducationalGroupResource.php index a761753..fcee93b 100644 --- a/app/Http/Resources/ClientEducationalGroupResource.php +++ b/app/Http/Resources/ClientEducationalGroupResource.php @@ -18,6 +18,7 @@ class ClientEducationalGroupResource extends JsonResource 'id' => $this->id, 'title' => $this->title, 'schedules' => ClientScheduleSearchResource::collection($this->schedules), + 'faculty' => $this->faculty->title, ]; } } diff --git a/resources/js/Components/other/icons.js b/resources/js/Components/other/icons.js index ca1e386..3effc79 100644 --- a/resources/js/Components/other/icons.js +++ b/resources/js/Components/other/icons.js @@ -62,7 +62,17 @@ export default { stroke_width: 1.5, stroke: 'currentColor', }, - home: { + heart_filled: { + path: '', + viewBox: '0 0 24 24', + fill: 'red', // Заливка красным цветом + // stroke_width: 1.5, + // stroke: 'currentColor', + }, + + + +home: { path: '', viewBox: '0 0 24 24', fill: 'none', diff --git a/resources/js/Pages/Client/Schedules/Index.vue b/resources/js/Pages/Client/Schedules/Index.vue index c74d0a8..c03bb99 100644 --- a/resources/js/Pages/Client/Schedules/Index.vue +++ b/resources/js/Pages/Client/Schedules/Index.vue @@ -1,18 +1,19 @@ @@ -51,13 +74,13 @@ export default { Расписание занятий + Просто введите название группы - @@ -68,82 +91,197 @@ export default { class="block text-sm text-gray-700 font-medium dark:text-white"> Поиск - + - - + + Избранные расписания - - + + + + + + + Follow - - - - - + + + + + + + + + + + + + - {{ educationalGroup.title }} - - - - - - - - - - - - - - {{ file.title }} - + + {{ educationalGroup.title }} {{ educationalGroup.faculty }} + + + + + + + + + + + + + + + {{ file.title }} + + - - - + - - - + + + + + + + + + + + + + + + + + + + {{ educationalGroup.title }} {{ educationalGroup.faculty }} + + + + + + + + + + + + + + + {{ file.title }} + + + + + + + + + -
Просто введите название группы