more improvements

Author: LordSimal

composer.json

@@ -6,8 +6,8 @@
     "homepage": "https://cakephp.org",
     "require": {
         "php": ">=8.1",
-        "cakephp/cakephp": "5.2.*",
-        "cakephp/migrations": "^4.0.0",
+        "cakephp/cakephp": "5.3.*",
+        "cakephp/migrations": "^5.0.0",
         "cakephp/plugin-installer": "^2.0",
         "dereuromark/cakephp-tags": "^2.2",
         "friendsofcake/search": "^7.5",

composer.lock

@@ -21,6 +21,7 @@ public function change(): void
             ->addColumn('repo_url', 'string')
             ->addColumn('downloads', 'integer')
             ->addColumn('stars', 'integer')
+            ->addColumn('latest_stable_version', 'string', ['null' => true])
             ->create();
     }
 }

config/Migrations/20250921094317_Initial.php

@@ -5,16 +5,16 @@
  * Custom templates for pagination elements.
  */
 return [
-    'button' => '<button class="bg-red-800 hover:cursor-pointer p-2 text-white rounded-sm"{{attrs}}>{{text}}</button>',
+    'button' => '<button class="bg-cake-red hover:cursor-pointer p-2 text-white rounded-sm"{{attrs}}>{{text}}</button>',
     'checkbox' => '<input class="justify-self-start" type="checkbox" name="{{name}}" value="{{value}}"{{attrs}}>',
     'checkboxWrapper' => '<div class="col-span-2 col-start-2 flex gap-2">{{label}}</div>',
-    'error' => '<div class="col-start-2 col-end-4 text-red-700" id="{{id}}">{{content}}</div>',
+    'error' => '<div class="col-start-2 col-end-4 text-cake-red" id="{{id}}">{{content}}</div>',
     'input' => '<input class="col-span-2 border h-full border-slate-500 rounded-sm max-w-md min-w-4 p-2" type="{{type}}" name="{{name}}"{{attrs}}>',
     'inputContainer' => '<div class="group gap-2">{{content}}</div>',
-    'inputContainerError' => '<div class="group gap-2 text-red-700">{{content}}{{error}}</div>',
-    'label' => "<label class=\"group-has-[input:required]:after:content-['_*'] group-has-[input:required]:after:text-red-700\" {{attrs}}>{{text}}</label>",
+    'inputContainerError' => '<div class="group gap-2 text-cake-red">{{content}}{{error}}</div>',
+    'label' => "<label class=\"block group-has-[input:required]:after:content-['_*'] group-has-[input:required]:after:text-cake-red\" {{attrs}}>{{text}}</label>",
     // Not actually a nested label.
-    'nestingLabel' => "{{hidden}}<label class=\"group-has-[input:required]:after:content-['_*'] group-has-[input:required]:after:text-red-700\" {{attrs}}>{{text}}</label>{{input}}",
+    'nestingLabel' => "{{hidden}}<label class=\"group-has-[input:required]:after:content-['_*'] group-has-[input:required]:after:text-cake-red\" {{attrs}}>{{text}}</label>{{input}}",
     'textarea' => '<textarea class="border border-slate-500 col-span-2 rounded-sm max-w-md min-w-4 p-1" name="{{name}}"{{attrs}}>{{value}}</textarea>',
     'select' => '<select class="border border-slate-500 col-span-2 rounded-sm max-w-md min-w-4 p-1" name="{{name}}"{{attrs}}>{{content}}</select>',
     'selectMultiple' => '<select class="border border-slate-500 col-span-2 rounded-sm max-w-md min-w-50 p-1" name="{{name}}[]" multiple="multiple"{{attrs}}>{{content}}</select>',

config/Migrations/schema-dump-default.lock

@@ -5,20 +5,20 @@
  * Custom templates for pagination elements.
  */
 return [
-    'nextActive' => '<li class=""><a class="hover:text-red-800" rel="next" href="{{url}}">{{text}}</a></li>',
+    'nextActive' => '<li class=""><a class="hover:text-cake-red" rel="next" href="{{url}}">{{text}}</a></li>',
     'nextDisabled' => '<li class="next text-gray-400"><a>{{text}}</a></li>',
-    'prevActive' => '<li class="hover:text-red-800"><a rel="prev" href="{{url}}">{{text}}</a></li>',
+    'prevActive' => '<li class="hover:text-cake-red"><a rel="prev" href="{{url}}">{{text}}</a></li>',
     'prevDisabled' => '<li class="prev text-gray-400"><a>{{text}}</a></li>',
     'counterRange' => '{{start}} - {{end}} of {{count}}',
     'counterPages' => '{{page}} of {{pages}}',
-    'first' => '<li class="first"><a class="hover:text-red-800" href="{{url}}">{{text}}</a></li>',
-    'last' => '<li class="last"><a class="hover:text-red-800" href="{{url}}">{{text}}</a></li>',
-    'number' => '<li><a class="hover:text-red-800" href="{{url}}">{{text}}</a></li>',
-    'current' => '<li class="active"><a class="text-red-600 hover:text-red-800" href="">{{text}}</a></li>',
+    'first' => '<li class="first"><a class="hover:text-cake-red" href="{{url}}">{{text}}</a></li>',
+    'last' => '<li class="last"><a class="hover:text-cake-red" href="{{url}}">{{text}}</a></li>',
+    'number' => '<li><a class="hover:text-cake-red" href="{{url}}">{{text}}</a></li>',
+    'current' => '<li class="active"><a class="text-cake-red hover:text-red-800" href="">{{text}}</a></li>',
     'ellipsis' => '<li class="ellipsis">&hellip;</li>',
     'sort' => '<a class="hover:text-red-800" href="{{url}}">{{text}}</a>',
-    'sortAsc' => "<a class=\"whitespace-nowrap text-red-700 after:text-red-700 after:content-['_↓']\" href=\"{{url}}\">{{text}}</a>",
-    'sortDesc' => "<a class=\"whitespace-nowrap text-red-700 after:text-red-700 after:content-['_↑']\" href=\"{{url}}\">{{text}}</a>",
+    'sortAsc' => "<a class=\"whitespace-nowrap text-red-700 after:text-red-700 after:content-['_↑']\" href=\"{{url}}\">{{text}}</a>",
+    'sortDesc' => "<a class=\"whitespace-nowrap text-red-700 after:text-red-700 after:content-['_↓']\" href=\"{{url}}\">{{text}}</a>",
     'sortAscLocked' => '<a class="asc locked" href="{{url}}">{{text}}</a>',
     'sortDescLocked' => '<a class="desc locked" href="{{url}}">{{text}}</a>',
 ];

config/form-templates.php

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+rm tmp/cakephp.db
+bin/cake migrations migrate
+bin/cake migrations migrate -p Tags

config/paginator-templates.php

@@ -83,6 +83,7 @@
 
 @theme {
     --font-raleway: "Raleway", sans-serif;
+    --color-cake-red: #d33c44;
 }
 
 /* Styling for default app homepage */
@@ -116,10 +117,15 @@
 }
 
 .problem:before {
-    color: #d33d44;
+    color: #d33c44;
     content: "\0057";
 }
 
 .ss-main {
     height: 100%;
+    --ss-primary-color: #d33c44;
+}
+
+[data-is-php-filter] + .ss-main {
+    --ss-primary-color: var(--color-blue-500);
 }

