Added changes to search by Vicon structure. Added fix for Page view for settings column.
This commit is contained in:
@@ -9,7 +9,6 @@ use App\Http\Resources\EventSearchResource;
|
||||
use App\Http\Resources\FacultySearchResource;
|
||||
use App\Http\Resources\PageSearchResource;
|
||||
use App\Http\Resources\PostSearchResource;
|
||||
use App\Http\Resources\StaticPageSearchResource;
|
||||
use App\Http\Resources\UserSearchResource;
|
||||
use App\Models\AdditionalEducation;
|
||||
use App\Models\EducationalGroup;
|
||||
@@ -35,9 +34,9 @@ class SearchController extends Controller
|
||||
EducationalGroup::class => EducationGroupSearchResource::class,
|
||||
EducationalProgram::class => EducationalProgramSearchResource::class,
|
||||
Event::class => EventSearchResource::class,
|
||||
AdditionalEducation::class => AdditionalEducationSearchResource::class,
|
||||
User::class => UserSearchResource::class,
|
||||
Faculty::class => FacultySearchResource::class,
|
||||
AdditionalEducation::class => AdditionalEducationSearchResource::class, //??
|
||||
User::class => UserSearchResource::class, //??
|
||||
Faculty::class => FacultySearchResource::class, //??
|
||||
];
|
||||
public function index(Request $request)
|
||||
{
|
||||
|
||||
@@ -12,10 +12,7 @@ class StaticSearchController extends Controller
|
||||
public function search(Request $request)
|
||||
{
|
||||
return app(StaticFileSearch::class)
|
||||
->search(
|
||||
$request->input('search'),
|
||||
$request->input('page', 1)
|
||||
);
|
||||
->search($request);
|
||||
}
|
||||
|
||||
public function getCategories()
|
||||
|
||||
@@ -14,6 +14,10 @@ class AdditionalEducationSearchResource extends JsonResource
|
||||
*/
|
||||
public function toArray(Request $request): array
|
||||
{
|
||||
return parent::toArray($request);
|
||||
return [
|
||||
'id' => $this->id,
|
||||
'title' => $this->title,
|
||||
'slug' => $this->slug,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,6 +14,12 @@ class EventSearchResource extends JsonResource
|
||||
*/
|
||||
public function toArray(Request $request): array
|
||||
{
|
||||
return parent::toArray($request);
|
||||
return [
|
||||
'id' => $this->id,
|
||||
'title' => $this->title,
|
||||
'slug' => $this->slug,
|
||||
'event_date_start' => $this->event_date_start,
|
||||
'event_time_start' => $this->event_time_start
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,6 +14,10 @@ class FacultySearchResource extends JsonResource
|
||||
*/
|
||||
public function toArray(Request $request): array
|
||||
{
|
||||
return parent::toArray($request);
|
||||
return [
|
||||
'id' => $this->id,
|
||||
'title' => $this->title,
|
||||
'slug' => $this->slug,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,6 +14,10 @@ class UserSearchResource extends JsonResource
|
||||
*/
|
||||
public function toArray(Request $request): array
|
||||
{
|
||||
return parent::toArray($request);
|
||||
return [
|
||||
'id' => $this->id,
|
||||
'name' => $this->name,
|
||||
'slug' => $this->slug,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user