Refactor items per page code

Usbac · Dec 30, 2024 · 3c850ae · 3c850ae
1 parent 8c47498
commit 3c850ae
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/app/bootstrap/config.php b/app/bootstrap/config.php
@@ -18,6 +18,7 @@
     'date_format' => 'dd MMM Y HH:mm',
     'db'        => $db,
     'content'   => 'public/content',
+    'per_page'  => 1,
     'mail'      => fn($to, $subject, $message) => mail($to, $subject, $message),
     'views'     => 'app/views',
 ];
diff --git a/app/bootstrap/index.php b/app/bootstrap/index.php
@@ -53,5 +53,5 @@ function setting(?string $key = null): mixed
     \Aurora\App\Setting::set($settings);
     \Aurora\App\Media::setDirectory($kernel->config('content'));
 
-    (require('routes.php'))($kernel->router, $db, $view, $lang);
+    (require('routes.php'))($kernel, $db, $view, $lang);
 };
diff --git a/app/bootstrap/routes.php b/app/bootstrap/routes.php
@@ -1,10 +1,8 @@
 <?php
 
-use Aurora\Core\{DB, Helper, Kernel, Language, Route, View};
+use Aurora\Core\{DB, Helper, Kernel, Language, View};
 
-const ITEMS_PER_PAGE = 20;
-
-return function (Route $router, DB $db, View $view, Language $lang) {
+return function (\Aurora\Core\Kernel $kernel, DB $db, View $view, Language $lang) {
     $user_mod = new \Aurora\App\Modules\User($db, $lang);
     $tag_mod = new \Aurora\App\Modules\Tag($db, $lang);
     $link_mod = new \Aurora\App\Modules\Link($db, $lang);
@@ -14,6 +12,7 @@
     $blog_url = \Aurora\App\Setting::get('blog_url');
     $theme_dir = 'themes/' . \Aurora\App\Setting::get('theme');
     $rss = \Aurora\App\Setting::get('rss');
+    $router = $kernel->router;
 
     $router->middleware('*', function() use ($db, $view, $lang, $theme_dir) {
         if (Helper::isValidId($_SESSION['user']['id'] ?? false)) {
@@ -809,7 +808,7 @@
         return json_encode([ 'success' => $success ]);
     });
 
-    $router->get('json:admin/{mod}/page', function() use ($view, $page_mod, $post_mod, $user_mod, $tag_mod, $link_mod) {
+    $router->get('json:admin/{mod}/page', function() use ($kernel, $view, $page_mod, $post_mod, $user_mod, $tag_mod, $link_mod) {
         $mod_str = $_GET['mod'] ?? '';
         switch ($mod_str) {
             case 'pages': $mod = $page_mod; break;
@@ -829,13 +828,14 @@
                 return;
         }
 
+        $per_page = $kernel->config('per_page');
         $where = $mod->getCondition($_GET);
 
         return json_encode([
-            'next_page' => $mod->isNextPageAvailable($_GET['page'], ITEMS_PER_PAGE, $where),
+            'next_page' => $mod->isNextPageAvailable($_GET['page'], $per_page, $where),
             'count' => $mod->count($where),
             'html' => $view->get("admin/partials/lists/$mod_str.html", [
-                $mod_str => $mod->getPage($_GET['page'], ITEMS_PER_PAGE, $where, $_GET['order'] ?? $mod::DEFAULT_ORDER, ($_GET['sort'] ?? ($mod::DEFAULT_SORT ?? 'asc')) == 'asc'),
+                $mod_str => $mod->getPage($_GET['page'], $per_page, $where, $_GET['order'] ?? $mod::DEFAULT_ORDER, ($_GET['sort'] ?? ($mod::DEFAULT_SORT ?? 'asc')) == 'asc'),
             ]),
         ]);
     });