reset_db.sh

@@ -70,6 +70,10 @@ public function execute(Arguments $args, ConsoleIo $io)
         foreach ($data as $package) {
             $data = $this->getDataForPackage($package);
 
+            if ($data['is_abandoned']) {
+                continue;
+            }
+
             $entity = $packagesTable->find()->where(['package' => $package])->first();
             if (!$entity) {
                 $entity = $packagesTable->newEmptyEntity();
@@ -98,10 +102,10 @@ private function getDataForPackage(string $packageName): array
         $meta = [];
         // Check each version
         foreach ($versions as $versionMeta) {
-//            $phpRequire = $versionMeta->getRequire()['php'] ?? null;
-//            if ($phpRequire) {
-//                $meta = $this->checkPHPVersion($meta, $phpRequire);
-//            }
+            $phpRequire = $versionMeta->getRequire()['php'] ?? null;
+            if ($phpRequire) {
+                $meta = $this->checkPHPVersion($meta, $phpRequire);
+            }
 
             $cakephpRequire = $versionMeta->getRequire()['cakephp/cakephp'] ?? null;
             if ($cakephpRequire) {
@@ -133,13 +137,21 @@ private function getDataForPackage(string $packageName): array
             }
         }
 
+        $stableVersions = array_filter($versions, fn($v) => preg_match('/^v?\d+\.\d+\.\d+$/', $v->getVersion()));
+        usort($stableVersions, function ($a, $b) {
+            return version_compare($a->getVersion(), $b->getVersion());
+        });
+        $latestStable = end($stableVersions);
+
         $data = [
             'package' => $packageName,
             'description' => $metaDetails->getDescription(),
             'repo_url' => $metaDetails->getRepository(),
             'downloads' => $metaDetails->getDownloads()->getTotal(),
             'stars' => $metaDetails->getGithubStars(),
             'tag_list' => $meta,
+            'latest_stable_version' => $latestStable ? $latestStable->getVersion() : null,
+            'is_abandoned' => $metaDetails->isAbandoned(),
         ];
 
         return $data;
@@ -153,6 +165,7 @@ private function getDataForPackage(string $packageName): array
     private function checkPHPVersion(array $meta, string $packageConstraint): array
     {
         $phpVersions = [
+            '8.5.0' => 'PHP: 8.5',
             '8.4.0' => 'PHP: 8.4',
             '8.3.0' => 'PHP: 8.3',
             '8.2.0' => 'PHP: 8.2',

resources/css/style.css

@@ -3,6 +3,8 @@
 
 namespace App\Controller;
 
+use Cake\ORM\Query\SelectQuery;
+
 /**
  * Packages Controller
  *
@@ -17,13 +19,31 @@ class PackagesController extends AppController
      */
     public function index()
     {
+        // Add default sort if no sort is provided
+        $queryParams = $this->request->getQueryParams();
+        if (empty($queryParams['sort'])) {
+            $this->request = $this->request->withQueryParams(array_merge(
+                $queryParams,
+                ['sort' => 'downloads', 'direction' => 'desc'],
+            ));
+        }
+
         $query = $this->Packages
             ->find('search', search: $this->request->getQueryParams())
-            ->contain(['Tags']);
-        $packages = $this->paginate($query);
+            ->contain(['Tags' => function (SelectQuery $q) {
+                return $q->orderByDesc('Tags.label');
+            }]);
+        $packages = $this->paginate($query, ['limit' => 21]);
 
-        $tags = $this->Packages->Tags->find('list', ...['keyField' => 'slug']);
+        $cakephpTags = $this->Packages->Tags->find('list', keyField: 'slug')
+            ->where(['slug LIKE' => 'cakephp-%'])
+            ->orderByAsc('label')
+            ->toArray();
+        $phpTags = $this->Packages->Tags->find('list', keyField: 'slug')
+            ->where(['slug LIKE' => 'php-%'])
+            ->orderByAsc('label')
+            ->toArray();
 
-        $this->set(compact('packages', 'tags'));
+        $this->set(compact('packages', 'cakephpTags', 'phpTags'));
     }
 }