Merge branch 'main' into pr/208

Author: danharrin

README.md

@@ -20,7 +20,6 @@ To set up your author profile, create a new file in the `content/authors` direct
 ---
 name: Dan Harrin
 slug: dan-harrin
-avatar: dan-harrin.jpg
 github_url: https://github.com/danharrin
 twitter_url: https://twitter.com/danjharrin
 mastodon_url: https://phpc.social/@danharrin
@@ -30,8 +29,9 @@ sponsor_url: https://github.com/sponsors/danharrin
 Your bio should be written in Markdown here. In the future, we may introduce an Author page where people can see your contributions, so feel free to write a little about yourself. Please check the grammar and spelling of this description, preferably using [Grammarly](https://www.grammarly.com). It should be in full sentences.
 ```
 
+**Important: please upload an avatar to the `content/authors/avatars` directory. The file must be the same name as your slug. It must be square, at least 1000x1000 pixels in size, and preferably a JPEG.**
+
 - The `slug` should match the current filename.
-- The `avatar` should be the name of a file in the `content/authors/avatars` directory. Your avatar must be square, at least 1000x1000 pixels in size, and preferably a JPEG.
 - The `github_url` should be a link to your GitHub profile.
 - The `twitter_url` should be a link to your Twitter profile. It is optional.
 - The `mastodon_url` should be a link to your Mastodon profile. It is optional.
@@ -53,12 +53,13 @@ docs_url: https://raw.githubusercontent.com/filamentphp/spatie-laravel-media-lib
 github_repository: filamentphp/spatie-laravel-media-library-plugin
 has_dark_theme: true
 has_translations: true
-image: filament-spatie-media-library.jpg
 versions: [2, 3]
 publish_date: 2023-08-01
 ---
 ```
 
+**Important: please upload an image to the `content/plugins/images` directory. The file must be the same name as the plugin's slug. It must fit the 16:9 aspect ratio, at least 2560x1440 pixels in size, and preferably a JPEG. If your image is a screenshot of your plugin, please ensure that it is using a light theme and not a dark theme, to ensure it fits in with the rest of the website.**
+
 Please note: Do not include the word "Filament" in the name of your plugin. This is redundant, as all plugins on the website are for Filament. Please do not include it in the slug or filename either - unless its part of your author name.
 
 - The `slug` should match the current filename.
@@ -70,8 +71,6 @@ Please note: Do not include the word "Filament" in the name of your plugin. This
 - The `github_repository` should be the name of the GitHub repository where your plugin is hosted.
 - The `has_dark_theme` should be `true` if your plugin supports Tailwind's dark mode, or `false` if not.
 - The `has_translations` should be `true` if your plugin supports multiple languages, or `false` if not.
-- The `image` should be the name of a file in the `content/plugins/images` directory. The image must fit the 16:9 aspect ratio, at least 2560x1440 pixels in size, and preferably a JPEG. If your image is a screenshot of your plugin, please ensure that it is using a light theme and not a dark theme, to ensure it fits in with the rest of the website.
-- The `thumbnail` is optional, and is the name of a file in the `content/plugins/thumbnails directory` directory. The image must fit the 16:9 aspect ratio, at least 2560x1440 pixels in size, and preferably a JPEG. It will be used as a replacement for the `image` any time that the plugin is listed alongside others, and the size is smaller. If you do not provide a `thumbnail`, the `image` will be used instead.
 - The `versions` should be an array of Filament major versions that your plugin supports.
 - The `publish_date` is the date that you submitted the plugin to the website. It usually should be the date that you submitted the pull request for the plugin.
 
@@ -144,3 +143,5 @@ error_page 404 /index.php;
 ## Debugging missing content
 
 If you are working on the website locally, and you notice that some Markdown-based content is missing, it is likely that it has not reached the cache yet. Please run `php artisan clear-orbit-cache` and `php artisan cache:clear`. If images aren't showing up, you probably also need to run `php artisan optimize-images`.
+
+> You need to [install image optimization tools](https://github.com/spatie/image-optimizer#optimization-tools) before you can run `php artisan optimize-images`.

app/Actions/FetchPluginDataFromAnystack.php

@@ -3,10 +3,11 @@
 namespace App\Actions;
 
 use App\Models\Plugin;
-use function Filament\Support\format_money;
 use Illuminate\Support\Facades\Http;
 use Throwable;
 
+use function Filament\Support\format_money;
+
 class FetchPluginDataFromAnystack
 {
     public function __invoke(): void

app/Console/Commands/OptimizeImagesCommand.php

@@ -3,7 +3,8 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use Intervention\Image\ImageManagerStatic as Image;
+use Spatie\Image\Image;
+use Spatie\Image\Manipulations;
 use Throwable;
 
 class OptimizeImagesCommand extends Command
@@ -36,9 +37,19 @@ public function handle()
 
             foreach ($files as $file) {
                 try {
-                    Image::make(base_path("content/{$directory}/{$file}"))
-                        ->fit(500, 500)
-                        ->save(public_path("images/content/{$directory}/{$file}"), quality: 50);
+                    $webpFileName = pathinfo($file, PATHINFO_FILENAME) . '.webp';
+
+                    if (file_exists(public_path("images/content/{$directory}/{$webpFileName}"))) {
+                        $this->warn("Skipped {$directory}/{$file}, already optimized.");
+
+                        continue;
+                    }
+
+                    Image::load(base_path("content/{$directory}/{$file}"))
+                        ->fit(Manipulations::FIT_CONTAIN, 500, 500)
+                        ->format(Manipulations::FORMAT_WEBP)
+                        ->optimize()
+                        ->save(public_path("images/content/{$directory}/{$webpFileName}"));
 
                     $this->info("Optimized {$directory}/{$file}");
                 } catch (Throwable $exception) {
@@ -54,9 +65,19 @@ public function handle()
 
             foreach ($files as $file) {
                 try {
-                    Image::make(base_path("content/{$directory}/{$file}"))
-                        ->fit(1920, 1080)
-                        ->save(public_path("images/content/{$directory}/{$file}"));
+                    $webpFileName = pathinfo($file, PATHINFO_FILENAME) . '.webp';
+
+                    if (file_exists(public_path("images/content/{$directory}/{$webpFileName}"))) {
+                        $this->warn("Skipped {$directory}/{$file}, already optimized.");
+
+                        continue;
+                    }
+
+                    Image::load(base_path("content/{$directory}/{$file}"))
+                        ->fit(Manipulations::FIT_CONTAIN, 1920, 1080)
+                        ->format(Manipulations::FORMAT_WEBP)
+                        ->optimize()
+                        ->save(public_path("images/content/{$directory}/{$webpFileName}"));
 
                     $this->info("Optimized {$directory}/{$file}");
                 } catch (Throwable $exception) {
@@ -72,9 +93,19 @@ public function handle()
 
             foreach ($files as $file) {
                 try {
-                    Image::make(base_path("content/{$directory}/{$file}"))
-                        ->fit(1024, 576)
-                        ->save(public_path("images/content/{$directory}/{$file}"), quality: 50);
+                    $webpFileName = pathinfo($file, PATHINFO_FILENAME) . '.webp';
+
+                    if (file_exists(public_path("images/content/{$directory}/{$webpFileName}"))) {
+                        $this->warn("Skipped {$directory}/{$file}, already optimized.");
+
+                        continue;
+                    }
+
+                    Image::load(base_path("content/{$directory}/{$file}"))
+                        ->fit(Manipulations::FIT_CONTAIN, 1024, 576)
+                        ->format(Manipulations::FORMAT_WEBP)
+                        ->optimize()
+                        ->save(public_path("images/content/{$directory}/{$webpFileName}"));
 
                     $this->info("Optimized {$directory}/{$file}");
                 } catch (Throwable $exception) {

app/Http/Controllers/Api/PluginController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Models\Plugin;
+
+class PluginController extends Controller
+{
+    public function index()
+    {
+        return Plugin::paginate();
+    }
+
+    public function show(Plugin $plugin)
+    {
+        return $plugin;
+    }
+}

app/Http/Controllers/Articles/ListArticlesController.php

@@ -42,18 +42,8 @@ function (): array {
                         ->with(['author'])
                         ->get()
                         ->map(fn (Article $article): array => [
-                            'id' => $article->slug,
-                            'title' => $article->title,
-                            'slug' => $article->slug,
-                            'publish_date' => $article->publish_date->diffForHumans(),
+                            ...$article->getDataArray(),
                             'stars_count' => $stars[$article->getKey()] ?? 0,
-                            'author' => [
-                                'name' => $article->author->name,
-                                'avatar' => $article->author->getAvatarUrl(),
-                            ],
-                            'categories' => $article->categories,
-                            'type' => $article->type_slug,
-                            'versions' => $article->versions,
                         ])
                         ->all();
                 },

app/Http/Controllers/Plugins/ListPluginsController.php

@@ -43,25 +43,8 @@ function (): array {
                         ->with(['author'])
                         ->get()
                         ->map(fn (Plugin $plugin): array => [
-                            'id' => $plugin->slug,
-                            'name' => $plugin->name,
-                            'slug' => $plugin->slug,
-                            'price' => $plugin->getPrice(),
+                            ...$plugin->getDataArray(),
                             'stars_count' => $stars[$plugin->getKey()] ?? 0,
-                            'thumbnail_url' => $plugin->getThumbnailUrl(),
-                            'github_repository' => $plugin->github_repository,
-                            'description' => $plugin->description,
-                            'author' => [
-                                'name' => $plugin->author->name,
-                                'avatar' => $plugin->author->getAvatarUrl(),
-                            ],
-                            'features' => [
-                                'dark_theme' => $plugin->has_dark_theme,
-                                'translations' => $plugin->has_translations,
-                            ],
-                            'categories' => $plugin->categories,
-                            'versions' => $plugin->versions,
-                            'publish_date' => $plugin->publish_date->format('Y-m-d'),
                         ])
                         ->all();
                 },

app/Models/Article.php

@@ -97,4 +97,21 @@ public function scopePublished(Builder $query): Builder
     {
         return $query->where('publish_date', '<=', now());
     }
+
+    public function getDataArray(): array
+    {
+        return [
+            'id' => $this->slug,
+            'title' => $this->title,
+            'slug' => $this->slug,
+            'publish_date' => $this->publish_date->diffForHumans(),
+            'author' => [
+                'name' => $this->author->name,
+                'avatar' => $this->author->getAvatarUrl(),
+            ],
+            'categories' => $this->categories,
+            'type' => $this->type_slug,
+            'versions' => $this->versions,
+        ];
+    }
 }

app/Models/Author.php

@@ -22,7 +22,7 @@ class Author extends Model
 
     public static function schema(Blueprint $table)
     {
-        $table->string('avatar');
+        $table->string('avatar')->nullable();
         $table->string('github_url');
         $table->string('name');
         $table->string('slug');
@@ -48,7 +48,7 @@ public function plugins(): HasMany
 
     public function getAvatarUrl(): string
     {
-        return asset("images/content/authors/avatars/{$this->avatar}");
+        return asset('images/content/authors/avatars/' . ($this->avatar ?? "{$this->slug}.webp"));
     }
 
     public function getStarsCount(): int

app/Models/Plugin.php

@@ -135,11 +135,7 @@ public function getStarsCount(): int
 
     public function getImageUrl(): ?string
     {
-        if (blank($this->image)) {
-            return null;
-        }
-
-        return asset("images/content/plugins/images/{$this->image}");
+        return asset('images/content/plugins/images/' . ($this->image ?? "{$this->slug}.webp"));
     }
 
     public function getThumbnailUrl(): ?string
@@ -195,4 +191,28 @@ public function getDocsCacheKeys(): array
             ...array_map(fn ($key) => "plugin:{$this->slug}:docs:{$key}", array_keys($this->docs_urls)),
         ];
     }
+
+    public function getDataArray(): array
+    {
+        return [
+            'id' => $this->slug,
+            'name' => $this->name,
+            'slug' => $this->slug,
+            'price' => $this->getPrice(),
+            'thumbnail_url' => $this->getThumbnailUrl(),
+            'github_repository' => $this->github_repository,
+            'description' => $this->description,
+            'author' => [
+                'name' => $this->author->name,
+                'avatar' => $this->author->getAvatarUrl(),
+            ],
+            'features' => [
+                'dark_theme' => $this->has_dark_theme,
+                'translations' => $this->has_translations,
+            ],
+            'categories' => $this->categories,
+            'versions' => $this->versions,
+            'publish_date' => $this->publish_date->format('Y-m-d'),
+        ];
+    }
 }

composer.json

@@ -28,6 +28,7 @@
         "pirsch-analytics/laravel-pirsch": "^0.4.7",
         "ryangjchandler/blade-capture-directive": "^0.3.0",
         "ryangjchandler/orbit": "^1.2",
+        "spatie/image": "^2.2",
         "spatie/laravel-google-fonts": "^1.2",
         "spatie/laravel-image-optimizer": "^1.7",
         "spatie/yaml-front-matter": "^2.0",