removed "usage" filter, minor tweaks to cards

Signed-off-by: Jurj-Bogdan <jurj@dotkernel.com>

Author: Jurj-Bogdan

.github/workflows/validate-packages.yml

@@ -14,7 +14,7 @@ jobs:
       - run: |
           packages=$(cat ./data/ecosystem/ecosystem-packages.json);
           if [ ! -z "$packages" ] && [ $(echo $packages | jq empty > /dev/null 2>&1; echo $?) -eq 0 ]; then
-            for key in packagistUrl keywords homepage category usage; do
+            for key in packagistUrl keywords homepage category; do
               if ! $(echo $packages | jq ".[]" | jq "has(\"$key\")" | jq 'select(. == false)'); then
                 echo "Invalid JSON. Missing key \"$key\"."
                 exit 1;

ADD_ECOSYSTEM_PACKAGE.md

@@ -34,8 +34,7 @@ composer build
   "packagistUrl": "",
   "keywords": [],
   "homepage": "",
-  "category": "",
-  "usage": ""
+  "category": ""
 }
 ```
 
@@ -52,6 +51,3 @@ composer build
 
 - `category`
   **string** - package category must be one of "skeleton", "integration", "tool"
-
-- `usage`
-  **string** - package usage must be one of "mezzio" or "mvc"

bootstrap/scss/_custom-styles.scss

@@ -620,8 +620,6 @@ article {
     }
 
     .card {
-        height: 400px;
-
         .abandoned-package {
             position: absolute;
             top: 0;
@@ -708,9 +706,6 @@ article {
         border-left: 1px solid grey;
         padding-left: 1em;
     }
-    .statistics-item {
-        margin-bottom: .5em;
-    }
 }
 
 .details-item {

data/ecosystem/ecosystem-packages.json

@@ -3,77 +3,78 @@
     "packagistUrl": "https://packagist.org/packages/akrabat/ip-address-middleware",
     "keywords": ["ip", "address", "middleware"],
     "homepage": "",
-    "category": "tool",
-    "usage": "mezzio"
+    "category": "tool"
   },
   {
     "packagistUrl": "https://packagist.org/packages/netglue/laminas-messenger",
     "keywords": ["laminas", "messenger"],
     "homepage": "",
-    "category": "tool",
-    "usage":  "mezzio"
+    "category": "tool"
   },
   {
     "packagistUrl": "https://packagist.org/packages/dotkernel/dot-errorhandler",
     "keywords": ["error-handling"],
     "homepage": "https://dotkernel.com",
-    "category": "integration",
-    "usage":  "mezzio"
+    "category": "integration"
   },
   {
     "packagistUrl": "https://packagist.org/packages/roave/psr-container-doctrine",
     "keywords": ["middleware", "doctrine"],
     "homepage": "",
-    "category": "integration",
-    "usage":  "mezzio"
+    "category": "integration"
   },
   {
     "packagistUrl": "https://packagist.org/packages/asgrim/mini-mezzio",
     "keywords": ["mezzio"],
     "homepage": "",
-    "category": "skeleton",
-    "usage":  "mezzio"
-  },
-  {
-    "packagistUrl": "https://packagist.org/packages/phly/phly-simple-page",
-    "keywords": ["mvc"],
-    "homepage": "https://github.com/phly/PhlySimplePage",
-    "category": "tool",
-    "usage":  "mvc"
+    "category": "skeleton"
   },
   {
     "packagistUrl": "https://packagist.org/packages/mezzio/mezzio-aurarouter",
     "keywords": ["middleware", "http"],
     "homepage": "",
-    "category": "tool",
-    "usage":  "mezzio"
+    "category": "tool"
   },
   {
     "packagistUrl": "https://packagist.org/packages/dotkernel/api",
     "keywords": ["rest", "api"],
     "homepage": "",
-    "category": "skeleton",
-    "usage":  "mezzio"
+    "category": "skeleton"
   },
   {
     "packagistUrl": "https://packagist.org/packages/dotkernel/frontend",
     "keywords": ["frontend-application"],
     "homepage": "www.dotkernel.com",
-    "category": "skeleton",
-    "usage":  "mezzio"
+    "category": "skeleton"
+  },
+  {
+    "packagistUrl": "https://packagist.org/packages/ramsey/uuid",
+    "keywords": ["uuid", "guid"],
+    "homepage": "",
+    "category": "tool"
+  },
+  {
+    "packagistUrl": "https://packagist.org/packages/ramsey/uuid-doctrine",
+    "keywords": ["doctrine" ,"uuid", "guid"],
+    "homepage": "",
+    "category": "tool"
+  },
+  {
+    "packagistUrl": "https://packagist.org/packages/roave/psr-container-doctrine",
+    "keywords": ["middleware", "doctrine", "psr"],
+    "homepage": "",
+    "category": "integration"
   },
   {
-    "packagistUrl": "https://packagist.org/packages/lm-commons/lmc-rbac-mvc",
-    "keywords": ["mvc", "rbac", "permissions"],
+    "packagistUrl": "https://packagist.org/packages/league/commonmark",
+    "keywords": ["markdown", "parser"],
     "homepage": "",
-    "category": "tool",
-    "usage":  "mvc"
+    "category": "tool"
   },
   {
-    "packagistUrl": "https://packagist.org/packages/lm-commons/lmc-cors",
-    "keywords": ["mvc", "cors"],
+    "packagistUrl": "https://packagist.org/packages/filp/whoops",
+    "keywords": ["middleware", "error-handling"],
     "homepage": "",
-    "category": "tool",
-    "usage":  "mvc"
+    "category": "tool"
   }
 ]

src/Ecosystem/Console/CreateEcosystemDatabase.php

@@ -63,7 +63,6 @@ class CreateEcosystemDatabase extends Command
         'CREATE INDEX keywords ON packages ( keywords )',
         'CREATE INDEX category ON packages ( category )',
         'CREATE INDEX "type" ON packages ( type )',
-        'CREATE INDEX "usage" ON packages ( usage )',
         'CREATE INDEX package_name ON packages ( name )',
     ];
 
@@ -76,7 +75,6 @@ class CreateEcosystemDatabase extends Command
             %s AS repository,
             %d AS abandoned,
             %s AS description,
-            %s AS "usage",
             %d AS created,
             %d AS updated,
             %s AS category,
@@ -97,7 +95,6 @@ class CreateEcosystemDatabase extends Command
         %d,
         %s,
         %s,
-        %s,
         %d,
         %d,
         %s,
@@ -116,7 +113,6 @@ class CreateEcosystemDatabase extends Command
             repository VARCHAR(255) NOT NULL,
             abandoned TINYINT NOT NULL,
             description TEXT NOT NULL,
-            usage VARCHAR(255) NOT NULL,
             created UNSIGNED INTEGER NOT NULL,
             updated UNSIGNED INTEGER NOT NULL,
             category VARCHAR(255) NOT NULL,
@@ -222,7 +218,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $pdo = $this->createDatabase($dbFile);
         $this->initCurl();
 
-        /** @var array{packagistUrl: string, keywords: array<string>, homepage: string, category: string, usage: string} $userData */
+        /** @var array{packagistUrl: string, keywords: array<string>, homepage: string, category: string} $userData */
         foreach ($userDataArray as $userData) {
             $curlResult = $this->getPackageData($userData);
             if ($curlResult === null) {
@@ -284,8 +280,7 @@ public function createDatabase(string $path): PDO
      *     packagistUrl: string,
      *      keywords: array<string>,
      *      homepage: string,
-     *      category: string,
-     *      usage: string
+     *      category: string
      * } $userData
      */
     private function getPackageData(array $userData): ?array
@@ -365,7 +360,6 @@ private function getPackageData(array $userData): ?array
             'issues'       => $packageData['github_open_issues'],
             'downloads'    => $packageData['downloads']['total'],
             'abandoned'    => (int) isset($packageData['abandoned']),
-            'usage'        => $userData['usage'],
             'category'     => $userData['category'],
             'packagistUrl' => $userData['packagistUrl'],
             'keywords'     => $userData['keywords'] !== [] ? $userData['keywords'] : '',
@@ -387,7 +381,6 @@ private function insertPackageInDatabase(EcosystemPackage $package, PDO $pdo): v
             $pdo->quote($package->repository),
             (int) $package->abandoned,
             $pdo->quote($package->description),
-            $pdo->quote($package->usage->value),
             $package->created->getTimestamp(),
             $package->updated->getTimestamp(),
             $pdo->quote($package->category->value),

src/Ecosystem/CreateEcosystemPackageFromArrayTrait.php

@@ -9,7 +9,6 @@
 use Exception;
 use GetLaminas\Ecosystem\Enums\EcosystemCategoryEnum;
 use GetLaminas\Ecosystem\Enums\EcosystemTypeEnum;
-use GetLaminas\Ecosystem\Enums\EcosystemUsageEnum;
 
 use function explode;
 use function is_array;
@@ -27,7 +26,6 @@ trait CreateEcosystemPackageFromArrayTrait
      *     packagistUrl: string,
      *     repository: string,
      *     description: string,
-     *     usage: string,
      *     created: int,
      *     updated: int,
      *     category: string,
@@ -46,9 +44,8 @@ protected function createEcosystemPackageFromArray(array $packageData): ?Ecosyst
     {
         $category = EcosystemCategoryEnum::tryFrom(trim($packageData['category']));
         $type     = EcosystemTypeEnum::tryFrom(trim($packageData['type']));
-        $usage    = EcosystemUsageEnum::tryFrom(trim($packageData['usage']));
 
-        if ($category === null || $type === null || $usage === null) {
+        if ($category === null || $type === null) {
             return null;
         }
 
@@ -65,7 +62,6 @@ protected function createEcosystemPackageFromArray(array $packageData): ?Ecosyst
             $packageData['repository'],
             (bool) $packageData['abandoned'],
             $packageData['description'],
-            $usage,
             $created,
             $updated,
             $category,

src/Ecosystem/EcosystemPackage.php

@@ -7,7 +7,6 @@
 use DateTimeInterface;
 use GetLaminas\Ecosystem\Enums\EcosystemCategoryEnum;
 use GetLaminas\Ecosystem\Enums\EcosystemTypeEnum;
-use GetLaminas\Ecosystem\Enums\EcosystemUsageEnum;
 
 class EcosystemPackage
 {
@@ -22,7 +21,6 @@ public function __construct(
         public string $repository,
         public bool $abandoned,
         public string $description,
-        public EcosystemUsageEnum $usage,
         public DateTimeInterface $created,
         public DateTimeInterface $updated,
         public EcosystemCategoryEnum $category,

src/Ecosystem/Enums/EcosystemUsageEnum.php

@@ -7,7 +7,6 @@
 use GetLaminas\Ecosystem\EcosystemPackage;
 use GetLaminas\Ecosystem\Enums\EcosystemCategoryEnum;
 use GetLaminas\Ecosystem\Enums\EcosystemTypeEnum;
-use GetLaminas\Ecosystem\Enums\EcosystemUsageEnum;
 use GetLaminas\Ecosystem\Mapper\MapperInterface;
 use Laminas\Diactoros\Response\HtmlResponse;
 use Laminas\Diactoros\Response\RedirectResponse;
@@ -50,10 +49,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $category = $queryParams['category'] ?? '';
         assert(is_string($category));
         $category = EcosystemCategoryEnum::tryFrom($category)?->name;
-        $usage    = $queryParams['usage'] ?? '';
-        assert(is_string($usage));
-        $usage  = EcosystemUsageEnum::tryFrom($usage)?->name;
-        $search = $queryParams['q'] ?? '';
+        $search   = $queryParams['q'] ?? '';
         assert(is_string($search));
 
         $packages = $this->ecosystemMapper->fetchAllByFilters(
@@ -65,7 +61,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                     ) : null,
                 'type'     => [$type],
                 'category' => [$category],
-                'usage'    => [$usage],
             ],
             $search
         );
@@ -98,21 +93,15 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                 $categoryQuery = '&category=' . strtolower($category);
             }
 
-            $usageQuery = '';
-            if ($usage !== null) {
-                $usageQuery = '&usage=' . strtolower($usage);
-            }
-
             return new RedirectResponse(
                 sprintf(
-                    '%s?page=%d%s%s%s%s%s',
+                    '%s?page=%d%s%s%s%s',
                     $path,
                     count($packages),
                     $keywordsQuery,
                     $searchQuery,
                     $typeQuery,
                     $categoryQuery,
-                    $usageQuery
                 )
             );
         }
@@ -127,8 +116,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                 $keywords,
                 $search,
                 $type,
-                $category,
-                $usage
+                $category
             ),
         ));
     }
@@ -169,8 +157,7 @@ private function prepareView(
         array $keywords,
         string $search,
         ?string $typeQuery,
-        ?string $categoryQuery,
-        ?string $usageQuery
+        ?string $categoryQuery
     ): array {
         return [
             ...[
@@ -180,7 +167,6 @@ private function prepareView(
                 'search'            => $search,
                 'type'              => $typeQuery,
                 'category'          => $categoryQuery,
-                'usage'             => $usageQuery,
             ],
         ];
     }