bitinflow/expose
1
0
Fork 0
mirror of https://github.com/bitinflow/expose.git synced 2026-03-13 21:45:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #79 from ahmedash95/users-pagination

Browse Source 
Add simple pagination to users page
This commit is contained in:
Marcel Pociot
2020-07-01 18:10:58 +02:00
committed by GitHub
parent 6d6306b3b2 e960ffb825
commit 87a4115c14
5 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Contracts/UserRepository.php
View File

@@ -10,6 +10,8 @@ interface UserRepository
public function getUserById($id): PromiseInterface;
public function paginateUsers(int $perPage, int $currentPage): PromiseInterface;
public function getUserByToken(string $authToken): PromiseInterface;
public function storeUser(array $data): PromiseInterface;

6
app/Server/Http/Controllers/Admin/GetUsersController.php
View File

@@ -21,10 +21,10 @@ class GetUsersController extends AdminController
public function handle(Request $request, ConnectionInterface $httpConnection)
{
$this->userRepository
->getUsers()
->then(function ($users) use ($httpConnection) {
->paginateUsers(20, (int) $request->get('page', 1))
->then(function ($paginated) use ($httpConnection) {
$httpConnection->send(
respond_json(['users' => $users])
respond_json(['paginated' => $paginated])
);
$httpConnection->close();

6
app/Server/Http/Controllers/Admin/ListUsersController.php
View File

@@ -21,10 +21,10 @@ class ListUsersController extends AdminController
public function handle(Request $request, ConnectionInterface $httpConnection)
{
$this->userRepository
->getUsers()
->then(function ($users) use ($httpConnection) {
->paginateUsers(20, (int) $request->get('page', 1))
->then(function ($paginated) use ($httpConnection) {
$httpConnection->send(
respond_html($this->getView($httpConnection, 'server.users.index', ['users' => $users]))
respond_html($this->getView($httpConnection, 'server.users.index', ['paginated' => $paginated]))
);
$httpConnection->close();

29
app/Server/UserRepository/DatabaseUserRepository.php
View File

@@ -31,6 +31,35 @@ class DatabaseUserRepository implements UserRepository
return $deferred->promise();
}
public function paginateUsers(int $perPage, int $currentPage): PromiseInterface
{
$deferred = new Deferred();
$this->database
->query('SELECT * FROM users ORDER by created_at DESC LIMIT :limit OFFSET :offset', [
'limit' => $perPage + 1,
'offset' => $currentPage < 2 ? 0 : ($currentPage - 1) * $perPage,
])
->then(function (Result $result) use ($deferred, $perPage, $currentPage) {
if(count($result->rows) == $perPage + 1) {
array_pop($result->rows);
$nextPage = $currentPage + 1;
}
$paginated = [
'users' => $result->rows,
'current_page' => $currentPage,
'per_page' => $perPage,
'next_page' => $nextPage ?? null,
'previous_page' => $currentPage > 1 ? $currentPage - 1 : null,
];
$deferred->resolve($paginated);
});
return $deferred->promise();
}
public function getUserById($id): PromiseInterface
{
$deferred = new Deferred();