diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 45a3c24b0..b8a7dded9 100755 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -1,5 +1,13 @@ input('page')); if ($request->input('page')) { - $result = [$events]; + $result = [[ + 'data' => $events->items(), + 'per_page' => $events->perPage(), + 'current_page' => $events->currentPage(), + 'from' => $events->firstItem(), + 'last_page' => $events->lastPage(), + 'last_page_url' => $events->url($events->lastPage()), + 'next_page_url' => $events->nextPageUrl(), + 'prev_page' => $events->currentPage() > 1 ? $events->currentPage() - 1 : null, + 'prev_page_url' => $events->previousPageUrl(), + 'to' => $events->lastItem(), + 'total' => $events->total(), + ]]; } else { Log::info('no page'); $eventsMap = $this->getAllEventsToMap($filters); - $result = [$events, $eventsMap]; + $result = [[ + 'data' => $events->items(), + 'per_page' => $events->perPage(), + 'current_page' => $events->currentPage(), + 'from' => $events->firstItem(), + 'last_page' => $events->lastPage(), + 'last_page_url' => $events->url($events->lastPage()), + 'next_page_url' => $events->nextPageUrl(), + 'prev_page' => $events->currentPage() > 1 ? $events->currentPage() - 1 : null, + 'prev_page_url' => $events->previousPageUrl(), + 'to' => $events->lastItem(), + 'total' => $events->total(), + ], $eventsMap->toArray()]; } - return $result; + return response()->json($result); } protected function getEvents(EventFilters $filters)