gallery fix
This commit is contained in:
@@ -23,10 +23,14 @@ class BrowseController extends Controller
|
||||
*/
|
||||
public function index(Request $request)
|
||||
{
|
||||
$perPage = min(max((int) $request->get('per_page', 24), 1), 100);
|
||||
$perPage = $this->resolvePerPage($request);
|
||||
$sort = (string) $request->get('sort', 'latest');
|
||||
|
||||
$paginator = $this->service->browsePublicArtworks($perPage, $sort);
|
||||
$paginator->appends([
|
||||
'limit' => $perPage,
|
||||
'sort' => $sort,
|
||||
]);
|
||||
|
||||
return ArtworkListResource::collection($paginator);
|
||||
}
|
||||
@@ -37,7 +41,7 @@ class BrowseController extends Controller
|
||||
*/
|
||||
public function byContentType(Request $request, string $contentTypeSlug)
|
||||
{
|
||||
$perPage = min(max((int) $request->get('per_page', 24), 1), 100);
|
||||
$perPage = $this->resolvePerPage($request);
|
||||
$sort = (string) $request->get('sort', 'latest');
|
||||
|
||||
try {
|
||||
@@ -46,6 +50,11 @@ class BrowseController extends Controller
|
||||
abort(404);
|
||||
}
|
||||
|
||||
$paginator->appends([
|
||||
'limit' => $perPage,
|
||||
'sort' => $sort,
|
||||
]);
|
||||
|
||||
if ($paginator->count() === 0) {
|
||||
return response()->json(['message' => 'Gone'], 410);
|
||||
}
|
||||
@@ -59,7 +68,7 @@ class BrowseController extends Controller
|
||||
*/
|
||||
public function byCategoryPath(Request $request, string $contentTypeSlug, string $categoryPath)
|
||||
{
|
||||
$perPage = min(max((int) $request->get('per_page', 24), 1), 100);
|
||||
$perPage = $this->resolvePerPage($request);
|
||||
$sort = (string) $request->get('sort', 'latest');
|
||||
|
||||
$slugs = array_merge([
|
||||
@@ -72,10 +81,25 @@ class BrowseController extends Controller
|
||||
abort(404);
|
||||
}
|
||||
|
||||
$paginator->appends([
|
||||
'limit' => $perPage,
|
||||
'sort' => $sort,
|
||||
]);
|
||||
|
||||
if ($paginator->count() === 0) {
|
||||
return response()->json(['message' => 'Gone'], 410);
|
||||
}
|
||||
|
||||
return ArtworkListResource::collection($paginator);
|
||||
}
|
||||
|
||||
private function resolvePerPage(Request $request): int
|
||||
{
|
||||
$limit = (int) $request->query('limit', 0);
|
||||
$perPage = (int) $request->query('per_page', 0);
|
||||
|
||||
$value = $limit > 0 ? $limit : ($perPage > 0 ? $perPage : 24);
|
||||
|
||||
return min(max($value, 1), 100);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user