From f6628ab2127002c736ff1c14aa1abaaf54aefa69 Mon Sep 17 00:00:00 2001
From: Arthur Monney <monneylobe@gmail.com>
Date: Fri, 18 Oct 2024 00:02:18 +0200
Subject: [PATCH 1/8] fix: (LAR-78) forum bug and create livewire forum page

---
 app/Actions/Article/CreateArticleAction.php   |   7 +-
 app/Livewire/Components/Channels.php          |  16 +++
 app/Livewire/Components/ChannelsSelector.php  |  50 ++++++++
 app/Livewire/Pages/Forum/Index.php            |  54 ++++++++
 app/Models/Channel.php                        |   7 ++
 app/Models/Thread.php                         |   2 +-
 composer.lock                                 | 117 +++++++++---------
 lang/en.json                                  |  10 --
 lang/fr.json                                  |  10 --
 lang/fr/pages/forum.php                       |  20 +++
 .../forum/thread-overview.blade.php           |   4 +-
 .../views/components/layouts/header.blade.php |   2 +-
 resources/views/components/link.blade.php     |   2 +-
 .../views/components/status-message.blade.php |   2 +-
 resources/views/forum/_channels.blade.php     | 102 ++++++++-------
 resources/views/forum/index.blade.php         |  26 +---
 .../components/channels-selector.blade.php    | 109 ++++++++++++++++
 .../livewire/forum/create-thread.blade.php    |  15 ++-
 .../livewire/pages/forum/index.blade.php      |  28 +++++
 resources/views/partials/_search.blade.php    |   2 +-
 routes/forum.php                              |  14 +++
 routes/web.php                                |   9 +-
 tests/Feature/Forum/ChannelTest.php           |  24 ++--
 .../Components/ChannelsSelectorTest.php       |  11 ++
 .../Livewire/Pages/Forum/IndexTest.php        |  13 ++
 25 files changed, 469 insertions(+), 187 deletions(-)
 create mode 100644 app/Livewire/Components/Channels.php
 create mode 100644 app/Livewire/Components/ChannelsSelector.php
 create mode 100644 app/Livewire/Pages/Forum/Index.php
 delete mode 100644 lang/en.json
 delete mode 100644 lang/fr.json
 create mode 100644 lang/fr/pages/forum.php
 create mode 100644 resources/views/livewire/components/channels-selector.blade.php
 create mode 100644 resources/views/livewire/pages/forum/index.blade.php
 create mode 100644 routes/forum.php
 create mode 100644 tests/Feature/Livewire/Components/ChannelsSelectorTest.php
 create mode 100644 tests/Feature/Livewire/Pages/Forum/IndexTest.php

diff --git a/app/Actions/Article/CreateArticleAction.php b/app/Actions/Article/CreateArticleAction.php
index a960ba73..824e1528 100644
--- a/app/Actions/Article/CreateArticleAction.php
+++ b/app/Actions/Article/CreateArticleAction.php
@@ -9,14 +9,13 @@
 use App\Models\Article;
 use App\Notifications\PostArticleToTelegram;
 use Carbon\Carbon;
-use DateTimeInterface;
 use Illuminate\Support\Facades\Auth;
 
 final class CreateArticleAction
 {
     public function execute(CreateArticleData $articleData): Article
     {
-        if ($articleData->publishedAt && ! ($articleData->publishedAt instanceof DateTimeInterface)) {
+        if ($articleData->publishedAt) {
             $articleData->publishedAt = new Carbon(
                 time: $articleData->publishedAt,
                 tz: config('app.timezone')
@@ -41,12 +40,14 @@ public function execute(CreateArticleData $articleData): Article
         }
 
         if ($articleData->file) {
-            $article->addMedia($articleData->file->getRealPath())->toMediaCollection('media');
+            $article->addMedia($articleData->file->getRealPath())
+                ->toMediaCollection('media');
         }
 
         if ($article->isAwaitingApproval()) {
             // Envoi de la notification sur le channel Telegram pour la validation de l'article.
             Auth::user()?->notify(new PostArticleToTelegram($article));
+
             session()->flash('status', __('notifications.article.created'));
         }
 
diff --git a/app/Livewire/Components/Channels.php b/app/Livewire/Components/Channels.php
new file mode 100644
index 00000000..8906b7fb
--- /dev/null
+++ b/app/Livewire/Components/Channels.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Livewire\Components;
+
+use Illuminate\Contracts\View\View;
+use Livewire\Component;
+
+final class Channels extends Component
+{
+    public function render(): View
+    {
+        return view('livewire.components.channels');
+    }
+}
diff --git a/app/Livewire/Components/ChannelsSelector.php b/app/Livewire/Components/ChannelsSelector.php
new file mode 100644
index 00000000..bd161941
--- /dev/null
+++ b/app/Livewire/Components/ChannelsSelector.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Livewire\Components;
+
+use App\Models\Channel;
+use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Cache;
+use Livewire\Attributes\Computed;
+use Livewire\Component;
+
+/**
+ * @property Channel | null $currentChannel
+ */
+final class ChannelsSelector extends Component
+{
+    public ?string $slug = null;
+
+    public function selectedChannel(int $channelId): void
+    {
+        $this->slug = Channel::query()->find($channelId)?->slug;
+
+        $this->dispatch('channelUpdated', channelId: $channelId);
+    }
+
+    public function resetChannel(): void
+    {
+        $this->slug = null;
+
+        $this->dispatch('channelUpdated', channelId: null);
+    }
+
+    #[Computed]
+    public function currentChannel(): ?Channel
+    {
+        return $this->slug ? Channel::findBySlug($this->slug) : null;
+    }
+
+    public function render(): View
+    {
+        return view('livewire.components.channels-selector', [
+            'channels' => Cache::remember(
+                'channels',
+                now()->addMonth(),
+                fn () => Channel::with('items')->whereNull('parent_id')->get()
+            ),
+        ]);
+    }
+}
diff --git a/app/Livewire/Pages/Forum/Index.php b/app/Livewire/Pages/Forum/Index.php
new file mode 100644
index 00000000..75255abb
--- /dev/null
+++ b/app/Livewire/Pages/Forum/Index.php
@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Livewire\Pages\Forum;
+
+use App\Models\Channel;
+use App\Models\Thread;
+use Illuminate\Contracts\View\View;
+use Livewire\Attributes\On;
+use Livewire\Component;
+use Livewire\WithoutUrlPagination;
+use Livewire\WithPagination;
+
+final class Index extends Component
+{
+    use WithoutUrlPagination;
+    use WithPagination;
+
+    public ?Channel $currentChannel = null;
+
+    public int $perPage = 10;
+
+    #[On('channelUpdated')]
+    public function reloadThreads(?int $channelId): void
+    {
+        if ($channelId) {
+            $this->currentChannel = Channel::query()->find($channelId);
+        } else {
+            $this->currentChannel = null;
+        }
+
+        $this->dispatch('render');
+    }
+
+    public function render(): View
+    {
+        $query = Thread::query()
+            ->orderByDesc('created_at');
+
+        if ($this->currentChannel?->id) {
+            $query->scopes(['channel' => $this->currentChannel]);
+        }
+
+        $threads = $query
+            ->scopes('withViewsCount')
+            ->paginate($this->perPage);
+
+        return view('livewire.pages.forum.index', [
+            'threads' => $threads,
+        ])
+            ->title(__('pages/forum.channel_title', ['channel' => isset($this->currentChannel) ? ' ~ '.$this->currentChannel->name : '']));
+    }
+}
diff --git a/app/Models/Channel.php b/app/Models/Channel.php
index 9a0fd3e5..aec67d7f 100644
--- a/app/Models/Channel.php
+++ b/app/Models/Channel.php
@@ -12,6 +12,13 @@
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
+/**
+ * @property-read int $id
+ * @property string $name
+ * @property string $slug
+ * @property string $color
+ * @property int | null $parent_id
+ */
 final class Channel extends Model
 {
     use HasFactory;
diff --git a/app/Models/Thread.php b/app/Models/Thread.php
index a49b0924..6093e60c 100644
--- a/app/Models/Thread.php
+++ b/app/Models/Thread.php
@@ -147,7 +147,7 @@ public function unmarkSolution(): void
         $this->save();
     }
 
-    public function scopeForChannel(Builder $query, Channel $channel): Builder
+    public function scopeChannel(Builder $query, Channel $channel): Builder
     {
         return $query->whereHas('channels', function ($query) use ($channel): void {
             if ($channel->hasItems()) {
diff --git a/composer.lock b/composer.lock
index 2c9357c7..bc7c996b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2672,16 +2672,16 @@
         },
         {
             "name": "filament/actions",
-            "version": "v3.2.117",
+            "version": "v3.2.118",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
-                "reference": "886108b59ce99edc26f5bc1231134a95ec58718a"
+                "reference": "addd6a6f5e8e250a34c7c12bcb4060cc5ecbb9e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/actions/zipball/886108b59ce99edc26f5bc1231134a95ec58718a",
-                "reference": "886108b59ce99edc26f5bc1231134a95ec58718a",
+                "url": "https://api.github.com/repos/filamentphp/actions/zipball/addd6a6f5e8e250a34c7c12bcb4060cc5ecbb9e8",
+                "reference": "addd6a6f5e8e250a34c7c12bcb4060cc5ecbb9e8",
                 "shasum": ""
             },
             "require": {
@@ -2721,20 +2721,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-09T11:19:22+00:00"
+            "time": "2024-10-16T12:07:31+00:00"
         },
         {
             "name": "filament/filament",
-            "version": "v3.2.117",
+            "version": "v3.2.118",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
-                "reference": "84f839b4b42549c0d4bd231648da17561ada70c2"
+                "reference": "442374aea8436dc154629aa97f56736503cc3e49"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/84f839b4b42549c0d4bd231648da17561ada70c2",
-                "reference": "84f839b4b42549c0d4bd231648da17561ada70c2",
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/442374aea8436dc154629aa97f56736503cc3e49",
+                "reference": "442374aea8436dc154629aa97f56736503cc3e49",
                 "shasum": ""
             },
             "require": {
@@ -2786,20 +2786,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-08T14:24:12+00:00"
+            "time": "2024-10-16T12:07:33+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v3.2.117",
+            "version": "v3.2.118",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "896c868cca474b2e925a3e6162b7c76d8ff3e5fc"
+                "reference": "9eaf88275da18777b1738514db6083e34b1700d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/896c868cca474b2e925a3e6162b7c76d8ff3e5fc",
-                "reference": "896c868cca474b2e925a3e6162b7c76d8ff3e5fc",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/9eaf88275da18777b1738514db6083e34b1700d4",
+                "reference": "9eaf88275da18777b1738514db6083e34b1700d4",
                 "shasum": ""
             },
             "require": {
@@ -2842,20 +2842,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-09T11:19:26+00:00"
+            "time": "2024-10-16T12:07:33+00:00"
         },
         {
             "name": "filament/infolists",
-            "version": "v3.2.117",
+            "version": "v3.2.118",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
-                "reference": "fc5f01c094fe25ef906f3e1b88d3d8883a73d6be"
+                "reference": "f107a83c3ac042a4d4608d45173cf88c0c55276c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/fc5f01c094fe25ef906f3e1b88d3d8883a73d6be",
-                "reference": "fc5f01c094fe25ef906f3e1b88d3d8883a73d6be",
+                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/f107a83c3ac042a4d4608d45173cf88c0c55276c",
+                "reference": "f107a83c3ac042a4d4608d45173cf88c0c55276c",
                 "shasum": ""
             },
             "require": {
@@ -2893,20 +2893,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-08T14:24:09+00:00"
+            "time": "2024-10-16T12:07:29+00:00"
         },
         {
             "name": "filament/notifications",
-            "version": "v3.2.117",
+            "version": "v3.2.118",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
-                "reference": "a5f684b690354630210fc9a90bd06da9b1f6ae82"
+                "reference": "b56b155efd4290459d944a1b3d515b5aaf54846d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/notifications/zipball/a5f684b690354630210fc9a90bd06da9b1f6ae82",
-                "reference": "a5f684b690354630210fc9a90bd06da9b1f6ae82",
+                "url": "https://api.github.com/repos/filamentphp/notifications/zipball/b56b155efd4290459d944a1b3d515b5aaf54846d",
+                "reference": "b56b155efd4290459d944a1b3d515b5aaf54846d",
                 "shasum": ""
             },
             "require": {
@@ -2945,20 +2945,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-08T14:24:11+00:00"
+            "time": "2024-10-16T12:07:28+00:00"
         },
         {
             "name": "filament/support",
-            "version": "v3.2.117",
+            "version": "v3.2.118",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
-                "reference": "31fcff80b873b4decdba10d5f7010310e12c8e94"
+                "reference": "85d83838ec0290fffba2be3f99a8b0840da1dc01"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/support/zipball/31fcff80b873b4decdba10d5f7010310e12c8e94",
-                "reference": "31fcff80b873b4decdba10d5f7010310e12c8e94",
+                "url": "https://api.github.com/repos/filamentphp/support/zipball/85d83838ec0290fffba2be3f99a8b0840da1dc01",
+                "reference": "85d83838ec0290fffba2be3f99a8b0840da1dc01",
                 "shasum": ""
             },
             "require": {
@@ -2969,7 +2969,7 @@
                 "illuminate/support": "^10.45|^11.0",
                 "illuminate/view": "^10.45|^11.0",
                 "kirschbaum-development/eloquent-power-joins": "^3.0|^4.0",
-                "livewire/livewire": "^3.4.10 <= 3.5.6",
+                "livewire/livewire": "^3.4.10",
                 "php": "^8.1",
                 "ryangjchandler/blade-capture-directive": "^0.2|^0.3|^1.0",
                 "spatie/color": "^1.5",
@@ -3004,20 +3004,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-08T14:24:29+00:00"
+            "time": "2024-10-16T12:07:44+00:00"
         },
         {
             "name": "filament/tables",
-            "version": "v3.2.117",
+            "version": "v3.2.118",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
-                "reference": "152bf46a8f2c46f047835771a67085c2866b039b"
+                "reference": "fac7e8e9a787aef94f45938fd47b50ea3f9d3bff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/152bf46a8f2c46f047835771a67085c2866b039b",
-                "reference": "152bf46a8f2c46f047835771a67085c2866b039b",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/fac7e8e9a787aef94f45938fd47b50ea3f9d3bff",
+                "reference": "fac7e8e9a787aef94f45938fd47b50ea3f9d3bff",
                 "shasum": ""
             },
             "require": {
@@ -3056,11 +3056,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-08T14:24:25+00:00"
+            "time": "2024-10-16T12:07:46+00:00"
         },
         {
             "name": "filament/widgets",
-            "version": "v3.2.117",
+            "version": "v3.2.118",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
@@ -6223,16 +6223,16 @@
         },
         {
             "name": "livewire/livewire",
-            "version": "v3.5.6",
+            "version": "v3.5.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/livewire/livewire.git",
-                "reference": "597a2808d8d3001cc3ed5ce89a6ebab00f83b80f"
+                "reference": "3c8d1f9d7d9098aaea663093ae168f2d5d2ae73d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/597a2808d8d3001cc3ed5ce89a6ebab00f83b80f",
-                "reference": "597a2808d8d3001cc3ed5ce89a6ebab00f83b80f",
+                "url": "https://api.github.com/repos/livewire/livewire/zipball/3c8d1f9d7d9098aaea663093ae168f2d5d2ae73d",
+                "reference": "3c8d1f9d7d9098aaea663093ae168f2d5d2ae73d",
                 "shasum": ""
             },
             "require": {
@@ -6240,7 +6240,7 @@
                 "illuminate/routing": "^10.0|^11.0",
                 "illuminate/support": "^10.0|^11.0",
                 "illuminate/validation": "^10.0|^11.0",
-                "laravel/prompts": "^0.1.24",
+                "laravel/prompts": "^0.1.24|^0.2|^0.3",
                 "league/mime-type-detection": "^1.9",
                 "php": "^8.1",
                 "symfony/console": "^6.0|^7.0",
@@ -6287,7 +6287,7 @@
             "description": "A front-end framework for Laravel.",
             "support": {
                 "issues": "https://github.com/livewire/livewire/issues",
-                "source": "https://github.com/livewire/livewire/tree/v3.5.6"
+                "source": "https://github.com/livewire/livewire/tree/v3.5.12"
             },
             "funding": [
                 {
@@ -6295,7 +6295,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-08-19T11:52:18+00:00"
+            "time": "2024-10-15T19:35:06+00:00"
         },
         {
             "name": "maennchen/zipstream-php",
@@ -14911,36 +14911,37 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v2.9.8",
+            "version": "v2.9.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "340badd89b0eb5bddbc503a4829c08cf9a2819d7"
+                "reference": "148faa138f0d8acb7d85f4a55693d3e13b6048d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/340badd89b0eb5bddbc503a4829c08cf9a2819d7",
-                "reference": "340badd89b0eb5bddbc503a4829c08cf9a2819d7",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/148faa138f0d8acb7d85f4a55693d3e13b6048d2",
+                "reference": "148faa138f0d8acb7d85f4a55693d3e13b6048d2",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "illuminate/console": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/container": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/contracts": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/database": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/http": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/pipeline": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/support": "^9.52.16 || ^10.28.0 || ^11.0",
+                "illuminate/console": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/container": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/contracts": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/database": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/http": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/pipeline": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/support": "^9.52.16 || ^10.28.0 || ^11.16",
                 "php": "^8.0.2",
                 "phpmyadmin/sql-parser": "^5.9.0",
-                "phpstan/phpstan": "^1.11.2"
+                "phpstan/phpstan": "^1.12.5"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0",
                 "nikic/php-parser": "^4.19.1",
                 "orchestra/canvas": "^7.11.1 || ^8.11.0 || ^9.0.2",
                 "orchestra/testbench": "^7.33.0 || ^8.13.0 || ^9.0.3",
+                "phpstan/phpstan-deprecation-rules": "^1.2",
                 "phpunit/phpunit": "^9.6.13 || ^10.5.16"
             },
             "suggest": {
@@ -14989,7 +14990,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v2.9.8"
+                "source": "https://github.com/larastan/larastan/tree/v2.9.9"
             },
             "funding": [
                 {
@@ -15009,7 +15010,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-07-06T17:46:02+00:00"
+            "time": "2024-10-15T19:41:22+00:00"
         },
         {
             "name": "laravel/pint",
diff --git a/lang/en.json b/lang/en.json
deleted file mode 100644
index 9800982d..00000000
--- a/lang/en.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "The :attribute must be at least :length characters.": "The :attribute must be at least :length characters.",
-  "The given :attribute has appeared in a data leak. Please choose a different :attribute.": "The given :attribute has appeared in a data leak. Please choose a different :attribute.",
-  "Verify Email Address": "Verify Email Address",
-  "Please click the button below to verify your email address.": "Please click the button below to verify your email address.",
-  "If you did not create an account, no further action is required.": "If you did not create an account, no further action is required.",
-  "Articles soumis en attente d'approbation:" : "Pending approval articles:",
-  "[@:username](:profile_url) a soumit l'article :title le: :date" : "[@:username](:profile_url) submitted the article :title on: :date",
-  "Voir l'article" : "Voir l'article"
-}
diff --git a/lang/fr.json b/lang/fr.json
deleted file mode 100644
index 9ef90469..00000000
--- a/lang/fr.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "The :attribute must be at least :length characters.": "Le champ :attribute doit contenir au moins :length caractères.",
-  "The given :attribute has appeared in a data leak. Please choose a different :attribute.": "Le champ :attribute donné est apparu dans une fuite de données. Veuillez choisir un autre :attribute.",
-  "Verify Email Address": "Vérifier l'adresse e-mail",
-  "Please click the button below to verify your email address.": "Veuillez cliquer sur le bouton ci-dessous pour vérifier votre adresse email.",
-  "If you did not create an account, no further action is required.": "Si vous n'avez pas créé de compte, aucune autre action n'est requise.",
-  "Articles soumis en attente d'approbation:" : "Articles soumis en attente d'approbation:",
-  "[@:username](:profile_url) a soumit l'article [:title](:url) le: :date" : "[@:username](:profile_url) a soumit l'article [:title](:url) le: :date",
-  "Voir l'article": "Voir l'article"
-}
diff --git a/lang/fr/pages/forum.php b/lang/fr/pages/forum.php
new file mode 100644
index 00000000..7b89994b
--- /dev/null
+++ b/lang/fr/pages/forum.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+
+    'channel_title' => 'Forum :channel',
+    'channel_selector' => 'Sélectionner un channel',
+    'channel_placeholder' => 'Rechercher un channel',
+    'channel_lists' => 'Toutes',
+    'view_channel' => 'Afficher',
+    'reset_channel' => 'Réinitialiser',
+    'new_thread' => 'Nouveau sujet',
+    'all_threads' => 'Tous les sujets',
+    'info' => [
+        'title' => 'Bon à savoir',
+        'description' => "Veuillez rechercher votre question avant de publier votre sujet en utilisant le champ de recherche dans la barre de navigation pour voir si elle n'a pas déjà été traitée.",
+    ],
+
+];
diff --git a/resources/views/components/forum/thread-overview.blade.php b/resources/views/components/forum/thread-overview.blade.php
index 45c3f081..ed4f9698 100644
--- a/resources/views/components/forum/thread-overview.blade.php
+++ b/resources/views/components/forum/thread-overview.blade.php
@@ -26,9 +26,9 @@
                     @if (count($channels = $thread->channels->load('parent')))
                         <div class="mt-2 flex flex-wrap gap-2 lg:mt-0 lg:gap-x-3">
                             @foreach ($channels as $channel)
-                                <a href="{{ route('forum.channels', $channel) }}" class="flex gap-2">
+                                <x-link href="{{ route('forum.channels', $channel) }}" class="flex gap-2">
                                     <x-forum.channel :channel="$channel" />
-                                </a>
+                                </x-link>
                             @endforeach
                         </div>
                     @endif
diff --git a/resources/views/components/layouts/header.blade.php b/resources/views/components/layouts/header.blade.php
index 70aaec63..3d209f8a 100644
--- a/resources/views/components/layouts/header.blade.php
+++ b/resources/views/components/layouts/header.blade.php
@@ -15,7 +15,7 @@
             <div
                 x-data="{ open: false }"
                 @keydown.window.escape="open = false"
-                class="flex items-center gap-4"
+                class="flex items-center gap-6"
             >
                 @include('partials._search')
 
diff --git a/resources/views/components/link.blade.php b/resources/views/components/link.blade.php
index c3ffd72d..5d711982 100644
--- a/resources/views/components/link.blade.php
+++ b/resources/views/components/link.blade.php
@@ -1,3 +1,3 @@
-<a {{ $attributes }}>
+<a {{ $attributes }} wire:navigate>
     {{ $slot }}
 </a>
diff --git a/resources/views/components/status-message.blade.php b/resources/views/components/status-message.blade.php
index b64bdb53..b169a91b 100644
--- a/resources/views/components/status-message.blade.php
+++ b/resources/views/components/status-message.blade.php
@@ -1,5 +1,5 @@
 @if (session('status'))
-    <div {{ $attributes->merge(['class' => 'rounded-md bg-green-50 p-4']) }}>
+    <div {{ $attributes->merge(['class' => 'rounded-lg bg-green-50 p-4 dark:bg-green-800/20']) }}>
         <div class="flex">
             <div class="shrink-0">
                 <x-heroicon-s-check-circle class="size-5 text-green-400" aria-hidden="true" />
diff --git a/resources/views/forum/_channels.blade.php b/resources/views/forum/_channels.blade.php
index a4b1392b..22fe54d9 100644
--- a/resources/views/forum/_channels.blade.php
+++ b/resources/views/forum/_channels.blade.php
@@ -1,17 +1,9 @@
 <nav class="space-y-6">
-    <x-button :href="route('forum.new')" class="flex w-full justify-between">
-        Nouveau Sujet
-        <svg
-            xmlns="http://www.w3.org/2000/svg"
-            fill="none"
-            viewBox="0 0 24 24"
-            stroke-width="1.5"
-            stroke="currentColor"
-            class="ml-2.5 size-4"
-        >
-            <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
-        </svg>
-    </x-button>
+    <x-buttons.primary :href="route('forum.new')" class="gap-2 justify-between">
+        {{ __('pages/forum.new_thread') }}
+        <x-untitledui-plus class="size-4" stroke-width="1.5" aria-hidden="true" />
+    </x-buttons.primary>
+
     <div class="sm:hidden">
         <x-forms.select
             onchange="this.options[this.selectedIndex].value && (window.location = this.options[this.selectedIndex].value);"
@@ -37,44 +29,50 @@ class="ml-2.5 size-4"
             @endforeach
         </x-forms.select>
     </div>
-    <ul class="hidden sm:block sm:space-y-3">
-        <li>
-            <a href="{{ route('forum.index') }}" class="truncate text-gray-500 dark:text-gray-400 hover:text-primary-600">
-                Tous les sujets
-            </a>
-        </li>
-        @foreach ($channels as $channel)
-            <li class="{{ $loop->last ?: 'pb-4' }} relative">
-                <div class="absolute left-1 top-4 -ml-px mt-0.5 h-full w-0.5 bg-skin-card" aria-hidden="true"></div>
-                <div class="flex items-center space-x-3">
-                    <div
-                        class="h-2 w-2 shrink-0 rounded-full"
-                        aria-hidden="true"
-                        style="background-color: {{ $channel->color }}"
-                    ></div>
-                    <a
-                        href="{{ route('forum.channels', $channel) }}"
-                        class="{{ url()->route('forum.channels', $channel) === request()->fullUrl() ? 'text-primary-600 hover:text-primary-600-hover' : 'text-gray-700 dark:text-gray-300 hover:text-gray-900' }} truncate font-medium"
-                    >
-                        {{ $channel->name }}
-                    </a>
-                </div>
 
-                @if ($channel->items->isNotEmpty())
-                    <ul class="ml-8 mt-3 space-y-2">
-                        @foreach ($channel->items as $item)
-                            <li>
-                                <a
-                                    href="{{ route('forum.channels', $item) }}"
-                                    class="{{ url()->route('forum.channels', $item) === request()->fullUrl() ? 'text-primary-600 hover:text-primary-600-hover' : 'text-gray-500 dark:text-gray-400 hover:text-gray-900' }} truncate"
-                                >
-                                    {{ $item->name }}
-                                </a>
-                            </li>
-                        @endforeach
-                    </ul>
-                @endif
-            </li>
-        @endforeach
-    </ul>
+    <div class="hidden sm:block">
+        <ul class="space-y-3">
+            @foreach ($channels as $channel)
+                <li class="{{ $loop->last ?: 'pb-4' }} relative">
+                    <div class="absolute left-1 top-4 -ml-px mt-0.5 h-full w-0.5 bg-gray-100" aria-hidden="true"></div>
+                    <div class="flex items-center space-x-3">
+                        <div
+                            class="size-2 shrink-0 rounded-full"
+                            aria-hidden="true"
+                            style="background-color: {{ $channel->color }}"
+                        ></div>
+                        <x-link
+                            :href="route('forum.channels', $channel)"
+                            @class([
+                                'truncate font-medium',
+                                 'text-primary-600 hover:text-primary-600-hover' => url()->route('forum.channels', $channel) === request()->fullUrl(),
+                                 'text-gray-700 dark:text-gray-300 hover:text-gray-900 dark:hover:text-white' => url()->route('forum.channels', $channel) !== request()->fullUrl()
+                            ])
+                        >
+                            {{ $channel->name }}
+                        </x-link>
+                    </div>
+
+                    @if ($channel->items->isNotEmpty())
+                        <ul class="ml-8 mt-3 space-y-2">
+                            @foreach ($channel->items as $item)
+                                <li>
+                                    <x-link
+                                        :href="route('forum.channels', $item)"
+                                        @class([
+                                            'truncate text-sm',
+                                             'text-primary-600 hover:text-primary-600-hover' => url()->route('forum.channels', $item) === request()->fullUrl(),
+                                             'text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300' => url()->route('forum.channels', $item) !== request()->fullUrl()
+                                        ])
+                                    >
+                                        {{ $item->name }}
+                                    </x-link>
+                                </li>
+                            @endforeach
+                        </ul>
+                    @endif
+                </li>
+            @endforeach
+        </ul>
+    </div>
 </nav>
diff --git a/resources/views/forum/index.blade.php b/resources/views/forum/index.blade.php
index 4e484fb3..e9c83f39 100644
--- a/resources/views/forum/index.blade.php
+++ b/resources/views/forum/index.blade.php
@@ -1,25 +1,15 @@
 @php(($subTitle = isset($channel) ? $channel->name : null))
 
-<x-app-layout :title="'Forum' . (isset($subTitle) ? ' ~ ' . $subTitle : '')">
+<x-app-layout :title="__('pages/forum.channel_title', ['channel' => isset($subTitle) ? ' ~ ' . $subTitle : ''])">
     <x-container class="py-12">
-        <div class="relative lg:grid lg:grid-cols-12 lg:gap-8">
+        <div class="relative lg:grid lg:grid-cols-9 lg:gap-8">
             <div class="lg:col-span-2 lg:block">
                 @include('forum._channels')
             </div>
 
-            <div class="mt-6 space-y-5 sm:mt-0 lg:col-span-8 xl:col-span-7">
+            <div class="mt-6 space-y-5 sm:mt-0 lg:col-span-7">
                 <x-status-message />
 
-                <div class="lg:grid lg:grid-cols-3 lg:gap-10">
-                    <div class="hidden items-center lg:flex">
-                        <h3 class="font-heading text-xl text-gray-900">
-                            {{ number_format($threads->total()) }} Sujets
-                        </h3>
-                    </div>
-                    <div class="lg:col-span-2">
-                        <x-forum.filters :filter="$filter" />
-                    </div>
-                </div>
                 <div class="my-10 space-y-6 sm:space-y-5 lg:mb-32">
                     @foreach ($threads as $thread)
                         <x-forum.thread-overview :thread="$thread" />
@@ -30,16 +20,6 @@
                     </div>
                 </div>
             </div>
-
-            <div class="relative mt-10 hidden lg:col-span-2 lg:block xl:col-span-3">
-                <x-sticky-content class="space-y-10">
-                    <x-sponsors />
-
-                    <x-ads />
-
-                    @include('forum._moderators')
-                </x-sticky-content>
-            </div>
         </div>
     </x-container>
 </x-app-layout>
diff --git a/resources/views/livewire/components/channels-selector.blade.php b/resources/views/livewire/components/channels-selector.blade.php
new file mode 100644
index 00000000..d8fa2290
--- /dev/null
+++ b/resources/views/livewire/components/channels-selector.blade.php
@@ -0,0 +1,109 @@
+<div x-data="{
+    open: false,
+    toggle() {
+        this.open = ! this.open;
+    },
+    selectChannel (channelId) {
+        $wire.selectedChannel(channelId);
+        this.toggle();
+    },
+    reset() {
+        $wire.resetChannel();
+        this.toggle();
+    }
+}">
+    <div class="relative">
+        <button
+            type="button"
+            class="relative inline-flex w-full cursor-default items-center gap-2 rounded-lg bg-white dark:bg-gray-800 py-2 pl-3 pr-10 text-left text-gray-900 dark:text-white ring-1 ring-inset ring-gray-200 dark:ring-white/10 focus:outline-none focus:ring-2 focus:ring-primary-600 sm:w-52 sm:text-sm sm:leading-6"
+            aria-haspopup="listbox"
+            aria-expanded="true"
+            aria-labelledby="listbox-label"
+            @click="toggle()"
+        >
+            <span class="truncate">
+                {{ $this->currentChannel ? $this->currentChannel->name : __('pages/forum.channel_lists') }}
+            </span>
+            <span class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-3">
+                <x-untitledui-chevron-down class="size-5 text-gray-400 dark:text-gray-500" aria-hidden="true" />
+            </span>
+        </button>
+
+        <div
+            x-show="open"
+            x-transition:leave="transition duration-100 ease-in"
+            x-transition:leave-start="opacity-100"
+            x-transition:leave-end="opacity-0"
+            @click.away="open = false"
+            class="absolute z-10 mt-1 w-60 rounded-lg bg-white dark:bg-gray-800 shadow-lg ring-1 ring-black dark:ring-white/10 ring-opacity-5 focus:outline-none overflow-hidden sm:text-sm"
+            tabindex="-1"
+            role="listbox"
+            aria-labelledby="listbox-label"
+            aria-activedescendant="listbox-option"
+            style="display: none;"
+        >
+            @isset($slug)
+                <div class="relative border-b border-gray-200 dark:border-white/20">
+                    <button
+                        type="button"
+                        @click="reset()"
+                        class="flex items-center w-full py-2 px-4 text-gray-500 hover:text-gray-900 dark:text-gray-400 dark:hover:text-gray-300"
+                    >
+                        {{ __('pages/forum.reset_channel') }}
+                    </button>
+                </div>
+            @endisset
+            <div class="max-h-96 overflow-auto">
+                @foreach($channels as $channel)
+                    <div class="relative">
+                        <div class="sticky top-0 bg-gray-50/90 dark:bg-gray-900/80 text-xs z-50 px-5 py-1 text-gray-700 dark:text-gray-300 font-semibold backdrop-blur-sm ring-1 ring-gray-900/10 dark:ring-white/10">
+                            <div class="flex items-center justify-between gap-4">
+                                <span class="relative flex items-center gap-2">
+                                    <div
+                                        class="size-2 shrink-0 rounded-full"
+                                        aria-hidden="true"
+                                        style="background-color: {{ $channel->color }}"
+                                    ></div>
+                                    {{ $channel->name }}
+                                </span>
+                                <button
+                                    type="button"
+                                    @click="selectChannel({{ $channel->id }})"
+                                    class="inline-flex items-center py-1 px-2 text-[10px] text-gray-700 font-medium rounded-md bg-gray-100 hover:bg-gray-200/50 ring-1 ring-inset ring-gray-200 dark:text-gray-300 dark:bg-white/10 dark:hover:bg-white/30 dark:ring-white/10"
+                                >
+                                    {{ __('pages/forum.view_channel') }}
+                                </button>
+                            </div>
+                        </div>
+                        @if ($channel->items->isNotEmpty())
+                            <ul role="list" class="py-1">
+                                @foreach ($channel->items as $item)
+                                    <li
+                                        class="relative flex items-center select-none px-2"
+                                        id="listbox-option-{{ $loop->index }}"
+                                        role="option"
+                                    >
+                                        @if ($slug === $item->slug)
+                                            <span class="absolute inset-y-0 left-0 flex items-center pl-2 pr-4 text-primary-600">
+                                                <x-untitledui-check-circle class="size-4" aria-hidden="true" />
+                                            </span>
+                                        @endif
+                                        <button
+                                            @click="selectChannel({{ $item->id }})"
+                                            type="button"
+                                            @class([
+                                               'flex items-center w-full py-2 pl-6 text-gray-500 hover:text-gray-900 dark:text-gray-400 dark:hover:text-gray-300',
+                                               'font-medium text-gray-900' => $slug === $item->slug,
+                                            ])>
+                                            {{ $item->name }}
+                                        </button>
+                                    </li>
+                                @endforeach
+                            </ul>
+                        @endif
+                    </div>
+                @endforeach
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/resources/views/livewire/forum/create-thread.blade.php b/resources/views/livewire/forum/create-thread.blade.php
index 755c8576..099881ec 100644
--- a/resources/views/livewire/forum/create-thread.blade.php
+++ b/resources/views/livewire/forum/create-thread.blade.php
@@ -1,17 +1,20 @@
 <div>
-    @include('livewire.forum._form')
+    <div>
+        @include('livewire.forum._form')
+    </div>
 
     <div class="mt-10 rounded-xl bg-yellow-50 p-4 ring-1 ring-inset ring-yellow-200">
         <div class="flex">
             <div class="shrink-0">
-                <x-untitledui-alert-triangle class="size-5 text-yellow-400" />
+                <x-untitledui-alert-triangle class="size-5 text-yellow-400" aria-hidden="true" />
             </div>
             <div class="ml-3">
-                <h3 class="text-sm font-medium text-yellow-800">Bon à savoir</h3>
-                <div class="mt-2 font-sans text-sm text-yellow-700">
+                <h3 class="text-sm font-medium text-yellow-800">
+                    {{ __('pages/forum.info.title') }}
+                </h3>
+                <div class="mt-2 text-sm text-yellow-700">
                     <p>
-                        Veuillez rechercher votre question avant de publier votre sujet en utilisant le champ de
-                        recherche dans la barre de navigation pour voir si elle n'a pas déjà été traitée.
+                        {{ __('pages/forum.info.description') }}
                     </p>
                 </div>
             </div>
diff --git a/resources/views/livewire/pages/forum/index.blade.php b/resources/views/livewire/pages/forum/index.blade.php
new file mode 100644
index 00000000..1ede0137
--- /dev/null
+++ b/resources/views/livewire/pages/forum/index.blade.php
@@ -0,0 +1,28 @@
+<x-container class="py-12">
+    <div class="relative lg:grid lg:grid-cols-9 lg:gap-8">
+        <div class="lg:col-span-2 lg:block">
+            <nav class="space-y-6">
+                <x-buttons.primary :href="route('forum.new')" class="gap-2 justify-between">
+                    {{ __('pages/forum.new_thread') }}
+                    <x-untitledui-plus class="size-4" stroke-width="1.5" aria-hidden="true" />
+                </x-buttons.primary>
+            </nav>
+        </div>
+
+        <div class="mt-6 sm:mt-0 lg:col-span-7">
+            <div class="flex items-center gap-6">
+                <livewire:components.channels-selector />
+            </div>
+
+            <div class="mt-6 space-y-6 sm:space-y-5 lg:mb-32">
+                @foreach ($threads as $thread)
+                    <x-forum.thread-overview :thread="$thread" />
+                @endforeach
+
+                <div class="mt-10">
+                    {{ $threads->links() }}
+                </div>
+            </div>
+        </div>
+    </div>
+</x-container>
diff --git a/resources/views/partials/_search.blade.php b/resources/views/partials/_search.blade.php
index 3943d33f..74bb7790 100644
--- a/resources/views/partials/_search.blade.php
+++ b/resources/views/partials/_search.blade.php
@@ -1,7 +1,7 @@
 <button
     type="button"
     @click="$dispatch('toggle-spotlight')"
-    class="inline-flex items-center gap-4 relative rounded-lg ring-1 ring-gray-200 bg-white p-1.5 text-sm leading-5 text-gray-400 dark:text-gray-500 dark:bg-gray-800 dark:border-white/20 lg:py-2 lg:px-3"
+    class="inline-flex items-center gap-4 relative rounded-lg ring-1 ring-gray-200 bg-white p-1.5 text-sm leading-5 text-gray-400 dark:text-gray-500 dark:bg-gray-800 dark:ring-white/20 lg:py-2 lg:px-3"
 >
     <span class="sr-only">{{ __('global.search') }}</span>
     <div class="lg:hidden">
diff --git a/routes/forum.php b/routes/forum.php
new file mode 100644
index 00000000..f95dece2
--- /dev/null
+++ b/routes/forum.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Http\Controllers\ThreadController;
+use App\Livewire\Pages\Forum;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/', Forum\Index::class)->name('index');
+
+Route::get('/channels/{channel}', [ThreadController::class, 'channel'])->name('channels');
+Route::get('/new-thread', [ThreadController::class, 'create'])->name('new');
+Route::get('/{thread}', [ThreadController::class, 'show'])->name('show');
+Route::get('/{thread}/edit', [ThreadController::class, 'edit'])->name('edit');
diff --git a/routes/web.php b/routes/web.php
index 58de83c2..6d4472b0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -51,14 +51,7 @@
 });
 
 // Forum
-Route::prefix('forum')->as('forum.')->group(function (): void {
-    Route::redirect('/channels', '/forum');
-    Route::get('/', [ThreadController::class, 'index'])->name('index');
-    Route::get('/channels/{channel}', [ThreadController::class, 'channel'])->name('channels');
-    Route::get('/new-thread', [ThreadController::class, 'create'])->name('new');
-    Route::get('/{thread}', [ThreadController::class, 'show'])->name('show');
-    Route::get('/{thread}/edit', [ThreadController::class, 'edit'])->name('edit');
-});
+Route::prefix('forum')->as('forum.')->group(base_path('routes/forum.php'));
 
 // Replies
 Route::get('replyable/{id}/{type}', [ReplyAbleController::class, 'redirect'])->name('replyable');
diff --git a/tests/Feature/Forum/ChannelTest.php b/tests/Feature/Forum/ChannelTest.php
index a9a610e0..86250d40 100644
--- a/tests/Feature/Forum/ChannelTest.php
+++ b/tests/Feature/Forum/ChannelTest.php
@@ -5,16 +5,20 @@
 use App\Exceptions\CannotAddChannelToChild;
 use App\Models\Channel;
 
-test('channel can have children', function (): void {
-    $channel = Channel::factory()->create();
-    Channel::factory()->count(2)->create(['parent_id' => $channel->id]);
+describe(Channel::class, function (): void {
+    test('channel can have children', function (): void {
+        $channel = Channel::factory()->create();
+        Channel::factory()->count(2)
+            ->create(['parent_id' => $channel->id]);
 
-    expect($channel->items->count())->toEqual(2);
-});
+        expect($channel->items->count())->toEqual(2);
+    });
+
+    test('child channel can be a parent', function (): void {
+        $channel = Channel::factory()->create();
+        $child = Channel::factory()->create(['parent_id' => $channel->id]);
 
-test('child channel can be a parent', function (): void {
-    $channel = Channel::factory()->create();
-    $child = Channel::factory()->create(['parent_id' => $channel->id]);
+        Channel::factory()->create(['parent_id' => $child->id]);
+    })->throws(CannotAddChannelToChild::class);
+});
 
-    Channel::factory()->create(['parent_id' => $child->id]);
-})->throws(CannotAddChannelToChild::class);
diff --git a/tests/Feature/Livewire/Components/ChannelsSelectorTest.php b/tests/Feature/Livewire/Components/ChannelsSelectorTest.php
new file mode 100644
index 00000000..8f6820dc
--- /dev/null
+++ b/tests/Feature/Livewire/Components/ChannelsSelectorTest.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Livewire\Components\ChannelsSelector;
+use Livewire\Livewire;
+
+it('renders successfully', function (): void {
+    Livewire::test(ChannelsSelector::class)
+        ->assertStatus(200);
+});
diff --git a/tests/Feature/Livewire/Pages/Forum/IndexTest.php b/tests/Feature/Livewire/Pages/Forum/IndexTest.php
new file mode 100644
index 00000000..07d9982f
--- /dev/null
+++ b/tests/Feature/Livewire/Pages/Forum/IndexTest.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Livewire\Pages\Forum\Index;
+use Livewire\Livewire;
+
+describe(Index::class, function (): void {
+    it('forum page renders successfully', function (): void {
+        Livewire::test(Index::class)
+            ->assertStatus(200);
+    })->group('forum');
+});

From 96de7f0b1a1444c4899846e801939389a831fc37 Mon Sep 17 00:00:00 2001
From: Arthur Monney <monneylobe@gmail.com>
Date: Sat, 19 Oct 2024 20:58:28 +0200
Subject: [PATCH 2/8] feat: update thread listing design

---
 app/Livewire/Pages/Forum/Index.php            |  16 ++
 app/Livewire/Reactions.php                    |   1 +
 app/Models/Reply.php                          |   4 +-
 app/Models/Thread.php                         |  16 +-
 app/View/Components/ForumLayout.php           |  16 ++
 composer.lock                                 |  84 ++++----
 .../seeders/Fixtures/ThreadTableSeeder.php    |  21 +-
 lang/en/global.php                            |   4 +
 lang/en/pagination.php                        |   5 +
 lang/fr/global.php                            |   4 +
 lang/fr/pages/forum.php                       |  14 +-
 lang/fr/pagination.php                        |   5 +
 public/images/reactions/clap.svg              |  93 ++-------
 public/images/reactions/fire.svg              | 115 ++---------
 public/images/reactions/handshake.svg         |  99 ++++------
 public/images/reactions/joy.svg               |  77 ++------
 public/images/reactions/love.svg              |  62 ++----
 public/images/reactions/money.svg             | 130 ++++---------
 public/images/reactions/party.svg             | 123 +++---------
 public/images/reactions/pray.svg              | 104 ++++------
 resources/views/components/discord.blade.php  |   2 +-
 .../views/components/footer-link.blade.php    |   8 +-
 .../views/components/forum/channel.blade.php  |   4 +-
 .../forum/thread-overview.blade.php           | 164 ++++++----------
 .../views/components/guirlandes.blade.php     |  12 --
 .../views/components/layouts/footer.blade.php | 182 +++++++++---------
 resources/views/components/nav-link.blade.php |  14 --
 .../views/components/nav/forum-link.blade.php |  26 +++
 .../views/components/section-header.blade.php |   2 +-
 resources/views/components/skeleton.blade.php |  10 +-
 resources/views/components/soon.blade.php     |   1 -
 resources/views/faq.blade.php                 |   6 +-
 resources/views/forum/index.blade.php         |  25 ---
 resources/views/layouts/forum.blade.php       |  47 +++++
 .../components/channels-selector.blade.php    |   2 +-
 .../livewire/pages/forum/index.blade.php      |  60 +++---
 resources/views/livewire/reactions.blade.php  |  88 ++-------
 resources/views/sponsors/index.blade.php      |  10 +-
 .../components/forms/inputs/email.blade.php   |   1 -
 .../components/forms/inputs/input.blade.php   |  34 ----
 .../forms/inputs/password.blade.php           |   1 -
 .../forms/inputs/textarea.blade.php           |  26 ---
 .../components/forms/label.blade.php          |   3 -
 .../vendor/livewire-ui-spotlight/.gitkeep     |   0
 .../livewire-ui-spotlight/spotlight.blade.php | 174 -----------------
 .../vendor/livewire/simple-tailwind.blade.php |  12 +-
 .../views/vendor/livewire/tailwind.blade.php  |  36 ++--
 .../views/vendor/mail/html/footer.blade.php   |  12 +-
 routes/web.php                                |  15 --
 tests/Feature/Actions/.gitkeep                |   0
 .../Discussion/CreateDiscussionActionTest.php |   3 +
 .../Article/SendTelegramNotificationTest.php  |   8 +-
 tests/Feature/Forum/DiscussionTest.php        |   2 +-
 tests/Feature/Forum/ThreadTest.php            |  45 +----
 tests/Feature/Livewire/DiscussionTest.php     |   2 +
 tests/Pest.php                                |  53 +++++
 tests/TestCase.php                            |   3 -
 57 files changed, 727 insertions(+), 1359 deletions(-)
 create mode 100644 app/View/Components/ForumLayout.php
 delete mode 100644 resources/views/components/guirlandes.blade.php
 delete mode 100644 resources/views/components/nav-link.blade.php
 create mode 100644 resources/views/components/nav/forum-link.blade.php
 delete mode 100644 resources/views/components/soon.blade.php
 delete mode 100644 resources/views/forum/index.blade.php
 create mode 100644 resources/views/layouts/forum.blade.php
 delete mode 100644 resources/views/vendor/blade-ui-kit/components/forms/inputs/email.blade.php
 delete mode 100644 resources/views/vendor/blade-ui-kit/components/forms/inputs/input.blade.php
 delete mode 100644 resources/views/vendor/blade-ui-kit/components/forms/inputs/password.blade.php
 delete mode 100644 resources/views/vendor/blade-ui-kit/components/forms/inputs/textarea.blade.php
 delete mode 100644 resources/views/vendor/blade-ui-kit/components/forms/label.blade.php
 delete mode 100644 resources/views/vendor/livewire-ui-spotlight/.gitkeep
 delete mode 100644 resources/views/vendor/livewire-ui-spotlight/spotlight.blade.php
 delete mode 100644 tests/Feature/Actions/.gitkeep

diff --git a/app/Livewire/Pages/Forum/Index.php b/app/Livewire/Pages/Forum/Index.php
index 75255abb..47b5405a 100644
--- a/app/Livewire/Pages/Forum/Index.php
+++ b/app/Livewire/Pages/Forum/Index.php
@@ -7,11 +7,14 @@
 use App\Models\Channel;
 use App\Models\Thread;
 use Illuminate\Contracts\View\View;
+use Illuminate\Database\Eloquent\Builder;
+use Livewire\Attributes\Layout;
 use Livewire\Attributes\On;
 use Livewire\Component;
 use Livewire\WithoutUrlPagination;
 use Livewire\WithPagination;
 
+#[Layout('layouts.forum')]
 final class Index extends Component
 {
     use WithoutUrlPagination;
@@ -19,8 +22,15 @@ final class Index extends Component
 
     public ?Channel $currentChannel = null;
 
+    public string $search = '';
+
     public int $perPage = 10;
 
+    public function launchSearch(): void
+    {
+        //
+    }
+
     #[On('channelUpdated')]
     public function reloadThreads(?int $channelId): void
     {
@@ -42,6 +52,12 @@ public function render(): View
             $query->scopes(['channel' => $this->currentChannel]);
         }
 
+        if ($this->search) {
+            $query->where(function (Builder $query): void {
+                $query->where('title', 'like', '%'.$this->search.'%');
+            });
+        }
+
         $threads = $query
             ->scopes('withViewsCount')
             ->paginate($this->perPage);
diff --git a/app/Livewire/Reactions.php b/app/Livewire/Reactions.php
index b787e164..ac139b74 100644
--- a/app/Livewire/Reactions.php
+++ b/app/Livewire/Reactions.php
@@ -33,6 +33,7 @@ public function userReacted(string $reaction): void
         } else {
             /** @var Reaction $react */
             $react = Reaction::query()->where('name', $reaction)->first();
+
             Auth::user()->reactTo($this->model, $react); // @phpstan-ignore-line
         }
     }
diff --git a/app/Models/Reply.php b/app/Models/Reply.php
index b91ee99c..4bf959af 100644
--- a/app/Models/Reply.php
+++ b/app/Models/Reply.php
@@ -68,9 +68,9 @@ public function mentionedUsers(): array
         return $matches[1];
     }
 
-    public function to(ReplyInterface $replyAble): void
+    public function to(ReplyInterface $replyable): void
     {
-        $this->replyAble()->associate($replyAble);
+        $this->replyAble()->associate($replyable);
     }
 
     public function allChildReplies(): MorphMany
diff --git a/app/Models/Thread.php b/app/Models/Thread.php
index 6093e60c..55aa5230 100644
--- a/app/Models/Thread.php
+++ b/app/Models/Thread.php
@@ -32,6 +32,18 @@
 use Spatie\Feed\Feedable;
 use Spatie\Feed\FeedItem;
 
+/**
+ * @property-read int $id
+ * @property string $title
+ * @property string $slug
+ * @property string $body
+ * @property int $user_id
+ * @property bool $locked
+ * @property Carbon | null $last_posted_at
+ * @property int | null $resolved_by
+ * @property User | null $resolvedBy
+ * @property User $user
+ */
 final class Thread extends Model implements Feedable, ReactableInterface, ReplyInterface, SubscribeInterface, Viewable
 {
     use HasAuthor;
@@ -81,10 +93,10 @@ public function replyAbleSubject(): string
 
     public function getPathUrl(): string
     {
-        return "/forum/{$this->slug()}";
+        return '/forum/'.$this->slug();
     }
 
-    public function excerpt(int $limit = 100): string
+    public function excerpt(int $limit = 200): string
     {
         return Str::limit(strip_tags((string) md_to_html($this->body)), $limit);
     }
diff --git a/app/View/Components/ForumLayout.php b/app/View/Components/ForumLayout.php
new file mode 100644
index 00000000..52777d90
--- /dev/null
+++ b/app/View/Components/ForumLayout.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\View\Components;
+
+use Illuminate\Contracts\View\View;
+use Illuminate\View\Component;
+
+final class ForumLayout extends Component
+{
+    public function render(): View
+    {
+        return view('layouts.forum');
+    }
+}
diff --git a/composer.lock b/composer.lock
index bc7c996b..3b3b1e54 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1244,16 +1244,16 @@
         },
         {
             "name": "blade-ui-kit/blade-icons",
-            "version": "1.7.1",
+            "version": "1.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/blade-ui-kit/blade-icons.git",
-                "reference": "8f787baf09d88cdfd6ec4dbaba11ebfa885f0595"
+                "reference": "75a54a3f5a2810fcf6574ab23e91b6cc229a1b53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/blade-ui-kit/blade-icons/zipball/8f787baf09d88cdfd6ec4dbaba11ebfa885f0595",
-                "reference": "8f787baf09d88cdfd6ec4dbaba11ebfa885f0595",
+                "url": "https://api.github.com/repos/blade-ui-kit/blade-icons/zipball/75a54a3f5a2810fcf6574ab23e91b6cc229a1b53",
+                "reference": "75a54a3f5a2810fcf6574ab23e91b6cc229a1b53",
                 "shasum": ""
             },
             "require": {
@@ -1321,7 +1321,7 @@
                     "type": "paypal"
                 }
             ],
-            "time": "2024-08-14T14:25:11+00:00"
+            "time": "2024-10-17T17:38:00+00:00"
         },
         {
             "name": "blade-ui-kit/blade-ui-kit",
@@ -2672,7 +2672,7 @@
         },
         {
             "name": "filament/actions",
-            "version": "v3.2.118",
+            "version": "v3.2.119",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
@@ -2725,16 +2725,16 @@
         },
         {
             "name": "filament/filament",
-            "version": "v3.2.118",
+            "version": "v3.2.119",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
-                "reference": "442374aea8436dc154629aa97f56736503cc3e49"
+                "reference": "6ab7628f7a0c164d694a540dfe69b8d79484fd7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/442374aea8436dc154629aa97f56736503cc3e49",
-                "reference": "442374aea8436dc154629aa97f56736503cc3e49",
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/6ab7628f7a0c164d694a540dfe69b8d79484fd7d",
+                "reference": "6ab7628f7a0c164d694a540dfe69b8d79484fd7d",
                 "shasum": ""
             },
             "require": {
@@ -2786,11 +2786,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-16T12:07:33+00:00"
+            "time": "2024-10-17T09:39:37+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v3.2.118",
+            "version": "v3.2.119",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
@@ -2846,7 +2846,7 @@
         },
         {
             "name": "filament/infolists",
-            "version": "v3.2.118",
+            "version": "v3.2.119",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
@@ -2897,7 +2897,7 @@
         },
         {
             "name": "filament/notifications",
-            "version": "v3.2.118",
+            "version": "v3.2.119",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
@@ -2949,7 +2949,7 @@
         },
         {
             "name": "filament/support",
-            "version": "v3.2.118",
+            "version": "v3.2.119",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
@@ -3008,7 +3008,7 @@
         },
         {
             "name": "filament/tables",
-            "version": "v3.2.118",
+            "version": "v3.2.119",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
@@ -3060,7 +3060,7 @@
         },
         {
             "name": "filament/widgets",
-            "version": "v3.2.118",
+            "version": "v3.2.119",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
@@ -3789,16 +3789,16 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8"
+                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
-                "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
+                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
                 "shasum": ""
             },
             "require": {
@@ -3852,7 +3852,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.0.3"
+                "source": "https://github.com/guzzle/promises/tree/2.0.4"
             },
             "funding": [
                 {
@@ -3868,7 +3868,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-18T10:29:17+00:00"
+            "time": "2024-10-17T10:06:22+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
@@ -5633,16 +5633,16 @@
         },
         {
             "name": "league/csv",
-            "version": "9.17.0",
+            "version": "9.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/csv.git",
-                "reference": "8cab815fb11ec93aa2f7b8a57b3daa1f1a364011"
+                "reference": "b02d010e4055ae992247f6ffd1e7b103ef2a0790"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/csv/zipball/8cab815fb11ec93aa2f7b8a57b3daa1f1a364011",
-                "reference": "8cab815fb11ec93aa2f7b8a57b3daa1f1a364011",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/b02d010e4055ae992247f6ffd1e7b103ef2a0790",
+                "reference": "b02d010e4055ae992247f6ffd1e7b103ef2a0790",
                 "shasum": ""
             },
             "require": {
@@ -5654,11 +5654,11 @@
                 "ext-xdebug": "*",
                 "friendsofphp/php-cs-fixer": "^3.64.0",
                 "phpbench/phpbench": "^1.3.1",
-                "phpstan/phpstan": "^1.12.5",
+                "phpstan/phpstan": "^1.12.6",
                 "phpstan/phpstan-deprecation-rules": "^1.2.1",
                 "phpstan/phpstan-phpunit": "^1.4.0",
                 "phpstan/phpstan-strict-rules": "^1.6.1",
-                "phpunit/phpunit": "^10.5.16 || ^11.4.0",
+                "phpunit/phpunit": "^10.5.16 || ^11.4.1",
                 "symfony/var-dumper": "^6.4.8 || ^7.1.5"
             },
             "suggest": {
@@ -5716,7 +5716,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-10-10T10:30:28+00:00"
+            "time": "2024-10-18T08:14:48+00:00"
         },
         {
             "name": "league/flysystem",
@@ -15977,16 +15977,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.6",
+            "version": "1.12.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae"
+                "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc4d2f145a88ea7141ae698effd64d9df46527ae",
-                "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc2b9976bd8b0f84ec9b0e50cc35378551de7af0",
+                "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0",
                 "shasum": ""
             },
             "require": {
@@ -16031,7 +16031,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-10-06T15:03:59+00:00"
+            "time": "2024-10-18T11:12:07+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -16625,16 +16625,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "5.0.2",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53"
+                "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53",
-                "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e",
+                "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e",
                 "shasum": ""
             },
             "require": {
@@ -16645,7 +16645,7 @@
                 "sebastian/exporter": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.4"
+                "phpunit/phpunit": "^10.5"
             },
             "type": "library",
             "extra": {
@@ -16690,7 +16690,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
                 "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.2"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.3"
             },
             "funding": [
                 {
@@ -16698,7 +16698,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-08-12T06:03:08+00:00"
+            "time": "2024-10-18T14:56:07+00:00"
         },
         {
             "name": "sebastian/complexity",
diff --git a/database/seeders/Fixtures/ThreadTableSeeder.php b/database/seeders/Fixtures/ThreadTableSeeder.php
index 7842ac9c..78efc86d 100644
--- a/database/seeders/Fixtures/ThreadTableSeeder.php
+++ b/database/seeders/Fixtures/ThreadTableSeeder.php
@@ -4,6 +4,9 @@
 
 namespace Database\Seeders\Fixtures;
 
+use App\Models\Reply;
+use App\Models\Thread;
+use App\Models\User;
 use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
 
@@ -11,5 +14,21 @@ final class ThreadTableSeeder extends Seeder
 {
     use WithoutModelEvents;
 
-    public function run(): void {}
+    public function run(): void
+    {
+        $usersIds = User::query()->inRandomOrder()
+            ->limit(20)
+            ->get()
+            ->modelKeys();
+
+        Thread::factory(['user_id' => random_int(1, count($usersIds))])
+            ->count(40)
+            ->create();
+
+        /*$threadsIds = Thread::query()->inRandomOrder()
+            ->get()
+            ->modelKeys();
+
+        Reply::factory(['user_id' => random_int(1, count($threadsIds))])->create();*/
+    }
 }
diff --git a/lang/en/global.php b/lang/en/global.php
index ca581280..36bfb4a9 100644
--- a/lang/en/global.php
+++ b/lang/en/global.php
@@ -47,8 +47,12 @@
     'sponsored' => 'Sponsored',
     'read_time' => ':time min reading',
     'page_views' => ':number views',
+    'views' => 'views',
     'open_navigation' => 'Open main menu',
     'close_navigation' => 'Close menu',
     'view_notifications' => 'View notifications',
+    'reset' => 'Reset',
+    'answers' => 'answers',
+    'first_to_react' => 'Be the first to react',
 
 ];
diff --git a/lang/en/pagination.php b/lang/en/pagination.php
index f03c42c6..d90fa15c 100644
--- a/lang/en/pagination.php
+++ b/lang/en/pagination.php
@@ -17,5 +17,10 @@
 
     'previous' => '&laquo; Previous',
     'next' => 'Next &raquo;',
+    'go_to_page' => 'Go to page :page',
+    'results' => 'results',
+    'showing' => 'Showing',
+    'to' => 'to',
+    'of' => 'of',
 
 ];
diff --git a/lang/fr/global.php b/lang/fr/global.php
index 348aa942..5cd9d651 100644
--- a/lang/fr/global.php
+++ b/lang/fr/global.php
@@ -47,8 +47,12 @@
     'sponsored' => 'Sponsorisé',
     'read_time' => ':time min de lecture',
     'page_views' => ':number vues',
+    'views' => 'vues',
     'open_navigation' => 'Ouvrir le menu',
     'close_navigation' => 'Fermer le menu',
     'view_notifications' => 'Voir les notifications',
+    'reset' => 'Réinitialiser',
+    'answers' => 'réponses',
+    'first_to_react' => 'Soyez le premier à réagir',
 
 ];
diff --git a/lang/fr/pages/forum.php b/lang/fr/pages/forum.php
index 7b89994b..0ae2cfa5 100644
--- a/lang/fr/pages/forum.php
+++ b/lang/fr/pages/forum.php
@@ -9,12 +9,22 @@
     'channel_placeholder' => 'Rechercher un channel',
     'channel_lists' => 'Toutes',
     'view_channel' => 'Afficher',
-    'reset_channel' => 'Réinitialiser',
     'new_thread' => 'Nouveau sujet',
-    'all_threads' => 'Tous les sujets',
+    'navigation' => [
+        'threads' => 'Tous les sujets',
+        'channels' => 'Channels',
+        'me' => 'Mes questions',
+        'following' => 'Suivi',
+        'popular' => 'Populaire',
+        'solve' => 'Résolu',
+        'unresolved' => 'Non résolu',
+        'no_reply' => 'Aucune réponse',
+        'leaderboard' => 'Classement',
+    ],
     'info' => [
         'title' => 'Bon à savoir',
         'description' => "Veuillez rechercher votre question avant de publier votre sujet en utilisant le champ de recherche dans la barre de navigation pour voir si elle n'a pas déjà été traitée.",
     ],
+    'thread_search' => 'Rechercher un sujet',
 
 ];
diff --git a/lang/fr/pagination.php b/lang/fr/pagination.php
index 15c69f69..2f727c7c 100644
--- a/lang/fr/pagination.php
+++ b/lang/fr/pagination.php
@@ -17,5 +17,10 @@
 
     'previous' => '&laquo; Précédent',
     'next' => 'Suivant &raquo;',
+    'go_to_page' => 'Aller à la page :page',
+    'results' => 'résultats',
+    'showing' => 'Affichage de',
+    'to' => 'à',
+    'of' => 'sur',
 
 ];
diff --git a/public/images/reactions/clap.svg b/public/images/reactions/clap.svg
index f05ba4fc..70c809a5 100755
--- a/public/images/reactions/clap.svg
+++ b/public/images/reactions/clap.svg
@@ -1,75 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns:svgjs="http://svgjs.com/svgjs"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512"
-	 style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#B19177;}
-	.st1{fill:#72594B;}
-	.st2{fill:#EAE9E8;}
-</style>
-<g>
-	<path class="st0" d="M388.7,264c-19.2-22.1-31.3-57.2-31.6-58.1c-6.7-17.7-14-25.3-28.8-19.8c-16.1,6-18.5,23.1-13.5,39
-		c0.1,0.4,0.6,2.3,1.5,5.1c-8.8-12-78.9-106.7-76.2-103.1c-8-10.8-23.1-14-34.4-6.8c-12.6,8-15.6,24.9-6.9,36.7
-		c-0.5-0.6-13.5-18.2-13-17.6c-8.3-11.2-24-14.2-35.4-6.2c-11.8,8.3-14.4,24.5-5.9,36c6.1,8.3,9,12.2,13.3,18
-		c-8.7-11.8-25.8-13.9-37.1-4.2c-10.2,8.7-11.5,24.1-3.6,34.9l24.6,33.3c-8.7-11.8-25.8-13.9-37.1-4.2C94.4,256,93,271.3,101,282.1
-		c12.9,17.5,107.1,144.8,121,163.7c12.7,17.1,30,28.8,49,34.5c17.9,5.4,25,19.4,27.2,21.7l0.9,1.2c7.1,9.6,20.7,11.7,30.3,4.5
-		l96.4-71.2c9.6-7.1,11.6-20.5,4.5-30.1L417.4,389l3.4-50.4c1.3-19.4-4.4-38.7-16.3-54.1C391.7,267.9,390.6,266.2,388.7,264z"/>
-	<path class="st1" d="M220.5,144.3c-6.2-8.4-6.5-19.3-1.6-27.8c-4.5,0-9.1,1.3-13.2,3.8c0,0,0,0,0,0c-0.4,0.3-0.9,0.6-1.3,0.9
-		c0,0,0,0-0.1,0c-0.4,0.3-0.8,0.6-1.2,0.9l0,0l0,0c-10.5,8.5-12.5,23.9-4.4,34.9l0,0l73.8,99.8c4,5.4,11.7,6.5,17,2.3l0,0
-		c5.6-4.4,6.6-12.4,2.4-18.1L220.5,144.3z M219.6,143.2L219.6,143.2L219.6,143.2L219.6,143.2z"/>
-	<g>
-		<path class="st1" d="M174.2,167.6c-0.3-0.4-1.6-2.1-1.8-2.4c-1.8-2.4-3.8-5.1-6.3-8.5c-6.2-8.4-6.5-19.3-1.6-27.8
-			c-4.9,0-9.9,1.5-14.2,4.5c-11.7,8.2-14.3,24.2-6.1,35.7c0.1,0.2,86.9,117.6,86.8,117.5c4.2,5.7,12.4,6.5,17.7,1.7l0,0
-			c5.3-4.8,6.1-12.9,1.8-18.7C244.3,261.3,180.4,175.9,174.2,167.6z"/>
-		<path class="st1" d="M320.8,490.5l-0.9-1.2c-2.1-2.3-9.2-16.3-27.2-21.7c-19-5.7-36.3-17.3-49-34.5
-			c-14-18.9-108.1-146.3-121-163.7c-6.2-8.4-6.8-19.6-1.8-28.3c-5.7,0.1-11.5,2.1-16.3,6.2C94.4,256,93,271.3,101,282.1
-			c12.9,17.5,107.1,144.8,121,163.7c12.7,17.1,30,28.8,49,34.5c17.9,5.4,25,19.4,27.2,21.7l0.9,1.2c7.1,9.6,20.7,11.7,30.3,4.5
-			l11.8-8.7C333.6,500.1,325.7,497.1,320.8,490.5z"/>
-		<path class="st1" d="M189.4,316c4.5,6,13.2,6.7,18.5,1.4l0,0c4.4-4.3,4.9-11.2,1.2-16.2c-1-1.4,9.8,13.4-70.4-95.8
-			c-6.2-8.4-6.8-19.6-1.8-28.3c-5.7,0.1-11.5,2.1-16.3,6.2c-10.2,8.7-11.5,24.1-3.6,34.9C149.9,262.5,155.1,269.6,189.4,316z"/>
-	</g>
-	<path class="st1" d="M316.3,230.3l13.8,18.5c3.5,4.7,10.3,5.5,14.8,1.7l0,0c4.1-3.4,5.2-9.2,2.8-13.9c-5.8-11.7-8.7-15.8-11.3-24.2
-		c-0.1-0.6-5.6-15.8,0.8-28.1c-0.4,0-0.9,0-1.1,0c-0.7,0-1.5,0.1-2.2,0.2c-0.8,0.1-1.6,0.3-2.5,0.5c-1.1,0.3-2.2,0.6-3.2,1
-		c-16.1,6.5-18.5,22.9-13.5,39C314.9,225.6,315.4,227.5,316.3,230.3L316.3,230.3L316.3,230.3z"/>
-	<path class="st0" d="M430.3,233.3c-19.2-22.1-31.3-57.2-31.6-58.1c-6.7-17.7-14-25.3-28.8-19.8c-16.1,6-18.5,23.1-13.5,39
-		c0.1,0.4,0.6,2.3,1.5,5.1c-8.8-12-78.9-106.7-76.2-103.1c-8-10.8-23.1-14-34.4-6.8c-12.6,8-15.6,24.9-6.9,36.7
-		c-0.5-0.6-13.5-18.2-13-17.6c-8.3-11.2-24-14.2-35.4-6.2c-11.8,8.3-14.4,24.5-5.9,36c6.1,8.3,9,12.2,13.3,18
-		c-8.7-11.8-25.8-13.9-37.1-4.2c-10.2,8.7-11.5,24.1-3.6,34.9l24.6,33.3c-8.7-11.8-25.8-13.9-37.1-4.2c-10.2,8.7-11.6,24.1-3.6,34.9
-		c12.9,17.5,107.1,144.8,121,163.7c12.7,17.1,30,28.8,49,34.5c17.9,5.4,25,19.4,27.2,21.7l0.9,1.2c7.1,9.6,20.7,11.7,30.3,4.5
-		l96.4-71.2c9.6-7.1,11.6-20.5,4.5-30.1L459,358.4l3.4-50.4c1.3-19.4-4.4-38.7-16.3-54.1C433.2,237.2,432.1,235.5,430.3,233.3z"/>
-	<g>
-		<path class="st1" d="M262,113.7c-6.2-8.4-6.5-19.3-1.6-27.8c-9.8,0.1-15.3,5.5-15.7,5.7l0,0c-10.5,8.5-12.5,23.9-4.4,34.9l0,0
-			l73.8,99.8c4,5.4,11.7,6.5,17,2.3l0,0c5.6-4.4,6.6-12.4,2.4-18.1L262,113.7z M261.1,112.5L261.1,112.5L261.1,112.5L261.1,112.5z"
-			/>
-		<path class="st1" d="M215.8,136.9c-0.3-0.4-1.6-2.1-1.8-2.4c-1.8-2.4-3.8-5.1-6.3-8.5c-6.2-8.4-6.5-19.3-1.6-27.8
-			c-4.9,0-9.9,1.5-14.2,4.5c-11.7,8.2-14.3,24.2-6.1,35.7l13.6,18.4l73.3,99.1c4.2,5.7,12.4,6.5,17.7,1.7l0,0
-			c5.3-4.8,6.1-12.9,1.8-18.7C285.8,230.6,222,145.2,215.8,136.9z"/>
-		<path class="st1" d="M362.3,459.8l-0.9-1.2c-2.1-2.3-9.2-16.3-27.2-21.7c-19-5.7-36.3-17.3-49-34.5
-			c-14-18.9-108.1-146.3-121-163.7c-6.2-8.4-6.8-19.6-1.8-28.3c-20.8,0.2-32.4,24.1-19.9,41.1c12.9,17.5,107.1,144.8,121,163.7
-			c12.7,17.1,30,28.8,49,34.5c17.9,5.4,25,19.4,27.2,21.7l0.9,1.2c7.1,9.6,20.7,11.7,30.3,4.5l11.8-8.7
-			C375.1,469.4,367.2,466.4,362.3,459.8z"/>
-		<path class="st1" d="M231,285.3c4.5,6,13.2,6.7,18.5,1.4l0,0c4.4-4.3,4.9-11.2,1.2-16.2c-1-1.4,9.8,13.4-70.4-95.8
-			c-6.2-8.4-6.8-19.6-1.8-28.3c-20.8,0.2-32.4,24.1-19.9,41.1C158.7,187.6,196.7,238.9,231,285.3z"/>
-	</g>
-	<g>
-		<path class="st2" d="M163.2,61.3l-27.3-41c-4.7-7-1.6-16.6,6.3-19.5l0,0c7.4-2.8,15.5,2.1,16.5,10l6.4,49.8
-			C165.2,61.6,163.8,62.2,163.2,61.3z"/>
-		<path class="st2" d="M124.3,87.1l-27.3-41c-4.7-7-14.7-7.9-20.5-1.7l0,0c-5.4,5.8-4,15.1,2.8,19l43.5,25.1
-			C123.9,89.2,125,88,124.3,87.1z"/>
-		<path class="st2" d="M99.9,121.9l-47.8-14c-7.8-2.3-15.7,3.3-16.1,11.4l0,0c-0.4,8.2,6.9,14.7,15,13.3l48.8-8.7
-			C100.9,123.8,101,122.3,99.9,121.9z"/>
-		<path class="st2" d="M315.7,61.3l27.4-41.2c4.6-6.9,1.5-16.3-6.2-19.2l0,0C329.3-1.9,321.1,3,320.1,11l-6.3,49.5
-			C313.6,61.6,315.1,62.2,315.7,61.3z"/>
-		<path class="st2" d="M354.5,87.1l28-42c4.3-6.5,13.6-7.3,18.9-1.5l0,0c5.8,6.3,4.3,16.3-3.1,20.6l-42.4,24.5
-			C354.9,89.2,353.9,88,354.5,87.1z"/>
-		<path class="st2" d="M378.9,121.9l46.8-13.7c8.3-2.4,16.7,3.5,17.2,12.2l0,0c0.4,7.7-6.5,13.7-14,12.4L379,124
-			C377.9,123.8,377.8,122.3,378.9,121.9z"/>
-	</g>
-	<path class="st1" d="M357.8,199.6l13.8,18.5c3.5,4.7,10.3,5.5,14.8,1.7l0,0c4.1-3.4,5.2-9.2,2.8-13.9l-7-13.6
-		c-1.7-3.4-3.2-7-4.3-10.6l0,0c-3.1-9.8-3.3-20.2,0.8-28c-0.4,0-1.1,0-1.9,0.1c-0.1,0-0.2,0-0.3,0c-0.3,0-0.5,0.1-0.8,0.1
-		c-0.1,0-0.2,0-0.4,0.1c-0.2,0-0.5,0.1-0.7,0.1c-0.2,0-0.3,0.1-0.5,0.1c-0.2,0-0.5,0.1-0.7,0.1c-0.2,0-0.4,0.1-0.6,0.1
-		c-0.2,0.1-0.4,0.1-0.6,0.2c-0.2,0.1-0.5,0.1-0.8,0.2c-0.2,0.1-0.3,0.1-0.5,0.1c-17,5.6-20,22.8-14.8,39.5
-		C356.5,194.9,356.9,196.8,357.8,199.6C357.8,199.6,357.8,199.6,357.8,199.6L357.8,199.6z"/>
-</g>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0" y="0" viewBox="0 0 512 512"
+     style="enable-background:new 0 0 512 512" xml:space="preserve">
+    <style>
+        .st0{fill:#b19177}
+        .st1{fill:#72594b}
+        .st2{fill:#eae9e8}
+    </style>
+    <path class="st0"
+          d="M388.7 264c-19.2-22.1-31.3-57.2-31.6-58.1-6.7-17.7-14-25.3-28.8-19.8-16.1 6-18.5 23.1-13.5 39 .1.4.6 2.3 1.5 5.1-8.8-12-78.9-106.7-76.2-103.1-8-10.8-23.1-14-34.4-6.8-12.6 8-15.6 24.9-6.9 36.7-.5-.6-13.5-18.2-13-17.6-8.3-11.2-24-14.2-35.4-6.2-11.8 8.3-14.4 24.5-5.9 36 6.1 8.3 9 12.2 13.3 18-8.7-11.8-25.8-13.9-37.1-4.2-10.2 8.7-11.5 24.1-3.6 34.9l24.6 33.3c-8.7-11.8-25.8-13.9-37.1-4.2-10.2 9-11.6 24.3-3.6 35.1 12.9 17.5 107.1 144.8 121 163.7 12.7 17.1 30 28.8 49 34.5 17.9 5.4 25 19.4 27.2 21.7l.9 1.2c7.1 9.6 20.7 11.7 30.3 4.5l96.4-71.2c9.6-7.1 11.6-20.5 4.5-30.1L417.4 389l3.4-50.4c1.3-19.4-4.4-38.7-16.3-54.1-12.8-16.6-13.9-18.3-15.8-20.5z"/>
+    <path class="st1"
+          d="M220.5 144.3c-6.2-8.4-6.5-19.3-1.6-27.8-4.5 0-9.1 1.3-13.2 3.8-.4.3-.9.6-1.3.9h-.1l-1.2.9c-10.5 8.5-12.5 23.9-4.4 34.9l73.8 99.8c4 5.4 11.7 6.5 17 2.3 5.6-4.4 6.6-12.4 2.4-18.1l-71.4-96.7zm-.9-1.1zM174.2 167.6c-.3-.4-1.6-2.1-1.8-2.4-1.8-2.4-3.8-5.1-6.3-8.5-6.2-8.4-6.5-19.3-1.6-27.8-4.9 0-9.9 1.5-14.2 4.5-11.7 8.2-14.3 24.2-6.1 35.7.1.2 86.9 117.6 86.8 117.5 4.2 5.7 12.4 6.5 17.7 1.7 5.3-4.8 6.1-12.9 1.8-18.7-6.2-8.3-70.1-93.7-76.3-102zM320.8 490.5l-.9-1.2c-2.1-2.3-9.2-16.3-27.2-21.7-19-5.7-36.3-17.3-49-34.5-14-18.9-108.1-146.3-121-163.7-6.2-8.4-6.8-19.6-1.8-28.3-5.7.1-11.5 2.1-16.3 6.2-10.2 8.7-11.6 24-3.6 34.8 12.9 17.5 107.1 144.8 121 163.7 12.7 17.1 30 28.8 49 34.5 17.9 5.4 25 19.4 27.2 21.7l.9 1.2c7.1 9.6 20.7 11.7 30.3 4.5l11.8-8.7c-7.6 1.1-15.5-1.9-20.4-8.5zM189.4 316c4.5 6 13.2 6.7 18.5 1.4 4.4-4.3 4.9-11.2 1.2-16.2-1-1.4 9.8 13.4-70.4-95.8-6.2-8.4-6.8-19.6-1.8-28.3-5.7.1-11.5 2.1-16.3 6.2-10.2 8.7-11.5 24.1-3.6 34.9 32.9 44.3 38.1 51.4 72.4 97.8zM316.3 230.3l13.8 18.5c3.5 4.7 10.3 5.5 14.8 1.7 4.1-3.4 5.2-9.2 2.8-13.9-5.8-11.7-8.7-15.8-11.3-24.2-.1-.6-5.6-15.8.8-28.1h-1.1c-.7 0-1.5.1-2.2.2-.8.1-1.6.3-2.5.5-1.1.3-2.2.6-3.2 1-16.1 6.5-18.5 22.9-13.5 39 .2.6.7 2.5 1.6 5.3z"/>
+    <path class="st0"
+          d="M430.3 233.3c-19.2-22.1-31.3-57.2-31.6-58.1-6.7-17.7-14-25.3-28.8-19.8-16.1 6-18.5 23.1-13.5 39 .1.4.6 2.3 1.5 5.1-8.8-12-78.9-106.7-76.2-103.1-8-10.8-23.1-14-34.4-6.8-12.6 8-15.6 24.9-6.9 36.7-.5-.6-13.5-18.2-13-17.6-8.3-11.2-24-14.2-35.4-6.2-11.8 8.3-14.4 24.5-5.9 36 6.1 8.3 9 12.2 13.3 18-8.7-11.8-25.8-13.9-37.1-4.2-10.2 8.7-11.5 24.1-3.6 34.9l24.6 33.3c-8.7-11.8-25.8-13.9-37.1-4.2-10.2 8.7-11.6 24.1-3.6 34.9 12.9 17.5 107.1 144.8 121 163.7 12.7 17.1 30 28.8 49 34.5 17.9 5.4 25 19.4 27.2 21.7l.9 1.2c7.1 9.6 20.7 11.7 30.3 4.5l96.4-71.2c9.6-7.1 11.6-20.5 4.5-30.1L459 358.4l3.4-50.4c1.3-19.4-4.4-38.7-16.3-54.1-12.9-16.7-14-18.4-15.8-20.6z"/>
+    <path class="st1"
+          d="M262 113.7c-6.2-8.4-6.5-19.3-1.6-27.8-9.8.1-15.3 5.5-15.7 5.7-10.5 8.5-12.5 23.9-4.4 34.9l73.8 99.8c4 5.4 11.7 6.5 17 2.3 5.6-4.4 6.6-12.4 2.4-18.1L262 113.7zm-.9-1.2zM215.8 136.9c-.3-.4-1.6-2.1-1.8-2.4-1.8-2.4-3.8-5.1-6.3-8.5-6.2-8.4-6.5-19.3-1.6-27.8-4.9 0-9.9 1.5-14.2 4.5-11.7 8.2-14.3 24.2-6.1 35.7l13.6 18.4 73.3 99.1c4.2 5.7 12.4 6.5 17.7 1.7 5.3-4.8 6.1-12.9 1.8-18.7-6.4-8.3-70.2-93.7-76.4-102zM362.3 459.8l-.9-1.2c-2.1-2.3-9.2-16.3-27.2-21.7-19-5.7-36.3-17.3-49-34.5-14-18.9-108.1-146.3-121-163.7-6.2-8.4-6.8-19.6-1.8-28.3-20.8.2-32.4 24.1-19.9 41.1 12.9 17.5 107.1 144.8 121 163.7 12.7 17.1 30 28.8 49 34.5 17.9 5.4 25 19.4 27.2 21.7l.9 1.2c7.1 9.6 20.7 11.7 30.3 4.5l11.8-8.7c-7.6 1-15.5-2-20.4-8.6zM231 285.3c4.5 6 13.2 6.7 18.5 1.4 4.4-4.3 4.9-11.2 1.2-16.2-1-1.4 9.8 13.4-70.4-95.8-6.2-8.4-6.8-19.6-1.8-28.3-20.8.2-32.4 24.1-19.9 41.1.1.1 38.1 51.4 72.4 97.8z"/>
+    <path class="st2"
+          d="m163.2 61.3-27.3-41c-4.7-7-1.6-16.6 6.3-19.5 7.4-2.8 15.5 2.1 16.5 10l6.4 49.8c.1 1-1.3 1.6-1.9.7zM124.3 87.1 97 46.1c-4.7-7-14.7-7.9-20.5-1.7-5.4 5.8-4 15.1 2.8 19l43.5 25.1c1.1.7 2.2-.5 1.5-1.4zM99.9 121.9l-47.8-14c-7.8-2.3-15.7 3.3-16.1 11.4-.4 8.2 6.9 14.7 15 13.3l48.8-8.7c1.1-.1 1.2-1.6.1-2zM315.7 61.3l27.4-41.2c4.6-6.9 1.5-16.3-6.2-19.2-7.6-2.8-15.8 2.1-16.8 10.1l-6.3 49.5c-.2 1.1 1.3 1.7 1.9.8zM354.5 87.1l28-42c4.3-6.5 13.6-7.3 18.9-1.5 5.8 6.3 4.3 16.3-3.1 20.6l-42.4 24.5c-1 .5-2-.7-1.4-1.6zM378.9 121.9l46.8-13.7c8.3-2.4 16.7 3.5 17.2 12.2.4 7.7-6.5 13.7-14 12.4L379 124c-1.1-.2-1.2-1.7-.1-2.1z"/>
+    <path class="st1"
+          d="m357.8 199.6 13.8 18.5c3.5 4.7 10.3 5.5 14.8 1.7 4.1-3.4 5.2-9.2 2.8-13.9l-7-13.6c-1.7-3.4-3.2-7-4.3-10.6-3.1-9.8-3.3-20.2.8-28-.4 0-1.1 0-1.9.1h-.3c-.3 0-.5.1-.8.1-.1 0-.2 0-.4.1-.2 0-.5.1-.7.1-.2 0-.3.1-.5.1s-.5.1-.7.1c-.2 0-.4.1-.6.1-.2.1-.4.1-.6.2-.2.1-.5.1-.8.2-.2.1-.3.1-.5.1-17 5.6-20 22.8-14.8 39.5.4.5.8 2.4 1.7 5.2z"/>
 </svg>
diff --git a/public/images/reactions/fire.svg b/public/images/reactions/fire.svg
index 4953f727..631e15a5 100755
--- a/public/images/reactions/fire.svg
+++ b/public/images/reactions/fire.svg
@@ -1,95 +1,22 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path style="fill:#ED694A;" d="M373.499,163.809c-10.67-11.649-27.258-27.372-34.315,8.13c-2.4,12.071-8.007,21.376-12.812,28.868
-	c-5.179-26.212-20.761-53.343-35.443-71.636c-5.494-6.844-24.988-34.051-28.733-79.567c-0.559-6.793-8.628-9.983-13.675-5.401
-	c-48.232,43.784-74.706,104.002-75.689,171.795c0,0-20.084-16.929-30.995-48.423c-2.938-8.481-14.308-10.099-19.241-2.6
-	c-0.947,1.44-1.825,2.882-2.617,4.282c-37.213,65.8-55.114,145.705-38.565,220.045c27.67,124.497,210.704,159.303,307.603,81.054
-	C483.822,393.8,453.686,251.311,373.499,163.809z"/>
-<g>
-	<path style="fill:#D8553A;" d="M107.171,397.118c-16.357-75.135,0.957-155.818,37.296-222.648c-0.919-2.217-1.803-4.51-2.629-6.894
-		c-2.938-8.481-14.308-10.099-19.241-2.6c-0.947,1.44-1.824,2.882-2.616,4.282c-37.213,65.8-55.114,145.705-38.565,220.045
-		c12.621,56.786,57.569,94.9,111.92,112.149C150.936,480.913,117.732,445.704,107.171,397.118z"/>
-	<path style="fill:#D8553A;" d="M198.716,214.75c2.009-61.527,24.263-116.697,64.093-159.079c-0.274-2.334-0.477-4.421-0.608-6.005
-		c-0.571-6.851-8.345-10.287-13.37-5.745c-46.585,42.118-74.979,101.727-75.998,172.075l8.719,6.771
-		c4.294,3.335,10.112,3.19,14.213,0.135C198.212,220.828,198.563,217.698,198.716,214.75z"/>
-</g>
-<path style="fill:#F4A32C;" d="M344.242,254.818c-7.88-8.604-20.133-20.218-25.345,6.005c-1.772,8.915-5.915,15.789-9.462,21.323
-	c-3.825-19.361-15.335-39.401-26.179-52.912c-4.058-5.055-18.456-25.15-21.223-58.771c-0.413-5.018-6.372-7.373-10.1-3.989
-	c-35.625,32.339-55.18,76.819-55.905,126.891c0,0-14.835-12.504-22.893-35.766c-2.17-6.264-10.569-7.459-14.212-1.92
-	c-0.699,1.063-1.348,2.129-1.933,3.163c-27.487,48.601-40.709,107.62-28.486,162.53c20.438,91.956,155.63,117.665,227.202,59.868
-	C425.73,424.695,403.471,319.45,344.242,254.818z"/>
-<path style="fill:#E89528;" d="M153.994,428.585c-10.822-53.676,0.387-111.271,24.152-159.231
-	c-1.811-3.546-3.527-7.466-5.013-11.754c-2.17-6.264-10.569-7.46-14.212-1.921c-0.699,1.063-1.348,2.129-1.933,3.164
-	c-27.486,48.601-40.707,107.62-28.486,162.529c9.506,42.768,43.837,71.196,85.041,83.567
-	C184.268,490.258,161.218,464.464,153.994,428.585z"/>
-<path style="fill:#F4D44E;" d="M317.534,337.904c-5.334-5.824-13.63-13.687-17.158,4.065c-1.199,6.036-4.004,10.688-6.406,14.434
-	c-2.59-13.107-10.38-26.672-17.722-35.818c-2.746-3.422-12.493-17.025-14.367-39.784c-0.28-3.397-4.313-4.992-6.837-2.7
-	c-24.116,21.892-37.353,52.002-37.844,85.897c0,0-10.043-8.465-15.497-24.211c-1.469-4.24-7.154-5.049-9.62-1.3
-	c-0.474,0.719-0.912,1.441-1.309,2.141c-18.606,32.9-27.557,72.852-19.283,110.023c13.835,62.249,105.352,79.652,153.801,40.527
-	c16.591-13.398,26.878-32.277,28.964-53.16C357.405,406.388,345.232,368.129,317.534,337.904z"/>
-<path style="fill:#EAE9E8;" d="M292.749,415.006c-2.972-3.245-7.593-7.625-9.559,2.264c-0.668,3.363-2.23,5.955-3.569,8.042
-	c-1.443-7.302-5.783-14.86-9.873-19.955c-1.53-1.907-6.961-9.486-8.005-22.165c-0.156-1.893-2.404-2.78-3.809-1.505
-	c-13.435,12.197-20.811,28.972-21.084,47.856c0,0-5.595-4.716-8.634-13.489c-0.819-2.363-3.986-2.814-5.359-0.724
-	c-0.264,0.401-0.508,0.803-0.728,1.193c-10.366,18.33-15.353,40.588-10.743,61.297c10.498,47.231,96.546,45.799,101.824-7.039
-	C314.962,453.16,308.18,431.844,292.749,415.006z"/>
-<path style="fill:#F7E7A1;" d="M231.364,487.194c-4.61-18.525,0.377-38.436,10.743-54.832c0.22-0.349,0.465-0.708,0.728-1.067
-	c1.374-1.869,4.541-1.466,5.359,0.647c3.039,7.848,8.634,12.067,8.634,12.067c0.225-13.88,5.253-26.48,14.488-36.586
-	c-2.065-2.86-8.383-9.756-9.574-24.229c-0.156-1.893-2.404-2.78-3.809-1.505c-13.435,12.197-20.811,28.972-21.084,47.856
-	c0,0-5.595-4.716-8.634-13.488c-0.818-2.363-3.986-2.814-5.359-0.724c-0.264,0.401-0.508,0.803-0.728,1.193
-	c-10.366,18.329-15.353,40.588-10.743,61.297c4.266,19.195,21.792,30.731,41.168,33.515
-	C242.101,506.205,234.068,498.077,231.364,487.194z"/>
-<g>
-	<path style="fill:#D8553A;" d="M184.598,68.045c21.625-17.589,21.577-50.496,0-68.045C162.973,17.588,163.02,50.496,184.598,68.045
-		z"/>
-	<path style="fill:#D8553A;" d="M443.793,209.213c21.625-17.589,21.577-50.496,0-68.045
-		C433.909,149.206,422.216,191.664,443.793,209.213z"/>
-	<path style="fill:#D8553A;" d="M60.785,222.606c15.585-12.677,15.551-36.392,0-49.041
-		C53.662,179.358,45.234,209.958,60.785,222.606z"/>
-	<path style="fill:#D8553A;" d="M330.709,117.086c15.585-12.677,15.551-36.392,0-49.041
-		C315.124,80.721,315.159,104.438,330.709,117.086z"/>
-</g>
-<path style="fill:#E89528;" d="M215.911,285.324c3.579-42.252,19.714-79.821,46.806-108.462c-0.274-2.076-0.505-4.207-0.685-6.398
-	c-0.413-5.018-6.372-7.373-10.1-3.989c-28.23,25.626-46.348,58.882-53.022,96.497l-0.01-0.003c-0.495,2.79-1.109,6.854-1.497,10.047
-	c0.001,0.003,0.002,0.005,0.004,0.008c-0.811,6.664-1.281,13.448-1.381,20.343C196.78,293.514,213.848,302.287,215.911,285.324z"/>
-<g>
-	<path style="fill:#E8C842;" d="M196.43,459.481c-7.355-34.725-1.091-71.755,13.461-103.84c-2.819-3.953-5.904-9.263-8.187-15.855
-		c-1.47-4.24-7.154-5.049-9.621-1.3c-0.473,0.719-0.913,1.441-1.309,2.141c-18.606,32.9-27.557,72.852-19.283,110.023
-		c6.48,29.152,29.997,48.468,58.148,56.749C213.253,496.521,200.858,480.42,196.43,459.481z"/>
-	<path style="fill:#E8C842;" d="M243.751,348.824c2.438-17.425,9.565-36.624,20.784-52.675c-1.222-4.532-2.183-9.653-2.652-15.348
-		c-0.28-3.397-4.314-4.992-6.837-2.7c-15.026,13.641-25.811,30.479-31.938,49.428l-0.016-0.004
-		c-0.964,2.977-2.327,7.909-3.153,11.802c0.007-0.002,0.014-0.002,0.021-0.005c-1.692,7.944-2.633,16.188-2.756,24.675
-		C230.696,365.681,241.857,362.34,243.751,348.824z"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512"
+     xml:space="preserve">
+    <path style="fill:#ed694a" d="M373.499 163.809c-10.67-11.649-27.258-27.372-34.315 8.13-2.4 12.071-8.007 21.376-12.812 28.868-5.179-26.212-20.761-53.343-35.443-71.636-5.494-6.844-24.988-34.051-28.733-79.567-.559-6.793-8.628-9.983-13.675-5.401-48.232 43.784-74.706 104.002-75.689 171.795 0 0-20.084-16.929-30.995-48.423-2.938-8.481-14.308-10.099-19.241-2.6a75.358 75.358 0 0 0-2.617 4.282c-37.213 65.8-55.114 145.705-38.565 220.045 27.67 124.497 210.704 159.303 307.603 81.054 94.805-76.556 64.669-219.045-15.518-306.547z"/>
+    <path style="fill:#d8553a"
+          d="M107.171 397.118c-16.357-75.135.957-155.818 37.296-222.648a123.957 123.957 0 0 1-2.629-6.894c-2.938-8.481-14.308-10.099-19.241-2.6a75.329 75.329 0 0 0-2.616 4.282c-37.213 65.8-55.114 145.705-38.565 220.045 12.621 56.786 57.569 94.9 111.92 112.149-42.4-20.539-75.604-55.748-86.165-104.334zM198.716 214.75c2.009-61.527 24.263-116.697 64.093-159.079a180.384 180.384 0 0 1-.608-6.005c-.571-6.851-8.345-10.287-13.37-5.745-46.585 42.118-74.979 101.727-75.998 172.075l8.719 6.771c4.294 3.335 10.112 3.19 14.213.135 2.447-2.074 2.798-5.204 2.951-8.152z"/>
+    <path style="fill:#f4a32c"
+          d="M344.242 254.818c-7.88-8.604-20.133-20.218-25.345 6.005-1.772 8.915-5.915 15.789-9.462 21.323-3.825-19.361-15.335-39.401-26.179-52.912-4.058-5.055-18.456-25.15-21.223-58.771-.413-5.018-6.372-7.373-10.1-3.989-35.625 32.339-55.18 76.819-55.905 126.891 0 0-14.835-12.504-22.893-35.766-2.17-6.264-10.569-7.459-14.212-1.92a55.755 55.755 0 0 0-1.933 3.163c-27.487 48.601-40.709 107.62-28.486 162.53 20.438 91.956 155.63 117.665 227.202 59.868 70.024-56.545 47.765-161.79-11.464-226.422z"/>
+    <path style="fill:#e89528"
+          d="M153.994 428.585c-10.822-53.676.387-111.271 24.152-159.231a92.26 92.26 0 0 1-5.013-11.754c-2.17-6.264-10.569-7.46-14.212-1.921a55.421 55.421 0 0 0-1.933 3.164c-27.486 48.601-40.707 107.62-28.486 162.529 9.506 42.768 43.837 71.196 85.041 83.567-29.275-14.681-52.325-40.475-59.549-76.354z"/>
+    <path style="fill:#f4d44e"
+          d="M317.534 337.904c-5.334-5.824-13.63-13.687-17.158 4.065-1.199 6.036-4.004 10.688-6.406 14.434-2.59-13.107-10.38-26.672-17.722-35.818-2.746-3.422-12.493-17.025-14.367-39.784-.28-3.397-4.313-4.992-6.837-2.7-24.116 21.892-37.353 52.002-37.844 85.897 0 0-10.043-8.465-15.497-24.211-1.469-4.24-7.154-5.049-9.62-1.3a37.63 37.63 0 0 0-1.309 2.141c-18.606 32.9-27.557 72.852-19.283 110.023 13.835 62.249 105.352 79.652 153.801 40.527 16.591-13.398 26.878-32.277 28.964-53.16 3.149-31.63-9.024-69.889-36.722-100.114z"/>
+    <path style="fill:#eae9e8"
+          d="M292.749 415.006c-2.972-3.245-7.593-7.625-9.559 2.264-.668 3.363-2.23 5.955-3.569 8.042-1.443-7.302-5.783-14.86-9.873-19.955-1.53-1.907-6.961-9.486-8.005-22.165-.156-1.893-2.404-2.78-3.809-1.505-13.435 12.197-20.811 28.972-21.084 47.856 0 0-5.595-4.716-8.634-13.489-.819-2.363-3.986-2.814-5.359-.724-.264.401-.508.803-.728 1.193-10.366 18.33-15.353 40.588-10.743 61.297 10.498 47.231 96.546 45.799 101.824-7.039 1.752-17.621-5.03-38.937-20.461-55.775z"/>
+    <path style="fill:#f7e7a1"
+          d="M231.364 487.194c-4.61-18.525.377-38.436 10.743-54.832.22-.349.465-.708.728-1.067 1.374-1.869 4.541-1.466 5.359.647 3.039 7.848 8.634 12.067 8.634 12.067.225-13.88 5.253-26.48 14.488-36.586-2.065-2.86-8.383-9.756-9.574-24.229-.156-1.893-2.404-2.78-3.809-1.505-13.435 12.197-20.811 28.972-21.084 47.856 0 0-5.595-4.716-8.634-13.488-.818-2.363-3.986-2.814-5.359-.724-.264.401-.508.803-.728 1.193-10.366 18.329-15.353 40.588-10.743 61.297 4.266 19.195 21.792 30.731 41.168 33.515-10.452-5.133-18.485-13.261-21.189-24.144z"/>
+    <path style="fill:#d8553a"
+          d="M184.598 68.045c21.625-17.589 21.577-50.496 0-68.045-21.625 17.588-21.578 50.496 0 68.045zM443.793 209.213c21.625-17.589 21.577-50.496 0-68.045-9.884 8.038-21.577 50.496 0 68.045zM60.785 222.606c15.585-12.677 15.551-36.392 0-49.041-7.123 5.793-15.551 36.393 0 49.041zM330.709 117.086c15.585-12.677 15.551-36.392 0-49.041-15.585 12.676-15.55 36.393 0 49.041z"/>
+    <path style="fill:#e89528"
+          d="M215.911 285.324c3.579-42.252 19.714-79.821 46.806-108.462a130.56 130.56 0 0 1-.685-6.398c-.413-5.018-6.372-7.373-10.1-3.989-28.23 25.626-46.348 58.882-53.022 96.497l-.01-.003a208.034 208.034 0 0 0-1.497 10.047.03.03 0 0 0 .004.008 191.271 191.271 0 0 0-1.381 20.343c.754.147 17.822 8.92 19.885-8.043z"/>
+    <path style="fill:#e8c842"
+          d="M196.43 459.481c-7.355-34.725-1.091-71.755 13.461-103.84a62.744 62.744 0 0 1-8.187-15.855c-1.47-4.24-7.154-5.049-9.621-1.3a37.63 37.63 0 0 0-1.309 2.141c-18.606 32.9-27.557 72.852-19.283 110.023 6.48 29.152 29.997 48.468 58.148 56.749-16.386-10.878-28.781-26.979-33.209-47.918zM243.751 348.824c2.438-17.425 9.565-36.624 20.784-52.675-1.222-4.532-2.183-9.653-2.652-15.348-.28-3.397-4.314-4.992-6.837-2.7-15.026 13.641-25.811 30.479-31.938 49.428l-.016-.004c-.964 2.977-2.327 7.909-3.153 11.802.007-.002.014-.002.021-.005a127.163 127.163 0 0 0-2.756 24.675c13.492 1.684 24.653-1.657 26.547-15.173z"/>
 </svg>
diff --git a/public/images/reactions/handshake.svg b/public/images/reactions/handshake.svg
index 0d6c4d89..5e3225f9 100755
--- a/public/images/reactions/handshake.svg
+++ b/public/images/reactions/handshake.svg
@@ -1,65 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#B19177;}
-	.st1{fill:#72594B;}
-	.st2{fill:#F9C295;}
-	.st3{fill:#E59F6A;}
-	.st4{fill:#5C9CEE;}
-	.st5{fill:#3580D3;}
-	.st6{fill:#ED5575;}
-	.st7{fill:#CC3A60;}
-	.st8{fill:#EBEEF2;}
-</style>
-<path class="st0" d="M418.3,249.1l-13-105.7l-24.4,3l0,0l-47.2-26.6c-5-2.8-10.8-4.1-16.6-3.5l-74.6,6.9c-9.2,0.8-17.4,6.1-22,14
-	l-52.6,90.5c-3.9,6.7-0.8,15.3,6.4,18l2.2,0.8c4.1,1.6,8.4,2.5,12.6,2.8l-6.7,5.8l-13.3,11.6l-37.9,32.3c-6.7,5.9-7.4,16.1-1.6,22.9
-	l3.8,4.4c7.6,8.7,20.7,9.6,29.4,2l14.5,16.6c4.7,5.4,11.6,7.8,18.2,7c4-0.5,7.9-2.1,11.1-5l14.5,16.6c4.7,5.4,11.6,7.8,18.3,7
-	c4-0.5,7.9-2.1,11.1-5l7.9,6.8c7.6,8.7,20.7,9.6,29.4,2l10.7-9.3l89.9-70l0.1-0.1l35.5,0L418.3,249.1z"/>
-<path class="st1" d="M379.7,267.8L379.7,267.8l-90,70.1l-10.7,9.3c-8.7,7.6-21.8,6.7-29.4-2l-7.9-6.8c-3.2,2.8-7.1,4.5-11.1,5
-	c-6.6,0.8-13.5-1.6-18.3-7l-14.5-16.6c-3.2,2.8-7.1,4.5-11.1,5c-6.6,0.8-13.5-1.6-18.2-7l-14.5-16.6c-7.4,6.5-18.1,6.7-25.8,1.2
-	c-3.9,5.9-3.6,14,1.3,19.6l3.8,4.4c7.6,8.7,20.7,9.6,29.4,2l14.5,16.6c4.7,5.4,11.6,7.8,18.2,7c4-0.5,7.9-2.1,11.1-5l14.5,16.6
-	c4.7,5.4,11.6,7.8,18.3,7c4-0.5,7.9-2.1,11.1-5l7.9,6.8c7.6,8.7,20.7,9.6,29.4,2l10.7-9.3l89.9-70l0.1-0.1l35.5,0l-3.9-31.9
-	L379.7,267.8z"/>
-<path class="st2" d="M396.1,313.5L347.9,272l-13.4-11.5l-9.6-8.3l-41.2-35.5l4.8-40.5c1.6-13.7-7-26.5-20.3-30.2l-89.8-24.9
-	c-9.5-2.6-19.5,1.8-24,10.6L143,153.7l-48.5-3.3L82.1,256.2l-5.4,45.9l47.2,3.1l0.1,0.1l98.6,85l10.7,9.3c8.7,7.5,21.9,6.5,29.4-2.2
-	l14.4-16.7c3.3,2.8,7.2,4.4,11.1,4.9c6.6,0.8,13.5-1.6,18.2-7.1l14.4-16.7c3.3,2.8,7.2,4.5,11.1,4.9c6.6,0.8,13.5-1.7,18.2-7.1
-	l14.4-16.7c8.7,7.5,21.9,6.5,29.4-2.2l3.8-4.4C403.6,329.6,402.9,319.4,396.1,313.5z"/>
-<g>
-	<path class="st3" d="M396.1,313.5l-14.7-12.6c4.8,6.3,4.7,15.3-0.7,21.6l-4.1,4.7c-8,9.2-21.9,10.3-31.2,2.3l-15.3,17.7
-		c-5,5.8-12.3,8.4-19.3,7.5c-4.2-0.5-8.4-2.2-11.8-5.2l-15.3,17.7c-5,5.8-12.3,8.3-19.3,7.5c-4.2-0.5-8.4-2.2-11.8-5.2l-15.3,17.7
-		c-2.9,3.3-6.5,5.6-10.5,6.8l6.5,5.6c8.7,7.5,21.9,6.5,29.4-2.2l14.4-16.7c3.3,2.8,7.2,4.4,11.1,4.9c6.6,0.8,13.5-1.6,18.2-7.1
-		l14.4-16.7c3.3,2.8,7.2,4.5,11.1,4.9c6.6,0.8,13.5-1.7,18.2-7.1l14.4-16.7c8.7,7.5,21.9,6.5,29.4-2.2l3.8-4.4
-		C403.6,329.6,402.9,319.4,396.1,313.5z"/>
-	<path class="st3" d="M369.5,337.4l-26.4-22.8c-3.1-2.7-7.9-2.4-10.6,0.8c-2.7,3.1-2.4,7.9,0.8,10.6l26.3,22.7l5-5.8
-		c2,1.7,4.2,3,6.5,3.8C372.9,343.7,372.2,339.8,369.5,337.4z"/>
-	<path class="st3" d="M327.3,365.6c1.8-3.1,1.2-7.1-1.6-9.5L302,335.7c-3.1-2.7-7.9-2.4-10.6,0.8c-2.7,3.1-2.4,7.9,0.8,10.6
-		l23.7,20.4c0,0,0,0,0,0l4.9-5.7C322.8,363.5,325,364.8,327.3,365.6z"/>
-</g>
-<g>
-	<path class="st0" d="M126.4,305.1l-5.7,7.5c-6.2,8.2-4.6,19.9,3.6,26.1l0,0c8.2,6.2,19.9,4.6,26.1-3.6l5.7-7.5
-		c6.2-8.2,4.6-19.9-3.6-26.1l0,0C144.3,295.3,132.6,296.9,126.4,305.1z"/>
-	<path class="st0" d="M161.2,321l-10.8,14.2c-6.2,8.2-4.6,19.9,3.6,26.1l0,0c8.2,6.2,19.9,4.6,26.1-3.6l10.8-14.2
-		c6.2-8.2,4.6-19.9-3.6-26.1l0,0C179.1,311.2,167.4,312.8,161.2,321z"/>
-	<path class="st0" d="M194.8,338.4l-14.7,19.4c-6.2,8.2-4.6,19.9,3.6,26.1l0,0c8.2,6.2,19.9,4.6,26.1-3.6l14.7-19.4
-		c6.2-8.2,4.6-19.9-3.6-26.1l0,0C212.8,328.5,201.1,330.2,194.8,338.4z"/>
-	<path class="st0" d="M225.4,359.8l-15.5,20.5c-6.2,8.2-4.6,19.9,3.6,26.1l0,0c8.2,6.2,19.9,4.6,26.1-3.6l15.5-20.5
-		c6.2-8.2,4.6-19.9-3.6-26.1l0,0C243.4,350,231.7,351.6,225.4,359.8z"/>
-	<path class="st0" d="M380.9,146.4l-47.2-26.6c-5-2.8-10.8-4.1-16.6-3.5l-74.6,6.9c-9.2,0.8-17.4,6.1-22,14l-52.6,90.5
-		c-3.9,6.7-0.8,15.3,6.4,18l2.2,0.8c19.3,7.3,41,1.1,53.6-15.3l20.1-26.2c0,0,48.4,56.1,101.7-9.4"/>
-</g>
-<path class="st4" d="M511.9,309.1l-24.7-200.8c-0.2-2-1.3-3.8-2.8-5c-1.6-1.2-3.6-1.8-5.5-1.5l-57.8,7.1
-	c-15,1.8-25.7,15.6-23.9,30.6l19.8,161.2c1.7,13.9,13.6,24.1,27.2,24.1c1.1,0,2.2-0.1,3.4-0.2l57.8-7.1
-	C509.5,317,512.5,313.3,511.9,309.1z"/>
-<path class="st5" d="M511.9,309.1l-2.7-22c-1.2,1.8-3.2,3.1-5.5,3.4l-60.6,7.5c-1.2,0.1-2.4,0.2-3.5,0.2c-10.2,0-19.4-5.4-24.6-13.8
-	l2,16.4c1.7,13.9,13.6,24.1,27.2,24.1c1.1,0,2.2-0.1,3.4-0.2l57.8-7.1C509.5,317,512.5,313.3,511.9,309.1z"/>
-<path class="st6" d="M90.9,109l-57.8-7.1c-2-0.2-4,0.3-5.5,1.5c-1.6,1.2-2.6,3-2.8,5L0.1,309.1c-0.5,4.1,2.4,7.9,6.5,8.4l57.8,7.1
-	c1.1,0.1,2.3,0.2,3.4,0.2c13.6,0,25.5-10.2,27.2-24.1l19.8-161.2C116.6,124.5,105.9,110.8,90.9,109z"/>
-<path class="st7" d="M0.1,309.1l2.7-22c1.2,1.8,3.2,3.1,5.5,3.4l60.6,7.5c1.2,0.1,2.4,0.2,3.5,0.2c10.2,0,19.4-5.4,24.6-13.8
-	l-2,16.4c-1.7,13.9-13.6,24.1-27.2,24.1c-1.1,0-2.2-0.1-3.4-0.2l-57.8-7.1C2.5,317-0.4,313.3,0.1,309.1z"/>
-<g>
-	<circle class="st8" cx="464" cy="277" r="14.5"/>
-	<circle class="st8" cx="47.2" cy="277" r="14.5"/>
-</g>
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0" y="0" viewBox="0 0 512 512"
+     style="enable-background:new 0 0 512 512" xml:space="preserve">
+    <style>
+        .st0{fill:#b19177}
+        .st3{fill:#e59f6a}
+        .st8{fill:#ebeef2}
+    </style>
+    <path class="st0"
+          d="m418.3 249.1-13-105.7-24.4 3-47.2-26.6c-5-2.8-10.8-4.1-16.6-3.5l-74.6 6.9c-9.2.8-17.4 6.1-22 14l-52.6 90.5c-3.9 6.7-.8 15.3 6.4 18l2.2.8c4.1 1.6 8.4 2.5 12.6 2.8l-6.7 5.8-13.3 11.6-37.9 32.3c-6.7 5.9-7.4 16.1-1.6 22.9l3.8 4.4c7.6 8.7 20.7 9.6 29.4 2l14.5 16.6c4.7 5.4 11.6 7.8 18.2 7 4-.5 7.9-2.1 11.1-5l14.5 16.6c4.7 5.4 11.6 7.8 18.3 7 4-.5 7.9-2.1 11.1-5l7.9 6.8c7.6 8.7 20.7 9.6 29.4 2l10.7-9.3 89.9-70 .1-.1H424l-5.7-45.8z"/>
+    <path
+        d="m379.7 267.8-90 70.1-10.7 9.3c-8.7 7.6-21.8 6.7-29.4-2l-7.9-6.8c-3.2 2.8-7.1 4.5-11.1 5-6.6.8-13.5-1.6-18.3-7l-14.5-16.6c-3.2 2.8-7.1 4.5-11.1 5-6.6.8-13.5-1.6-18.2-7L154 301.2c-7.4 6.5-18.1 6.7-25.8 1.2-3.9 5.9-3.6 14 1.3 19.6l3.8 4.4c7.6 8.7 20.7 9.6 29.4 2l14.5 16.6c4.7 5.4 11.6 7.8 18.2 7 4-.5 7.9-2.1 11.1-5l14.5 16.6c4.7 5.4 11.6 7.8 18.3 7 4-.5 7.9-2.1 11.1-5l7.9 6.8c7.6 8.7 20.7 9.6 29.4 2l10.7-9.3 89.9-70 .1-.1h35.5l-3.9-31.9-40.3 4.7z"
+        style="fill:#72594b"/>
+    <path
+        d="M396.1 313.5 347.9 272l-13.4-11.5-9.6-8.3-41.2-35.5 4.8-40.5c1.6-13.7-7-26.5-20.3-30.2l-89.8-24.9c-9.5-2.6-19.5 1.8-24 10.6l-11.4 22-48.5-3.3-12.4 105.8-5.4 45.9 47.2 3.1.1.1 98.6 85 10.7 9.3c8.7 7.5 21.9 6.5 29.4-2.2l14.4-16.7c3.3 2.8 7.2 4.4 11.1 4.9 6.6.8 13.5-1.6 18.2-7.1l14.4-16.7c3.3 2.8 7.2 4.5 11.1 4.9 6.6.8 13.5-1.7 18.2-7.1l14.4-16.7c8.7 7.5 21.9 6.5 29.4-2.2l3.8-4.4c5.9-6.7 5.2-16.9-1.6-22.8z"
+        style="fill:#f9c295"/>
+    <path class="st3"
+          d="m396.1 313.5-14.7-12.6c4.8 6.3 4.7 15.3-.7 21.6l-4.1 4.7c-8 9.2-21.9 10.3-31.2 2.3l-15.3 17.7c-5 5.8-12.3 8.4-19.3 7.5-4.2-.5-8.4-2.2-11.8-5.2l-15.3 17.7c-5 5.8-12.3 8.3-19.3 7.5-4.2-.5-8.4-2.2-11.8-5.2l-15.3 17.7c-2.9 3.3-6.5 5.6-10.5 6.8l6.5 5.6c8.7 7.5 21.9 6.5 29.4-2.2l14.4-16.7c3.3 2.8 7.2 4.4 11.1 4.9 6.6.8 13.5-1.6 18.2-7.1l14.4-16.7c3.3 2.8 7.2 4.5 11.1 4.9 6.6.8 13.5-1.7 18.2-7.1l14.4-16.7c8.7 7.5 21.9 6.5 29.4-2.2l3.8-4.4c5.9-6.7 5.2-16.9-1.6-22.8z"/>
+    <path class="st3"
+          d="m369.5 337.4-26.4-22.8c-3.1-2.7-7.9-2.4-10.6.8-2.7 3.1-2.4 7.9.8 10.6l26.3 22.7 5-5.8c2 1.7 4.2 3 6.5 3.8 1.8-3 1.1-6.9-1.6-9.3zM327.3 365.6c1.8-3.1 1.2-7.1-1.6-9.5L302 335.7c-3.1-2.7-7.9-2.4-10.6.8-2.7 3.1-2.4 7.9.8 10.6l23.7 20.4 4.9-5.7c2 1.7 4.2 3 6.5 3.8z"/>
+    <path class="st0"
+          d="m126.4 305.1-5.7 7.5c-6.2 8.2-4.6 19.9 3.6 26.1 8.2 6.2 19.9 4.6 26.1-3.6l5.7-7.5c6.2-8.2 4.6-19.9-3.6-26.1-8.2-6.2-19.9-4.6-26.1 3.6zM161.2 321l-10.8 14.2c-6.2 8.2-4.6 19.9 3.6 26.1 8.2 6.2 19.9 4.6 26.1-3.6l10.8-14.2c6.2-8.2 4.6-19.9-3.6-26.1-8.2-6.2-19.9-4.6-26.1 3.6zM194.8 338.4l-14.7 19.4c-6.2 8.2-4.6 19.9 3.6 26.1 8.2 6.2 19.9 4.6 26.1-3.6l14.7-19.4c6.2-8.2 4.6-19.9-3.6-26.1-8.1-6.3-19.8-4.6-26.1 3.6zM225.4 359.8l-15.5 20.5c-6.2 8.2-4.6 19.9 3.6 26.1 8.2 6.2 19.9 4.6 26.1-3.6l15.5-20.5c6.2-8.2 4.6-19.9-3.6-26.1-8.1-6.2-19.8-4.6-26.1 3.6zM380.9 146.4l-47.2-26.6c-5-2.8-10.8-4.1-16.6-3.5l-74.6 6.9c-9.2.8-17.4 6.1-22 14l-52.6 90.5c-3.9 6.7-.8 15.3 6.4 18l2.2.8c19.3 7.3 41 1.1 53.6-15.3l20.1-26.2s48.4 56.1 101.7-9.4"/>
+    <path
+        d="m511.9 309.1-24.7-200.8c-.2-2-1.3-3.8-2.8-5-1.6-1.2-3.6-1.8-5.5-1.5l-57.8 7.1c-15 1.8-25.7 15.6-23.9 30.6L417 300.7c1.7 13.9 13.6 24.1 27.2 24.1 1.1 0 2.2-.1 3.4-.2l57.8-7.1c4.1-.5 7.1-4.2 6.5-8.4z"
+        style="fill:#5c9cee"/>
+    <path
+        d="m511.9 309.1-2.7-22c-1.2 1.8-3.2 3.1-5.5 3.4l-60.6 7.5c-1.2.1-2.4.2-3.5.2-10.2 0-19.4-5.4-24.6-13.8l2 16.4c1.7 13.9 13.6 24.1 27.2 24.1 1.1 0 2.2-.1 3.4-.2l57.8-7.1c4.1-.6 7.1-4.3 6.5-8.5z"
+        style="fill:#3580d3"/>
+    <path
+        d="m90.9 109-57.8-7.1c-2-.2-4 .3-5.5 1.5-1.6 1.2-2.6 3-2.8 5L.1 309.1c-.5 4.1 2.4 7.9 6.5 8.4l57.8 7.1c1.1.1 2.3.2 3.4.2 13.6 0 25.5-10.2 27.2-24.1l19.8-161.2c1.8-15-8.9-28.7-23.9-30.5z"
+        style="fill:#ed5575"/>
+    <path
+        d="m.1 309.1 2.7-22c1.2 1.8 3.2 3.1 5.5 3.4l60.6 7.5c1.2.1 2.4.2 3.5.2 10.2 0 19.4-5.4 24.6-13.8l-2 16.4c-1.7 13.9-13.6 24.1-27.2 24.1-1.1 0-2.2-.1-3.4-.2l-57.8-7.1c-4.1-.6-7-4.3-6.5-8.5z"
+        style="fill:#cc3a60"/>
+    <circle class="st8" cx="464" cy="277" r="14.5"/>
+    <circle class="st8" cx="47.2" cy="277" r="14.5"/>
 </svg>
diff --git a/public/images/reactions/joy.svg b/public/images/reactions/joy.svg
index d1907b3b..e8d767c5 100755
--- a/public/images/reactions/joy.svg
+++ b/public/images/reactions/joy.svg
@@ -1,63 +1,16 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512.003 512.003" style="enable-background:new 0 0 512.003 512.003;" xml:space="preserve">
-<circle style="fill:#FDDF6D;" cx="256.001" cy="256.001" r="256.001"/>
-<path style="fill:#FCC56B;" d="M310.859,474.208c-141.385,0-256-114.615-256-256c0-75.537,32.722-143.422,84.757-190.281
-	C56.738,70.303,0,156.525,0,256c0,141.385,114.615,256,256,256c65.849,0,125.883-24.87,171.243-65.718
-	C392.325,464.135,352.77,474.208,310.859,474.208z"/>
-<g>
-	<path style="fill:#7F184C;" d="M422.988,229.321c-3.656,0.001-7.203-1.927-9.108-5.349c-6.682-11.995-19.35-19.446-33.064-19.446
-		c-13.374,0-26.214,7.561-33.512,19.733c-2.958,4.932-9.355,6.533-14.287,3.577c-4.934-2.958-6.535-9.354-3.577-14.287
-		c11.039-18.414,30.725-29.852,51.377-29.852c21.264,0,40.905,11.548,51.26,30.139c2.799,5.024,0.994,11.367-4.03,14.165
-		C426.443,228.896,424.703,229.321,422.988,229.321z"/>
-	<path style="fill:#7F184C;" d="M245.315,229.321c-3.656,0.001-7.203-1.927-9.108-5.349c-6.682-11.995-19.35-19.446-33.064-19.446
-		c-13.372,0-26.214,7.561-33.512,19.733c-2.956,4.932-9.352,6.533-14.287,3.577c-4.932-2.958-6.535-9.355-3.576-14.287
-		c11.039-18.414,30.725-29.852,51.377-29.852c21.264,0,40.905,11.548,51.26,30.139c2.799,5.024,0.994,11.367-4.03,14.165
-		C248.77,228.896,247.03,229.321,245.315,229.321z"/>
-	<path style="fill:#7F184C;" d="M294.45,445.098L294.45,445.098c-73.869,0-133.751-59.882-133.751-133.751l0,0h267.5l0,0
-		C428.2,385.216,368.318,445.098,294.45,445.098z"/>
-</g>
-<path style="fill:#F2F2F2;" d="M193.334,311.347v20.878c0,8.804,7.136,15.94,15.94,15.94h170.353c8.802,0,15.94-7.136,15.94-15.94
-	v-20.878H193.334z"/>
-<path style="fill:#FC4C59;" d="M297.258,389.609c-36.153-16.796-76.276-14.357-108.808,3.065
-	c24.448,31.863,62.891,52.424,106.157,52.424l0,0c19.065,0,37.185-4.016,53.598-11.205
-	C336.162,415.261,318.895,399.663,297.258,389.609z"/>
-<g>
-	<path style="fill:#3FA9F5;" d="M146.23,338.778c-15.627,17.091-42.149,18.279-59.242,2.652s-18.279-42.149-2.652-59.242
-		c15.627-17.092,87.325-33.368,87.325-33.368S161.857,321.688,146.23,338.778z"/>
-	<path style="fill:#3FA9F5;" d="M434.029,329.436c15.627,17.091,42.149,18.279,59.242,2.652
-		c17.091-15.627,18.279-42.149,2.652-59.242c-15.627-17.091-87.325-33.368-87.325-33.368S418.403,312.344,434.029,329.436z"/>
-</g>
-<ellipse transform="matrix(0.2723 -0.9622 0.9622 0.2723 134.7066 334.6929)" style="fill:#FCEB88;" cx="288.63" cy="78.287" rx="29.854" ry="53.46"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512.003 512.003" style="enable-background:new 0 0 512.003 512.003"
+     xml:space="preserve">
+    <circle style="fill:#fddf6d" cx="256.001" cy="256.001" r="256.001"/>
+    <path style="fill:#fcc56b"
+          d="M310.859 474.208c-141.385 0-256-114.615-256-256 0-75.537 32.722-143.422 84.757-190.281C56.738 70.303 0 156.525 0 256c0 141.385 114.615 256 256 256 65.849 0 125.883-24.87 171.243-65.718-34.918 17.853-74.473 27.926-116.384 27.926z"/>
+    <path style="fill:#7f184c"
+          d="M422.988 229.321a10.406 10.406 0 0 1-9.108-5.349c-6.682-11.995-19.35-19.446-33.064-19.446-13.374 0-26.214 7.561-33.512 19.733-2.958 4.932-9.355 6.533-14.287 3.577-4.934-2.958-6.535-9.354-3.577-14.287 11.039-18.414 30.725-29.852 51.377-29.852 21.264 0 40.905 11.548 51.26 30.139 2.799 5.024.994 11.367-4.03 14.165a10.357 10.357 0 0 1-5.059 1.32zM245.315 229.321a10.406 10.406 0 0 1-9.108-5.349c-6.682-11.995-19.35-19.446-33.064-19.446-13.372 0-26.214 7.561-33.512 19.733-2.956 4.932-9.352 6.533-14.287 3.577-4.932-2.958-6.535-9.355-3.576-14.287 11.039-18.414 30.725-29.852 51.377-29.852 21.264 0 40.905 11.548 51.26 30.139 2.799 5.024.994 11.367-4.03 14.165a10.363 10.363 0 0 1-5.06 1.32zM294.45 445.098c-73.869 0-133.751-59.882-133.751-133.751h267.5c.001 73.869-59.881 133.751-133.749 133.751z"/>
+    <path style="fill:#f2f2f2"
+          d="M193.334 311.347v20.878c0 8.804 7.136 15.94 15.94 15.94h170.353c8.802 0 15.94-7.136 15.94-15.94v-20.878H193.334z"/>
+    <path style="fill:#fc4c59"
+          d="M297.258 389.609c-36.153-16.796-76.276-14.357-108.808 3.065 24.448 31.863 62.891 52.424 106.157 52.424 19.065 0 37.185-4.016 53.598-11.205-12.043-18.632-29.31-34.23-50.947-44.284z"/>
+    <path style="fill:#3fa9f5"
+          d="M146.23 338.778c-15.627 17.091-42.149 18.279-59.242 2.652s-18.279-42.149-2.652-59.242c15.627-17.092 87.325-33.368 87.325-33.368s-9.804 72.868-25.431 89.958zM434.029 329.436c15.627 17.091 42.149 18.279 59.242 2.652 17.091-15.627 18.279-42.149 2.652-59.242-15.627-17.091-87.325-33.368-87.325-33.368s9.805 72.866 25.431 89.958z"/>
+    <ellipse transform="rotate(-74.199 288.632 78.29)" style="fill:#fceb88" cx="288.63" cy="78.287" rx="29.854"
+             ry="53.46"/>
 </svg>
diff --git a/public/images/reactions/love.svg b/public/images/reactions/love.svg
index ae72aea5..6dd0705f 100755
--- a/public/images/reactions/love.svg
+++ b/public/images/reactions/love.svg
@@ -1,52 +1,12 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 511.999 511.999" style="enable-background:new 0 0 511.999 511.999;" xml:space="preserve">
-<path style="fill:#EC5569;" d="M412.41,0H99.589C47.531,0,5.332,42.201,5.332,94.257v205.172c0,52.057,42.201,94.257,94.257,94.257
-	h44.894c2.136,0,3.867,1.731,3.867,3.867v101.207c0,11.966,14.637,17.768,22.834,9.05l106.188-112.906
-	c0.731-0.778,1.751-1.218,2.818-1.218h132.22c52.057,0,94.257-42.201,94.257-94.257V94.257C506.667,42.201,464.466,0,412.41,0z"/>
-<path style="fill:#E63950;" d="M188.005,358.509c0-2.249-1.676-4.072-3.744-4.072h-43.462c-50.396,0-91.25-44.439-91.25-99.257
-	V39.123c0-9.276,1.174-18.253,3.361-26.77C24.489,28.587,5.332,59.184,5.332,94.257v205.172c0,52.056,42.201,94.257,94.257,94.257
-	h44.894c2.136,0,3.867,1.732,3.867,3.867v101.207c0,11.966,14.637,17.768,22.834,9.05l16.82-17.885V358.509H188.005z"/>
-<path style="fill:#EC5569;" d="M361.908,122.325L361.908,122.325c-23.931-23.931-62.731-23.931-86.663,0l-13.518,13.518
-	c-3.223,3.223-8.45,3.223-11.673,0l-13.302-13.302c-23.931-23.931-62.731-23.931-86.663,0l0,0
-	c-23.931,23.931-23.931,62.731,0,86.663l99.973,99.973c3.223,3.223,8.45,3.223,11.673,0l100.172-100.189
-	C385.839,185.056,385.839,146.257,361.908,122.325z"/>
-<path style="fill:#FFF5F5;" d="M361.908,122.325L361.908,122.325c-23.931-23.931-62.731-23.931-86.663,0l-13.518,13.518
-	c-3.223,3.223-8.45,3.223-11.673,0l-13.302-13.302c-23.931-23.931-62.731-23.931-86.663,0l0,0
-	c-23.931,23.931-23.931,62.731,0,86.663l99.973,99.973c3.223,3.223,8.45,3.223,11.673,0l100.172-100.189
-	C385.839,185.056,385.839,146.257,361.908,122.325z"/>
-<path style="fill:#DCE6EB;" d="M182.145,209.204c-23.931-23.931-23.931-62.731,0-86.663l0,0c7.85-7.85,17.304-13.108,27.303-15.807
-	c-20.486-5.532-43.278-0.274-59.358,15.807l0,0c-23.931,23.931-23.931,62.731,0,86.663l99.973,99.973
-	c3.223,3.223,8.45,3.223,11.673,0l10.19-10.192L182.145,209.204z"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 511.999 511.999" style="enable-background:new 0 0 511.999 511.999"
+     xml:space="preserve">
+    <path style="fill:#ec5569" d="M412.41 0H99.589C47.531 0 5.332 42.201 5.332 94.257v205.172c0 52.057 42.201 94.257 94.257 94.257h44.894a3.867 3.867 0 0 1 3.867 3.867V498.76c0 11.966 14.637 17.768 22.834 9.05l106.188-112.906a3.866 3.866 0 0 1 2.818-1.218h132.22c52.057 0 94.257-42.201 94.257-94.257V94.257C506.667 42.201 464.466 0 412.41 0z"/>
+    <path style="fill:#e63950"
+          d="M188.005 358.509c0-2.249-1.676-4.072-3.744-4.072h-43.462c-50.396 0-91.25-44.439-91.25-99.257V39.123c0-9.276 1.174-18.253 3.361-26.77C24.489 28.587 5.332 59.184 5.332 94.257v205.172c0 52.056 42.201 94.257 94.257 94.257h44.894a3.867 3.867 0 0 1 3.867 3.867V498.76c0 11.966 14.637 17.768 22.834 9.05l16.82-17.885V358.509h.001z"/>
+    <path style="fill:#ec5569"
+          d="M361.908 122.325c-23.931-23.931-62.731-23.931-86.663 0l-13.518 13.518a8.255 8.255 0 0 1-11.673 0l-13.302-13.302c-23.931-23.931-62.731-23.931-86.663 0-23.931 23.931-23.931 62.731 0 86.663l99.973 99.973a8.255 8.255 0 0 0 11.673 0l100.172-100.189c23.932-23.932 23.932-62.731.001-86.663z"/>
+    <path style="fill:#fff5f5"
+          d="M361.908 122.325c-23.931-23.931-62.731-23.931-86.663 0l-13.518 13.518a8.255 8.255 0 0 1-11.673 0l-13.302-13.302c-23.931-23.931-62.731-23.931-86.663 0-23.931 23.931-23.931 62.731 0 86.663l99.973 99.973a8.255 8.255 0 0 0 11.673 0l100.172-100.189c23.932-23.932 23.932-62.731.001-86.663z"/>
+    <path style="fill:#dce6eb"
+          d="M182.145 209.204c-23.931-23.931-23.931-62.731 0-86.663a60.966 60.966 0 0 1 27.303-15.807c-20.486-5.532-43.278-.274-59.358 15.807-23.931 23.931-23.931 62.731 0 86.663l99.973 99.973a8.255 8.255 0 0 0 11.673 0l10.19-10.192-89.781-89.781z"/>
 </svg>
diff --git a/public/images/reactions/money.svg b/public/images/reactions/money.svg
index 087e480c..8f8c79aa 100755
--- a/public/images/reactions/money.svg
+++ b/public/images/reactions/money.svg
@@ -1,98 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFD064;}
-	.st1{fill:#EABC6B;}
-	.st2{fill:#E8AE4D;}
-	.st3{fill:#FFE07D;}
-	.st4{fill:#FFDDCE;}
-	.st5{fill:#B19177;}
-	.st6{fill:#8C715D;}
-	.st7{fill:#F5DBCC;}
-	.st8{fill:#407093;}
-	.st9{fill:#FFFFFF;}
-	.st10{font-family:'SFRounded-Ultralight';}
-	.st11{font-size:110px;}
-</style>
-<g>
-	<g>
-		<g>
-			<g>
-				<g>
-					<path class="st0" d="M230.1,94.2c-2.4,0-4.7-1.1-6.2-3.1c-7-9.5-19.5-20.5-39.2-18.4c-23.2,2.5-40.4-4.9-50.7-11.5
-						c-3.6-2.3-4.6-7.1-2.3-10.7c2.3-3.6,7.1-4.6,10.7-2.3c8.3,5.3,22.1,11.2,40.8,9.2c28.4-3,45.6,14.1,53.3,24.6
-						c2.5,3.4,1.8,8.3-1.6,10.8C233.3,93.7,231.7,94.2,230.1,94.2L230.1,94.2z"/>
-				</g>
-				<g>
-					<path class="st0" d="M149.2,135.2c-1.4,0-2.8-0.4-4-1.1c-3.6-2.2-4.8-7-2.5-10.6c9.9-16.1,28.1-27.2,52.5-32.1
-						c17.8-3.5,32.8-2.6,33.4-2.5c4.3,0.3,7.5,4,7.2,8.2c-0.3,4.3-4,7.4-8.2,7.2c-0.5,0-53-3.1-71.7,27.3
-						C154.3,133.9,151.8,135.2,149.2,135.2L149.2,135.2z"/>
-				</g>
-			</g>
-			<g>
-				<g>
-					<path class="st1" d="M265.7,431.3c126.9,0,197-186.1-3.3-329.9c-5-3.6-7.9-9.3-7.9-15.5c0.1-5.1,1.7-10,4.6-14.1
-						c9.4-13.4,22.9-36.3,31-54.8c1.9-4.4-0.8-9.2-6-9.2c-12,0-12-7.9-24.1-7.9s-12,7.9-24.1,7.9c-10.3,0-14.5-8.8-19.4-2.4
-						C201.9,24.2,251.7,90,251.7,90c-220,144.6-149,341.3-19.2,341.3L265.7,431.3L265.7,431.3z"/>
-					<g>
-						<path class="st2" d="M315.5,90c0,0,50.5-65.6,36-84.4c-5-6.4-9.2,2.3-19.4,2.3c-12,0-12-7.9-24.1-7.9c-12,0-12,7.9-24.1,7.9
-							c-0.6,0-1.1,0-1.7-0.1c-4.8,20.7-26.6,53-39.1,70.3c4.9,7.2,8.4,11.9,8.4,11.9c-2.9,1.9-5.8,3.9-8.6,5.8
-							c210.2,144.5,139.8,335.5,11.3,335.5h81.2C465.8,431.3,536.2,235.1,315.5,90L315.5,90z"/>
-					</g>
-					<g>
-						<path class="st3" d="M324.9,113.3c-29.4,7.4-58.4,7.4-87.8,0c-10.2-2.6-16-14.1-12.3-24.5c0-0.1,0.1-0.2,0.1-0.4
-							c3.1-8.8,11.8-13.7,20.4-11.5c24.1,6,47.3,6,71.4,0c8.6-2.2,17.3,2.8,20.4,11.5c0,0.1,0.1,0.2,0.1,0.4
-							C341,99.3,335.2,110.8,324.9,113.3L324.9,113.3z"/>
-					</g>
-				</g>
-			</g>
-		</g>
-		<g>
-			<g>
-				<g>
-					<g>
-						<g>
-							<g>
-								<g>
-									<g>
-										<g>
-											<g>
-												<path class="st4" d="M48.8,465l111.9,41.6c9.5,3.5,19.6,5.3,29.7,5.3h115.3c16.1,0,31.9-4.6,45.6-13.2l144.3-91.5
-													c9.5-8.5,11.3-22.7,4.1-33.2c-7.8-11.5-20.8-13.5-35.1-6.8L324,429.2l0.2-22.8c-1.9-18.7-16.3-33.7-34.9-36.4l-85.6-9.9
-													c-19.7-2.8-29.6-9.4-46.8-19.5c-23.5-13.7-50.2-21-77.4-21H48.8L48.8,465z"/>
-											</g>
-											<path class="st5" d="M153.8,484.5c10,3.7,20.6,5.6,31.2,5.6h121.2c12.9,0,25.6-2.8,37.2-8.1l84.7-53.7
-												c7.9-5,12.9-13.7,12.6-23c-0.1-4.9-1.6-9.9-4.6-14.2c0,0-2.6-4.4-5.2-8.9l-107,47.1l0.2-22.8
-												c-1.9-18.7-16.3-33.7-34.9-36.4l-85.6-9.9c-19.7-2.8-29.6-9.4-46.8-19.5c-23.5-13.7-50.2-21-77.4-21H48.8v125.6
-												L153.8,484.5z"/>
-											<path class="st6" d="M499.6,374.1c-7.8-11.5-20.8-13.5-35.1-6.8l-38.7,17c1.9,3,3.4,5.3,3.4,5.3
-												c7.2,10.5,5.4,24.7-4.1,33.2L341,476.2c-11.1,5.1-23.2,7.7-35.4,7.7H190.3c-10.1,0-20.2-1.8-29.7-5.3L48.8,436.9V465
-												l111.9,41.6c9.5,3.5,19.6,5.3,29.7,5.3h94.2h21.1c16.1,0,31.9-4.6,45.6-13.2l144.3-91.5
-												C505,398.9,506.8,384.7,499.6,374.1L499.6,374.1z"/>
-											<g>
-												<path class="st7" d="M313.7,382.9l0,0.5l0.4-0.2C313.9,383.2,313.8,383.1,313.7,382.9L313.7,382.9z"/>
-											</g>
-											<g>
-												<g>
-													<g>
-														<path class="st6" d="M324,429.2h-87.4c-4.3,0-7.7-3.5-7.7-7.7s3.5-7.7,7.7-7.7h87.5L324,429.2z"/>
-													</g>
-												</g>
-											</g>
-											<path class="st8" d="M72.8,487.3c0,8.1-6.6,14.7-14.7,14.7H22.7C14.6,502,8,495.4,8,487.3V307.4
-												c0-8.1,6.6-14.7,14.7-14.7h35.5c8.1,0,14.7,6.6,14.7,14.7V487.3z"/>
-										</g>
-									</g>
-								</g>
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-	<text transform="matrix(1 0 0 1 190.5921 300.217)" class="st9 st10 st11">XAF</text>
-</g>
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0" y="0" viewBox="0 0 512 512"
+     style="enable-background:new 0 0 512 512" xml:space="preserve">
+    <style>
+        .st0{fill:#ffd064}
+        .st6{fill:#8c715d}
+    </style>
+    <path class="st0"
+          d="M230.1 94.2c-2.4 0-4.7-1.1-6.2-3.1-7-9.5-19.5-20.5-39.2-18.4-23.2 2.5-40.4-4.9-50.7-11.5-3.6-2.3-4.6-7.1-2.3-10.7 2.3-3.6 7.1-4.6 10.7-2.3 8.3 5.3 22.1 11.2 40.8 9.2 28.4-3 45.6 14.1 53.3 24.6 2.5 3.4 1.8 8.3-1.6 10.8-1.6.9-3.2 1.4-4.8 1.4z"/>
+    <path class="st0"
+          d="M149.2 135.2c-1.4 0-2.8-.4-4-1.1-3.6-2.2-4.8-7-2.5-10.6 9.9-16.1 28.1-27.2 52.5-32.1 17.8-3.5 32.8-2.6 33.4-2.5 4.3.3 7.5 4 7.2 8.2-.3 4.3-4 7.4-8.2 7.2-.5 0-53-3.1-71.7 27.3-1.6 2.3-4.1 3.6-6.7 3.6z"/>
+    <path
+        d="M265.7 431.3c126.9 0 197-186.1-3.3-329.9-5-3.6-7.9-9.3-7.9-15.5.1-5.1 1.7-10 4.6-14.1 9.4-13.4 22.9-36.3 31-54.8 1.9-4.4-.8-9.2-6-9.2-12 0-12-7.9-24.1-7.9s-12 7.9-24.1 7.9c-10.3 0-14.5-8.8-19.4-2.4C201.9 24.2 251.7 90 251.7 90c-220 144.6-149 341.3-19.2 341.3h33.2z"
+        style="fill:#eabc6b"/>
+    <path
+        d="M315.5 90s50.5-65.6 36-84.4c-5-6.4-9.2 2.3-19.4 2.3-12 0-12-7.9-24.1-7.9-12 0-12 7.9-24.1 7.9-.6 0-1.1 0-1.7-.1-4.8 20.7-26.6 53-39.1 70.3 4.9 7.2 8.4 11.9 8.4 11.9-2.9 1.9-5.8 3.9-8.6 5.8 210.2 144.5 139.8 335.5 11.3 335.5h81.2c130.4 0 200.8-196.2-19.9-341.3z"
+        style="fill:#e8ae4d"/>
+    <path
+        d="M324.9 113.3c-29.4 7.4-58.4 7.4-87.8 0-10.2-2.6-16-14.1-12.3-24.5 0-.1.1-.2.1-.4 3.1-8.8 11.8-13.7 20.4-11.5 24.1 6 47.3 6 71.4 0 8.6-2.2 17.3 2.8 20.4 11.5 0 .1.1.2.1.4 3.8 10.5-2 22-12.3 24.5z"
+        style="fill:#ffe07d"/>
+    <path
+        d="m48.8 465 111.9 41.6c9.5 3.5 19.6 5.3 29.7 5.3h115.3c16.1 0 31.9-4.6 45.6-13.2l144.3-91.5c9.5-8.5 11.3-22.7 4.1-33.2-7.8-11.5-20.8-13.5-35.1-6.8l-140.6 62 .2-22.8c-1.9-18.7-16.3-33.7-34.9-36.4l-85.6-9.9c-19.7-2.8-29.6-9.4-46.8-19.5-23.5-13.7-50.2-21-77.4-21H48.8V465z"
+        style="fill:#ffddce"/>
+    <path
+        d="M153.8 484.5c10 3.7 20.6 5.6 31.2 5.6h121.2c12.9 0 25.6-2.8 37.2-8.1l84.7-53.7c7.9-5 12.9-13.7 12.6-23-.1-4.9-1.6-9.9-4.6-14.2 0 0-2.6-4.4-5.2-8.9l-107 47.1.2-22.8c-1.9-18.7-16.3-33.7-34.9-36.4l-85.6-9.9c-19.7-2.8-29.6-9.4-46.8-19.5-23.5-13.7-50.2-21-77.4-21H48.8v125.6l105 39.2z"
+        style="fill:#b19177"/>
+    <path class="st6"
+          d="M499.6 374.1c-7.8-11.5-20.8-13.5-35.1-6.8l-38.7 17c1.9 3 3.4 5.3 3.4 5.3 7.2 10.5 5.4 24.7-4.1 33.2L341 476.2c-11.1 5.1-23.2 7.7-35.4 7.7H190.3c-10.1 0-20.2-1.8-29.7-5.3L48.8 436.9V465l111.9 41.6c9.5 3.5 19.6 5.3 29.7 5.3H305.7c16.1 0 31.9-4.6 45.6-13.2l144.3-91.5c9.4-8.3 11.2-22.5 4-33.1z"/>
+    <path d="M313.7 382.9v.5l.4-.2c-.2 0-.3-.1-.4-.3z" style="fill:#f5dbcc"/>
+    <path class="st6" d="M324 429.2h-87.4c-4.3 0-7.7-3.5-7.7-7.7s3.5-7.7 7.7-7.7h87.5l-.1 15.4z"/>
+    <path
+        d="M72.8 487.3c0 8.1-6.6 14.7-14.7 14.7H22.7C14.6 502 8 495.4 8 487.3V307.4c0-8.1 6.6-14.7 14.7-14.7h35.5c8.1 0 14.7 6.6 14.7 14.7v179.9z"
+        style="fill:#407093"/>
+    <text transform="translate(190.592 300.217)" style="font-size:110px;font-family:'SFRounded-Ultralight';fill:#fff">XAF</text>
 </svg>
diff --git a/public/images/reactions/party.svg b/public/images/reactions/party.svg
index 369c6048..31828a65 100755
--- a/public/images/reactions/party.svg
+++ b/public/images/reactions/party.svg
@@ -1,99 +1,26 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 480.187 480.187" style="enable-background:new 0 0 480.187 480.187;" xml:space="preserve">
-<path style="fill:#DD1C4B;" d="M243.421,199.48c-62.008-62-130-94.536-151.872-72.672c-2.4,2.514-4.166,5.563-5.152,8.896
-	l-0.352-0.352l-20.888,85.6l-20.8,85.344L19.701,407.352l-15.608,64l92.408-34.968l117.536-44.472l93.768-35.48l-0.112-0.112
-	c3.139-1.001,6.011-2.699,8.4-4.968C337.965,329.48,305.429,261.488,243.421,199.48z"/>
-<ellipse transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 178.9146 552.2075)" style="fill:#D1E3EE;" cx="203.823" cy="239.049" rx="158.777" ry="56"/>
-<path style="fill:#B21D48;" d="M299.293,359.2c-11.196,0.196-22.304-2.008-32.576-6.464l-76.64,29L72.501,426.168L9.453,450.024
-	L4.093,472l92.408-34.968l117.536-44.472L300.093,360L299.293,359.2z"/>
-<g>
-	<path style="fill:#FFBF41;" d="M396.093,296c-0.958-0.003-1.908-0.174-2.808-0.504c-40.613-15.215-84.514-19.481-127.296-12.368
-		l-28.576,4.76c-4.374,0.624-8.426-2.416-9.05-6.79c-0.603-4.226,2.218-8.181,6.41-8.986l28.584-4.8
-		c45.554-7.569,92.297-3.03,135.544,13.16c4.158,1.494,6.317,6.076,4.823,10.234C402.57,293.918,399.506,296.044,396.093,296z"/>
-	<path style="fill:#FFBF41;" d="M252.093,248c-4.418-0.026-7.979-3.629-7.953-8.047c0.018-3.05,1.768-5.824,4.513-7.153l168-80
-		c3.99-1.9,8.764-0.206,10.664,3.784s0.206,8.764-3.784,10.664l0,0l-168,80C254.457,247.751,253.282,248.008,252.093,248z"/>
-	<path style="fill:#FFBF41;" d="M158.541,232c-1.055,0.002-2.1-0.207-3.072-0.616c-4.078-1.701-6.005-6.385-4.304-10.463
-		c0,0,0-0.001,0-0.001l11.632-27.912c17.897-42.765,22.07-90.033,11.944-135.272c-1.038-4.295,1.603-8.617,5.897-9.655
-		c4.295-1.038,8.617,1.603,9.655,5.897c0.023,0.095,0.044,0.19,0.064,0.286c10.848,48.461,6.375,99.095-12.8,144.904l-11.64,27.912
-		C164.675,230.057,161.767,231.997,158.541,232L158.541,232z"/>
-</g>
-<circle style="fill:#D5557E;" cx="436.093" cy="312" r="16"/>
-<circle style="fill:#DD95C1;" cx="244.093" cy="88" r="16"/>
-<path style="fill:#7FCCCB;" d="M172.093,32c-8.837,0-16-7.163-16-16s7.163-16,16-16s16,7.163,16,16S180.93,32,172.093,32z"/>
-<g>
-	<path style="fill:#2276BB;" d="M396.093,64c-4.418,0-8-3.582-8-8v-8c0-4.418,3.582-8,8-8s8,3.582,8,8v8
-		C404.093,60.418,400.512,64,396.093,64z"/>
-	<path style="fill:#2276BB;" d="M396.093,24c-4.418,0-8-3.582-8-8V8c0-4.418,3.582-8,8-8s8,3.582,8,8v8
-		C404.093,20.418,400.512,24,396.093,24z"/>
-	<path style="fill:#2276BB;" d="M420.093,40h-8c-4.418,0-8-3.582-8-8s3.582-8,8-8h8c4.418,0,8,3.582,8,8S424.512,40,420.093,40z"/>
-	<path style="fill:#2276BB;" d="M380.093,40h-8c-4.418,0-8-3.582-8-8s3.582-8,8-8h8c4.418,0,8,3.582,8,8S384.512,40,380.093,40z"/>
-</g>
-<path style="fill:#FFFFFF;" d="M67.597,232c-0.896-3.424-1.696-6.88-2.44-10.4l-20.8,85.344l1.6,19.512
-	c3.487,41.599,21.357,80.683,50.536,110.536l117.544-44.432c-0.64-0.2-1.304-0.344-1.944-0.56
-	C140.818,365.275,86.945,305.621,67.597,232z"/>
-<path style="fill:#F6F6E7;" d="M214.037,392.56c-0.64-0.2-1.304-0.344-1.944-0.56c-7.7-2.915-15.242-6.234-22.592-9.944
-	L83.629,422.112c4.014,5.206,8.311,10.187,12.872,14.92L214.037,392.56z"/>
-<path style="fill:#C9DA53;" d="M340.093,95.832V136h-40.168V95.832H340.093z"/>
-<path style="fill:#FFBF41;" d="M196.093,240c-4.418-0.001-7.999-3.584-7.998-8.002c0.001-2.266,0.962-4.425,2.646-5.942l80-72
-	c3.341-2.891,8.393-2.526,11.284,0.815c2.811,3.248,2.555,8.136-0.58,11.073l-80,72C199.977,239.267,198.07,239.999,196.093,240
-	L196.093,240z"/>
-<g>
-	<path style="fill:#FFDB43;" d="M428.093,208c-4.418,0-8-3.582-8-8v-8c0-4.418,3.582-8,8-8s8,3.582,8,8v8
-		C436.093,204.418,432.512,208,428.093,208z"/>
-	<path style="fill:#FFDB43;" d="M456.381,196.28c-2.123,0.006-4.16-0.838-5.656-2.344l-5.656-5.656
-		c-3.069-3.178-2.982-8.243,0.196-11.312c3.1-2.994,8.015-2.994,11.116,0l5.656,5.656c3.124,3.125,3.123,8.19-0.002,11.314
-		C460.536,195.437,458.502,196.28,456.381,196.28L456.381,196.28z"/>
-	<path style="fill:#FFDB43;" d="M468.093,168h-8c-4.418,0-8-3.582-8-8s3.582-8,8-8h8c4.418,0,8,3.582,8,8S472.512,168,468.093,168z"
-		/>
-	<path style="fill:#FFDB43;" d="M450.725,145.376c-4.418-0.001-7.999-3.583-7.998-8.002c0-2.121,0.843-4.155,2.342-5.654
-		l5.656-5.656c3.178-3.07,8.242-2.982,11.312,0.196c2.994,3.1,2.994,8.015,0,11.116l-5.656,5.656
-		C454.881,144.532,452.847,145.376,450.725,145.376L450.725,145.376z"/>
-	<path style="fill:#FFDB43;" d="M428.093,136c-4.418,0-8-3.582-8-8v-8c0-4.418,3.582-8,8-8s8,3.582,8,8v8
-		C436.093,132.418,432.512,136,428.093,136z"/>
-	<path style="fill:#FFDB43;" d="M405.461,145.376c-2.122,0-4.156-0.844-5.656-2.344l-5.656-5.656
-		c-3.069-3.178-2.982-8.243,0.196-11.312c3.1-2.994,8.015-2.994,11.116,0l5.656,5.656c3.124,3.125,3.123,8.19-0.002,11.314
-		C409.616,144.533,407.582,145.376,405.461,145.376L405.461,145.376z"/>
-	<path style="fill:#FFDB43;" d="M44.093,8l12.36,25.048l27.64,4.016l-20,19.496l4.72,27.528l-24.72-13l-24.72,13l4.72-27.528
-		l-20-19.496l27.64-4.016L44.093,8z"/>
-</g>
-<path style="fill:#2BB3CE;" d="M473.565,433.328c-3.805-13.485-12.566-25.032-24.528-32.328l-3.296-4.944
-	c-18.481-27.637-47.542-46.429-80.328-51.944c-4.374-0.624-8.426,2.416-9.05,6.79c-0.603,4.226,2.218,8.181,6.41,8.986
-	c23.648,4.014,45.199,16.028,61.048,34.032c-13.325,2.397-24.979,10.4-32,21.976c-8.616,15.431-3.091,34.924,12.34,43.54
-	s34.924,3.091,43.54-12.34c3.291-6.353,5.068-13.382,5.192-20.536c8.512,12.363,9.193,28.508,1.752,41.544
-	c-2.254,3.8-1.001,8.708,2.799,10.962c3.8,2.254,8.708,1.001,10.962-2.799c0.072-0.122,0.141-0.245,0.207-0.371
-	C475.881,462.937,477.664,447.609,473.565,433.328L473.565,433.328z M433.749,439.288c-4.27,7.737-14.003,10.547-21.739,6.277
-	c-7.737-4.27-10.547-14.003-6.277-21.739c0.024-0.043,0.048-0.087,0.072-0.13c4.721-7.73,12.684-12.912,21.664-14.096
-	c1.391-0.038,2.768,0.282,4,0.928C438.221,414.296,438.581,430.632,433.749,439.288z"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 480.187 480.187" style="enable-background:new 0 0 480.187 480.187"
+     xml:space="preserve">
+    <path style="fill:#dd1c4b" d="M243.421 199.48c-62.008-62-130-94.536-151.872-72.672a21.865 21.865 0 0 0-5.152 8.896l-.352-.352-20.888 85.6-20.8 85.344-24.656 101.056-15.608 64 92.408-34.968 117.536-44.472 93.768-35.48-.112-.112a21.826 21.826 0 0 0 8.4-4.968c21.872-21.872-10.664-89.864-72.672-151.872z"/>
+    <ellipse transform="rotate(-134.999 203.824 239.05)" style="fill:#d1e3ee" cx="203.823" cy="239.049" rx="158.777"
+             ry="56"/>
+    <path style="fill:#b21d48"
+          d="M299.293 359.2a78.408 78.408 0 0 1-32.576-6.464l-76.64 29-117.576 44.432-63.048 23.856L4.093 472l92.408-34.968 117.536-44.472L300.093 360l-.8-.8z"/>
+    <path style="fill:#ffbf41"
+          d="M396.093 296a8.231 8.231 0 0 1-2.808-.504 247.258 247.258 0 0 0-127.296-12.368l-28.576 4.76a8 8 0 0 1-2.64-15.776l28.584-4.8a263.445 263.445 0 0 1 135.544 13.16A8 8 0 0 1 396.093 296zM252.093 248a8 8 0 0 1-3.44-15.2l168-80a8 8 0 0 1 10.664 3.784 8 8 0 0 1-3.784 10.664l-168 80a7.995 7.995 0 0 1-3.44.752zM158.541 232a8 8 0 0 1-7.376-11.079v-.001l11.632-27.912a223.782 223.782 0 0 0 11.944-135.272 8 8 0 1 1 15.616-3.472 239.682 239.682 0 0 1-12.8 144.904l-11.64 27.912a8 8 0 0 1-7.376 4.92z"/>
+    <circle style="fill:#d5557e" cx="436.093" cy="312" r="16"/>
+    <circle style="fill:#dd95c1" cx="244.093" cy="88" r="16"/>
+    <path style="fill:#7fcccb" d="M172.093 32c-8.837 0-16-7.163-16-16s7.163-16 16-16 16 7.163 16 16-7.163 16-16 16z"/>
+    <path style="fill:#2276bb"
+          d="M396.093 64a8 8 0 0 1-8-8v-8a8 8 0 0 1 16 0v8a8 8 0 0 1-8 8zM396.093 24a8 8 0 0 1-8-8V8a8 8 0 0 1 16 0v8a8 8 0 0 1-8 8zM420.093 40h-8a8 8 0 0 1 0-16h8a8 8 0 0 1 0 16zM380.093 40h-8a8 8 0 0 1 0-16h8a8 8 0 0 1 0 16z"/>
+    <path style="fill:#fff"
+          d="M67.597 232a223.9 223.9 0 0 1-2.44-10.4l-20.8 85.344 1.6 19.512a179.6 179.6 0 0 0 50.536 110.536l117.544-44.432c-.64-.2-1.304-.344-1.944-.56-71.275-26.725-125.148-86.379-144.496-160z"/>
+    <path style="fill:#f6f6e7"
+          d="M214.037 392.56c-.64-.2-1.304-.344-1.944-.56a233.971 233.971 0 0 1-22.592-9.944L83.629 422.112a179.12 179.12 0 0 0 12.872 14.92l117.536-44.472z"/>
+    <path style="fill:#c9da53" d="M340.093 95.832V136h-40.168V95.832h40.168z"/>
+    <path style="fill:#ffbf41"
+          d="M196.093 240a8 8 0 0 1-5.352-13.944l80-72a8 8 0 0 1 10.704 11.888l-80 72a8 8 0 0 1-5.352 2.056z"/>
+    <path style="fill:#ffdb43"
+          d="M428.093 208a8 8 0 0 1-8-8v-8a8 8 0 0 1 16 0v8a8 8 0 0 1-8 8zM456.381 196.28a7.94 7.94 0 0 1-5.656-2.344l-5.656-5.656a8 8 0 0 1 11.312-11.312l5.656 5.656a8 8 0 0 1-5.656 13.656zM468.093 168h-8a8 8 0 0 1 0-16h8a8 8 0 0 1 0 16zM450.725 145.376a8 8 0 0 1-5.656-13.656l5.656-5.656a8 8 0 0 1 11.312 11.312l-5.656 5.656a8 8 0 0 1-5.656 2.344zM428.093 136a8 8 0 0 1-8-8v-8a8 8 0 0 1 16 0v8a8 8 0 0 1-8 8zM405.461 145.376a8 8 0 0 1-5.656-2.344l-5.656-5.656a8 8 0 0 1 11.312-11.312l5.656 5.656a8 8 0 0 1-5.656 13.656zM44.093 8l12.36 25.048 27.64 4.016-20 19.496 4.72 27.528-24.72-13-24.72 13 4.72-27.528-20-19.496 27.64-4.016L44.093 8z"/>
+    <path style="fill:#2bb3ce"
+          d="M473.565 433.328A55.528 55.528 0 0 0 449.037 401l-3.296-4.944a120.724 120.724 0 0 0-80.328-51.944 8 8 0 0 0-2.64 15.776 104.667 104.667 0 0 1 61.048 34.032 47.198 47.198 0 0 0-32 21.976c-8.616 15.431-3.091 34.924 12.34 43.54s34.924 3.091 43.54-12.34a46.396 46.396 0 0 0 5.192-20.536 39.088 39.088 0 0 1 1.752 41.544 8 8 0 1 0 13.968 7.792 55.641 55.641 0 0 0 4.952-42.568zm-39.816 5.96c-4.27 7.737-14.003 10.547-21.739 6.277-7.737-4.27-10.547-14.003-6.277-21.739l.072-.13a29.977 29.977 0 0 1 21.664-14.096 8.135 8.135 0 0 1 4 .928c6.752 3.768 7.112 20.104 2.28 28.76z"/>
 </svg>
diff --git a/public/images/reactions/pray.svg b/public/images/reactions/pray.svg
index 92409bb1..9baf4f3a 100755
--- a/public/images/reactions/pray.svg
+++ b/public/images/reactions/pray.svg
@@ -1,71 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#C0A58D;}
-	.st1{fill:#B19177;}
-	.st2{fill:#8C715D;}
-	.st3{fill:#1C96F9;}
-	.st4{fill:#1785F8;}
-	.st5{fill:#EAF6FF;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M426.1,367.5l-53.6-53.6c-8.2-8.2-13.3-18.9-14.5-30.4l-17.7-170.3c-0.6-6-2-11.8-4.2-17.4l-32.7-85.4
-				C301.1,4.2,295,0,288.2,0c-22.3,0-37.9,22.2-30.2,43.2l21.3,57.9c1.9,5.3,2.8,10.9,2.7,16.5l-2,68.9c0,1.7-0.9,3.2-2.3,4.2
-				c-13.1,8.7-21.7,23.6-21.7,40.4v104c0,14.9,5.9,29.1,16.4,39.6l80.6,80.6L426.1,367.5z"/>
-			<path class="st1" d="M426.1,367.5L405.8,392l-55.6-55.6c-8.2-8.2-13.3-18.9-14.5-30.4L318,135.7c-0.6-6-2-11.8-4.2-17.4L281.1,33
-				c-2.4-6.4-8.5-10.6-15.3-10.6c-3,0-5.9,0.4-8.5,1.1C260.9,10.3,273,0,288.2,0c6.8,0,12.9,4.2,15.3,10.5l32.7,85.4
-				c2.1,5.6,3.5,11.4,4.2,17.4l17.7,170.3c1.2,11.5,6.3,22.2,14.5,30.4L426.1,367.5z"/>
-			<g>
-				<g>
-					<path class="st2" d="M329.4,191.3v102.6c0,4.3-3.5,7.8-7.8,7.8c-4.3,0-7.8-3.5-7.8-7.8V191.3c0-5.1-4.2-9.3-9.3-9.3
-						c-9,0-18.2,3-26,7.9c0.9-0.9,1.4-2.1,1.4-3.4l0.4-15c7.8-3.3,16-5.1,24.1-5.1C318.3,166.5,329.4,177.6,329.4,191.3L329.4,191.3
-						z"/>
-				</g>
-				<g>
-					<path class="st3" d="M500.9,406.1L398.1,509c-4.1,4.1-10.6,4.1-14.7,0l-42.1-42.1c-8.2-8.2-8.2-21.4,0-29.6l87.9-87.9
-						c8.2-8.2,21.4-8.2,29.6,0l42.1,42.1C505,395.5,505,402.1,500.9,406.1L500.9,406.1z"/>
-					<path class="st4" d="M458.8,349.3l42.1,42.1c4.1,4.1,4.1,10.6,0,14.7l-19.2,19.2l-49.5-49.5c-8.2-8.2-21.4-8.2-29.6,0
-						l26.6-26.6C437.4,341.1,450.6,341.1,458.8,349.3L458.8,349.3z"/>
-				</g>
-			</g>
-		</g>
-		<g>
-			<path class="st0" d="M85.9,367.5l53.6-53.6c8.2-8.2,13.3-18.9,14.5-30.4l17.7-170.3c0.6-6,2-11.8,4.2-17.4l32.7-85.4
-				C210.9,4.2,217,0,223.8,0c22.3,0,37.9,22.2,30.2,43.2l-21.3,57.9c-1.9,5.3-2.8,10.9-2.7,16.5l2,68.9c0.1,1.7,0.9,3.2,2.3,4.2
-				c13.1,8.7,21.7,23.6,21.7,40.4v104c0,14.9-5.9,29.1-16.4,39.6L159,455.4L85.9,367.5z"/>
-			<path class="st1" d="M256,231.1v104c0,14.9-5.9,29.1-16.4,39.6L159,455.4l-17.5-21l63-63c10.5-10.5,16.4-24.8,16.4-39.6v-104
-				c0-16.9-8.6-31.7-21.7-40.4c-1.4-0.9-2.3-2.5-2.3-4.2l-2-68.9c-0.2-5.6,0.7-11.2,2.7-16.5l21.3-57.9c1.4-3.7,2-7.5,2-11.1
-				c0-8.7-3.6-16.9-9.6-22.9c3-3.6,7.6-5.8,12.5-5.8c18.4,0,32.2,15.1,32.2,32.1c0,3.7-0.6,7.4-2,11.1l-21.3,57.9
-				c-1.9,5.3-2.8,10.9-2.7,16.5l2,69c0.1,1.7,0.9,3.2,2.3,4.2C247.4,199.4,256,214.2,256,231.1L256,231.1z"/>
-			<g>
-				<g>
-					<path class="st1" d="M232,186.5c0,1.3,0.6,2.5,1.4,3.4c-7.8-4.9-17-7.9-26-7.9c-5.1,0-9.3,4.2-9.3,9.3v102.6
-						c0,4.3-3.5,7.8-7.8,7.8c-4.3,0-7.8-3.5-7.8-7.8V191.3c0-13.7,11.2-24.9,24.9-24.9c8.1,0,16.3,1.8,24.1,5.1L232,186.5z"/>
-				</g>
-				<g>
-					<path class="st2" d="M233.4,189.9c-7.8-4.9-17-7.9-26-7.9c-3.6,0-6.7,2.1-8.3,5.1c-1.3-0.9-2.1-2.4-2.2-4.1l-0.4-14.1
-						c3.3-1.6,7-2.5,10.9-2.5c8.1,0,16.3,1.8,24.1,5.1l0.4,15C232,187.8,232.6,189,233.4,189.9L233.4,189.9z"/>
-				</g>
-				<g>
-					<path class="st3" d="M11.1,406.1L113.9,509c4.1,4.1,10.6,4.1,14.7,0l42.1-42.1c8.2-8.2,8.2-21.4,0-29.6l-87.9-87.9
-						c-8.2-8.2-21.4-8.2-29.6,0l-42.1,42.1C7,395.5,7,402.1,11.1,406.1L11.1,406.1z"/>
-					<path class="st4" d="M170.7,466.8L128.6,509c-4.1,4.1-10.6,4.1-14.7,0l-17.3-17.3l49.5-49.5c8.2-8.2,8.2-21.4,0-29.6l24.7,24.7
-						C178.9,445.4,178.9,458.7,170.7,466.8L170.7,466.8z"/>
-				</g>
-			</g>
-		</g>
-	</g>
-	<g>
-		<g>
-			<circle class="st5" cx="68.9" cy="398.5" r="14"/>
-		</g>
-		<g>
-			<circle class="st5" cx="393.7" cy="449.2" r="14"/>
-		</g>
-	</g>
-</g>
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0" y="0" viewBox="0 0 512 512"
+     style="enable-background:new 0 0 512 512" xml:space="preserve">
+    <style>
+        .st0{fill:#c0a58d}
+        .st1{fill:#b19177}
+        .st2{fill:#8c715d}
+        .st3{fill:#1c96f9}
+        .st4{fill:#1785f8}
+        .st5{fill:#eaf6ff}
+    </style>
+    <path class="st0"
+          d="m426.1 367.5-53.6-53.6c-8.2-8.2-13.3-18.9-14.5-30.4l-17.7-170.3c-.6-6-2-11.8-4.2-17.4l-32.7-85.4C301.1 4.2 295 0 288.2 0c-22.3 0-37.9 22.2-30.2 43.2l21.3 57.9c1.9 5.3 2.8 10.9 2.7 16.5l-2 68.9c0 1.7-.9 3.2-2.3 4.2-13.1 8.7-21.7 23.6-21.7 40.4v104c0 14.9 5.9 29.1 16.4 39.6l80.6 80.6 73.1-87.8z"/>
+    <path class="st1"
+          d="M426.1 367.5 405.8 392l-55.6-55.6c-8.2-8.2-13.3-18.9-14.5-30.4L318 135.7c-.6-6-2-11.8-4.2-17.4L281.1 33c-2.4-6.4-8.5-10.6-15.3-10.6-3 0-5.9.4-8.5 1.1C260.9 10.3 273 0 288.2 0c6.8 0 12.9 4.2 15.3 10.5l32.7 85.4c2.1 5.6 3.5 11.4 4.2 17.4l17.7 170.3c1.2 11.5 6.3 22.2 14.5 30.4l53.5 53.5z"/>
+    <path class="st2"
+          d="M329.4 191.3v102.6c0 4.3-3.5 7.8-7.8 7.8s-7.8-3.5-7.8-7.8V191.3c0-5.1-4.2-9.3-9.3-9.3-9 0-18.2 3-26 7.9.9-.9 1.4-2.1 1.4-3.4l.4-15c7.8-3.3 16-5.1 24.1-5.1 13.9.1 25 11.2 25 24.9z"/>
+    <path class="st3"
+          d="M500.9 406.1 398.1 509c-4.1 4.1-10.6 4.1-14.7 0l-42.1-42.1c-8.2-8.2-8.2-21.4 0-29.6l87.9-87.9c8.2-8.2 21.4-8.2 29.6 0l42.1 42.1c4.1 4 4.1 10.6 0 14.6z"/>
+    <path class="st4"
+          d="m458.8 349.3 42.1 42.1c4.1 4.1 4.1 10.6 0 14.7l-19.2 19.2-49.5-49.5c-8.2-8.2-21.4-8.2-29.6 0l26.6-26.6c8.2-8.1 21.4-8.1 29.6.1z"/>
+    <path class="st0"
+          d="m85.9 367.5 53.6-53.6c8.2-8.2 13.3-18.9 14.5-30.4l17.7-170.3c.6-6 2-11.8 4.2-17.4l32.7-85.4C210.9 4.2 217 0 223.8 0c22.3 0 37.9 22.2 30.2 43.2l-21.3 57.9c-1.9 5.3-2.8 10.9-2.7 16.5l2 68.9c.1 1.7.9 3.2 2.3 4.2 13.1 8.7 21.7 23.6 21.7 40.4v104c0 14.9-5.9 29.1-16.4 39.6L159 455.4l-73.1-87.9z"/>
+    <path class="st1"
+          d="M256 231.1v104c0 14.9-5.9 29.1-16.4 39.6L159 455.4l-17.5-21 63-63c10.5-10.5 16.4-24.8 16.4-39.6v-104c0-16.9-8.6-31.7-21.7-40.4-1.4-.9-2.3-2.5-2.3-4.2l-2-68.9c-.2-5.6.7-11.2 2.7-16.5l21.3-57.9c1.4-3.7 2-7.5 2-11.1 0-8.7-3.6-16.9-9.6-22.9 3-3.6 7.6-5.8 12.5-5.8C242.2.1 256 15.2 256 32.2c0 3.7-.6 7.4-2 11.1l-21.3 57.9c-1.9 5.3-2.8 10.9-2.7 16.5l2 69c.1 1.7.9 3.2 2.3 4.2 13.1 8.5 21.7 23.3 21.7 40.2z"/>
+    <path class="st1"
+          d="M232 186.5c0 1.3.6 2.5 1.4 3.4-7.8-4.9-17-7.9-26-7.9-5.1 0-9.3 4.2-9.3 9.3v102.6c0 4.3-3.5 7.8-7.8 7.8s-7.8-3.5-7.8-7.8V191.3c0-13.7 11.2-24.9 24.9-24.9 8.1 0 16.3 1.8 24.1 5.1l.5 15z"/>
+    <path class="st2"
+          d="M233.4 189.9c-7.8-4.9-17-7.9-26-7.9-3.6 0-6.7 2.1-8.3 5.1-1.3-.9-2.1-2.4-2.2-4.1l-.4-14.1c3.3-1.6 7-2.5 10.9-2.5 8.1 0 16.3 1.8 24.1 5.1l.4 15c.1 1.3.7 2.5 1.5 3.4z"/>
+    <path class="st3"
+          d="M11.1 406.1 113.9 509c4.1 4.1 10.6 4.1 14.7 0l42.1-42.1c8.2-8.2 8.2-21.4 0-29.6l-87.9-87.9c-8.2-8.2-21.4-8.2-29.6 0l-42.1 42.1c-4.1 4-4.1 10.6 0 14.6z"/>
+    <path class="st4"
+          d="M170.7 466.8 128.6 509c-4.1 4.1-10.6 4.1-14.7 0l-17.3-17.3 49.5-49.5c8.2-8.2 8.2-21.4 0-29.6l24.7 24.7c8.1 8.1 8.1 21.4-.1 29.5z"/>
+    <circle class="st5" cx="68.9" cy="398.5" r="14"/>
+    <circle class="st5" cx="393.7" cy="449.2" r="14"/>
 </svg>
diff --git a/resources/views/components/discord.blade.php b/resources/views/components/discord.blade.php
index 401d9ef2..d1303cfa 100644
--- a/resources/views/components/discord.blade.php
+++ b/resources/views/components/discord.blade.php
@@ -1,5 +1,5 @@
 <div class="overflow-hidden">
-    <a href="{{ route('discord') }}">
+    <a href="https://discord.gg/KNp6brbyVD">
         <svg
             class="h-12 w-auto text-[#5865F2]"
             fill="currentColor"
diff --git a/resources/views/components/footer-link.blade.php b/resources/views/components/footer-link.blade.php
index 30cfc6aa..47616c3f 100644
--- a/resources/views/components/footer-link.blade.php
+++ b/resources/views/components/footer-link.blade.php
@@ -1,16 +1,10 @@
 @props([
     'title',
     'url',
-    'soon' => false,
 ])
 
 <li>
-    <x-link href="{{ $url }}" class="inline-flex items-center gap-2 text-sm text-gray-400 hover:text-white">
+    <x-link :href="$url" class="inline-flex items-center gap-2 text-sm text-gray-400 hover:text-white">
         {{ $title }}
-        @if ($soon)
-            <span class="inline-flex rounded-full bg-green-100 px-1.5 py-0.5 text-xs leading-4 text-green-800">
-                {{ __('global.soon') }}
-            </span>
-        @endif
     </x-link>
 </li>
diff --git a/resources/views/components/forum/channel.blade.php b/resources/views/components/forum/channel.blade.php
index 932f61b6..22259777 100644
--- a/resources/views/components/forum/channel.blade.php
+++ b/resources/views/components/forum/channel.blade.php
@@ -3,10 +3,10 @@
 ])
 
 <span
-    class="inline-flex items-center rounded-full border border-skin-input px-2.5 py-1 font-sans text-sm font-medium leading-none text-gray-900"
+    {{ $attributes->twMerge(['class' => 'inline-flex items-center gap-2 rounded-full text-gray-900 border border-gray-200 px-2.5 py-1 text-sm font-medium leading-none dark:text-white dark:bg-gray-900 dark:border-white/20']) }}
 >
     <svg
-        class="mr-1.5 h-2 w-2"
+        class="size-2"
         fill="{{ $channel->parent_id ? $channel->parent->color : $channel->color }}"
         viewBox="0 0 8 8"
     >
diff --git a/resources/views/components/forum/thread-overview.blade.php b/resources/views/components/forum/thread-overview.blade.php
index ed4f9698..0e392e75 100644
--- a/resources/views/components/forum/thread-overview.blade.php
+++ b/resources/views/components/forum/thread-overview.blade.php
@@ -2,112 +2,64 @@
     'thread',
 ])
 
-<div class="rounded-lg bg-skin-card px-4 py-6 shadow sm:p-6">
-    <article aria-labelledby="question-title-{{ $thread->id }}">
-        <div>
-            <div class="lg:flex lg:space-x-3">
-                <div class="flex flex-1 items-center space-x-3">
-                    <div class="shrink-0">
-                        <x-user.avatar :user="$thread->user" class="size-8" />
-                    </div>
-                    <div class="min-w-0 flex-1">
-                        <p class="text-sm font-medium text-gray-900">
-                            <a href="{{ route('profile', $thread->user->username) }}" class="group block">
-                                <span class="group-hover:underline">{{ $thread->user->name }}</span>
-                                <span class="text-skin-muted">{{ '@' . $thread->user->username }}</span>
-                            </a>
-                        </p>
-                        <p class="text-sm text-gray-500 dark:text-gray-400">
-                            <time-ago time="{{ $thread->created_at->getTimestamp() }}" />
-                        </p>
-                    </div>
-                </div>
-                <div class="mt-2 shrink-0 self-center lg:mt-0">
-                    @if (count($channels = $thread->channels->load('parent')))
-                        <div class="mt-2 flex flex-wrap gap-2 lg:mt-0 lg:gap-x-3">
-                            @foreach ($channels as $channel)
-                                <x-link href="{{ route('forum.channels', $channel) }}" class="flex gap-2">
-                                    <x-forum.channel :channel="$channel" />
-                                </x-link>
-                            @endforeach
-                        </div>
-                    @endif
-                </div>
-            </div>
-            <h2 id="question-title-{{ $thread->id }}" class="mt-4 text-base font-medium text-gray-900">
-                <a href="{{ route('forum.show', $thread) }}" class="hover:underline">{{ $thread->subject() }}</a>
-            </h2>
+<article class="rounded-xl cursor-pointer bg-white p-4 ring-1 ring-inset ring-gray-100 dark:bg-gray-800 dark:ring-white/10 lg:py-5 lg:px-6" aria-labelledby="{{ $thread->slug }}">
+    @if (count($channels = $thread->channels->load('parent')))
+        <div class="hidden mb-2 lg:flex flex-wrap lg:gap-1.5">
+            @foreach ($channels as $channel)
+                <x-link href="{{ route('forum.channels', $channel) }}" class="flex gap-2">
+                    <x-forum.channel :channel="$channel" class="text-xs" />
+                </x-link>
+            @endforeach
         </div>
-        <div class="mt-2 text-sm text-gray-700 dark:text-gray-300">
-            <a href="{{ route('forum.show', $thread) }}">{!! $thread->excerpt() !!}</a>
+    @endif
+
+    <div class="flex items-center gap-4">
+        <h2 id="question-title-{{ $thread->id }}" class="truncate font-medium text-gray-900 dark:text-white lg:text-xl">
+            <x-link :href="route('forum.show', $thread)" class="hover:underline">
+                {{ $thread->subject() }}
+            </x-link>
+        </h2>
+        @if ($thread->isSolved())
+            <x-link
+                :href="route('forum.show', $thread->slug). '#' .$thread->solution_reply_id"
+                class="inline-flex items-center rounded-xl gap-2 font-medium bg-green-50 ring-1 ring-green-200 text-green-700"
+            >
+                <x-untitledui-check-verified class="size-5" stroke-width="1.5" aria-hidden="true" />
+                <span class="text-xs">{{ __('pages/forum.navigation.solve') }}</span>
+            </x-link>
+        @endif
+    </div>
+
+    <div class="mt-2 text-sm text-gray-700 line-clamp-2 dark:text-gray-300">
+        <x-link :href="route('forum.show', $thread)">{!! $thread->excerpt() !!}</x-link>
+    </div>
+
+    <div class="mt-6 flex justify-between space-x-8">
+        <div class="flex items-center gap-2">
+            <x-link :href="route('profile', $thread->user->username)" class="group inline-flex items-center gap-1 shrink-0">
+                <x-user.avatar :user="$thread->user" class="size-6" />
+                <span class="font-medium text-sm text-gray-700 group-hover:underline dark:text-gray-300">
+                    {{ '@' . $thread->user->username }}
+                </span>
+            </x-link>
+            <span aria-hidden="true">·</span>
+            <span class="text-sm text-gray-500 dark:text-gray-400">
+                <time-ago time="{{ $thread->created_at->getTimestamp() }}" />
+            </span>
         </div>
-        <div class="mt-6 flex justify-between space-x-8">
-            <div class="flex items-center space-x-4">
-                <livewire:reactions :model="$thread" :with-place-holder="false" :with-background="false" />
-                <p class="inline-flex space-x-2 text-sm text-gray-500 dark:text-gray-400">
-                    <svg
-                        xmlns="http://www.w3.org/2000/svg"
-                        fill="none"
-                        viewBox="0 0 24 24"
-                        stroke-width="1.5"
-                        stroke="currentColor"
-                        class="size-5"
-                    >
-                        <path
-                            stroke-linecap="round"
-                            stroke-linejoin="round"
-                            d="M7.5 8.25h9m-9 3H12m-9.75 1.51c0 1.6 1.123 2.994 2.707 3.227 1.129.166 2.27.293 3.423.379.35.026.67.21.865.501L12 21l2.755-4.133a1.14 1.14 0 01.865-.501 48.172 48.172 0 003.423-.379c1.584-.233 2.707-1.626 2.707-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0012 3c-2.392 0-4.744.175-7.043.513C3.373 3.746 2.25 5.14 2.25 6.741v6.018z"
-                        />
-                    </svg>
-                    <span class="text-gray-700 dark:text-gray-300">{{ count($thread->replies) }}</span>
-                    <span class="sr-only">{{ __('réponses') }}</span>
-                </p>
-                <p class="inline-flex space-x-2 text-sm text-gray-500 dark:text-gray-400">
-                    <svg
-                        xmlns="http://www.w3.org/2000/svg"
-                        fill="none"
-                        viewBox="0 0 24 24"
-                        stroke-width="1.5"
-                        stroke="currentColor"
-                        class="size-5"
-                    >
-                        <path
-                            stroke-linecap="round"
-                            stroke-linejoin="round"
-                            d="M2.036 12.322a1.012 1.012 0 010-.639C3.423 7.51 7.36 4.5 12 4.5c4.638 0 8.573 3.007 9.963 7.178.07.207.07.431 0 .639C20.577 16.49 16.64 19.5 12 19.5c-4.638 0-8.573-3.007-9.963-7.178z"
-                        />
-                        <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
-                    </svg>
-                    <span class="text-gray-700 dark:text-gray-300">{{ $thread->views_count }}</span>
-                    <span class="sr-only">{{ __('vues') }}</span>
-                </p>
-            </div>
-            <div class="flex text-sm">
-                <p class="inline-flex items-center space-x-3 text-sm">
-                    @if ($thread->isSolved())
-                        <a
-                            href="{{ route('forum.show', $thread->slug) }}#{{ $thread->solution_reply_id }}"
-                            class="flex items-center gap-x-2 font-medium text-green-500"
-                        >
-                            <svg
-                                xmlns="http://www.w3.org/2000/svg"
-                                fill="none"
-                                viewBox="0 0 24 24"
-                                stroke-width="1.5"
-                                stroke="currentColor"
-                                class="size-5"
-                            >
-                                <path
-                                    stroke-linecap="round"
-                                    stroke-linejoin="round"
-                                    d="M9 12.75L11.25 15 15 9.75M21 12c0 1.268-.63 2.39-1.593 3.068a3.745 3.745 0 01-1.043 3.296 3.745 3.745 0 01-3.296 1.043A3.745 3.745 0 0112 21c-1.268 0-2.39-.63-3.068-1.593a3.746 3.746 0 01-3.296-1.043 3.745 3.745 0 01-1.043-3.296A3.745 3.745 0 013 12c0-1.268.63-2.39 1.593-3.068a3.745 3.745 0 011.043-3.296 3.746 3.746 0 013.296-1.043A3.746 3.746 0 0112 3c1.268 0 2.39.63 3.068 1.593a3.746 3.746 0 013.296 1.043 3.746 3.746 0 011.043 3.296A3.745 3.745 0 0121 12z"
-                                />
-                            </svg>
-                            <span class="hover:underline">{{ __('Résolu') }}</span>
-                        </a>
-                    @endif
-                </p>
-            </div>
+
+        <div class="flex items-center gap-2">
+            <p class="inline-flex items-center gap-1 text-sm">
+                <x-untitledui-message-text-square-02 class="size-5 text-gray-400 dark:text-gray-500" stroke-width="1.5" aria-hidden="true" />
+                <span class="text-gray-500 dark:text-gray-400">{{ count($thread->replies) }}</span>
+                <span class="sr-only">{{ __('global.answers') }}</span>
+            </p>
+
+            <p class="inline-flex items-center gap-1 text-sm">
+                <x-untitledui-eye class="size-5 text-gray-400 dark:text-gray-500" stroke-width="1.5" aria-hidden="true" />
+                <span class="text-gray-500 dark:text-gray-400">{{ $thread->views_count }}</span>
+                <span class="sr-only">{{ __('global.views') }}</span>
+            </p>
         </div>
-    </article>
-</div>
+    </div>
+</article>
diff --git a/resources/views/components/guirlandes.blade.php b/resources/views/components/guirlandes.blade.php
deleted file mode 100644
index aaeffd64..00000000
--- a/resources/views/components/guirlandes.blade.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<div
-    class="guirlande -top-8 h-[120px]"
-    style="background: url('{{ asset('/images/guirlande1.png') }}') repeat-x 300% top"
-></div>
-<div
-    class="guirlande top-[-75px]"
-    style="background: url('{{ asset('/images/guirlande2.png') }}') repeat-x 70% top"
-></div>
-<div
-    class="guirlande top-[-50px]"
-    style="background: url('{{ asset('/images/guirlande3.png') }}') repeat-x 10% top"
-></div>
diff --git a/resources/views/components/layouts/footer.blade.php b/resources/views/components/layouts/footer.blade.php
index e6b5cf75..c8022351 100644
--- a/resources/views/components/layouts/footer.blade.php
+++ b/resources/views/components/layouts/footer.blade.php
@@ -1,103 +1,105 @@
-<footer class="bg-gray-900 lg:pt-8" aria-labelledby="footerHeading">
+<footer class="bg-gray-900 p-3" aria-labelledby="footerHeading">
     <h2 id="footerHeading" class="sr-only">{{ __('global.footer.title') }}</h2>
-    <div class="mx-auto max-w-7xl px-4 sm:px-6">
-        <div class="py-12 lg:grid lg:grid-cols-3 lg:gap-8 lg:py-16">
-            <div class="space-y-3">
-                <x-brand class="h-12 w-auto text-white sm:h-16" aria-hidden="true" />
-                <p class="inline-flex flex-wrap items-center text-gray-400 text-sm">
-                    <a href="https://github.com/caneco/laravel-country-logomarks" class="font-medium text-gray-300 underline">
-                        Laravel Country Logomarks
-                    </a>
-                    <span class="ml-1.5">{{ __('global.by') }} Caneco</span>
-                    <img
-                        class="ml-2 size-6 rounded-full"
-                        src="https://avatars.githubusercontent.com/u/502041"
-                        alt="Caneco avatar"
-                    />
-                </p>
-            </div>
-            <div class="mt-12 grid grid-cols-2 gap-8 lg:mt-0">
-                <div>
-                    <h3 class="text-sm font-semibold uppercase tracking-wider text-white">
-                        {{ __('global.footer.resources') }}
-                    </h3>
-                    <ul class="mt-6 space-y-3">
-                        <x-footer-link :title="__('global.navigation.about')" :url="route('about')" />
-                        <x-footer-link :title="__('global.navigation.sponsors')" :url="route('sponsors')" />
-                        <x-footer-link :title="__('global.navigation.snippets')" url="https://snippets.laravel.cm" />
-                        <x-footer-link
-                            :title="__('global.navigation.branding')"
-                            url="https://github.com/caneco/laravel-country-logomarks/blob/main/src/cm/README.md"
+    <div class="rounded-lg dark:bg-gray-800">
+        <x-container>
+            <div class="py-12 sm:py-16 lg:grid lg:grid-cols-3 lg:gap-8 lg:py-20">
+                <div class="space-y-3">
+                    <x-brand class="h-12 w-auto text-white sm:h-16" aria-hidden="true" />
+                    <p class="inline-flex flex-wrap items-center text-gray-400 text-sm">
+                        <a href="https://github.com/caneco/laravel-country-logomarks" class="font-medium text-gray-300 underline">
+                            Laravel Country Logomarks
+                        </a>
+                        <span class="ml-1.5">{{ __('global.by') }} Caneco</span>
+                        <img
+                            class="ml-2 size-6 rounded-full"
+                            src="https://avatars.githubusercontent.com/u/502041"
+                            alt="Caneco avatar"
                         />
-                    </ul>
-                </div>
-                <div>
-                    <h3 class="text-sm font-semibold uppercase tracking-wider text-white">
-                        {{ __('global.footer.legal') }}
-                    </h3>
-                    <ul class="mt-6 space-y-3">
-                        <x-footer-link :title="__('global.navigation.terms')" :url="route('terms')" />
-                        <x-footer-link :title="__('global.navigation.privacy')" :url="route('privacy')" />
-                        <x-footer-link :title="__('global.navigation.rules')" :url="route('rules')" />
-                        <x-footer-link :title="__('global.navigation.faq')" :url="route('faq')" />
-                    </ul>
-                </div>
-            </div>
-            <div class="mt-12 lg:mt-0">
-                <div class="sm:max-w-lg lg:max-w-none">
-                    <h3 class="text-sm font-semibold uppercase tracking-wider text-white">
-                        {{ __('global.joins_us.title') }}
-                    </h3>
-                    <p class="mt-6 text-sm text-gray-300">
-                        {{ __('global.joins_us.description') }}
                     </p>
                 </div>
-                <div class="mt-6 flex items-center text-sm font-medium space-x-4 sm:space-x-6">
-                    <x-link href="{{ route('discord') }}" class="inline-flex items-center gap-2 text-gray-300 hover:text-white">
-                        <x-icon.discord class="size-5 text-[#5865F2]" aria-hidden="true" />
-                        Discord
-                    </x-link>
-                    <x-link href="{{ route('telegram') }}" class="inline-flex items-center gap-2 text-gray-300 hover:text-white">
-                        <x-icon.telegram class="size-5 text-[#34AADF]" aria-hidden="true" />
-                        Telegram
-                    </x-link>
-                    <x-link href="{{ route('whatsapp') }}" class="inline-flex items-center gap-2 text-gray-300 hover:text-white">
-                        <x-icon.whatsapp class="size-5 text-[#28D146]" aria-hidden="true" />
-                        WhatsApp
-                    </x-link>
+                <div class="mt-12 grid grid-cols-2 gap-8 lg:mt-0">
+                    <div>
+                        <h3 class="text-sm font-semibold uppercase tracking-wider text-white">
+                            {{ __('global.footer.resources') }}
+                        </h3>
+                        <ul class="mt-6 space-y-3">
+                            <x-footer-link :title="__('global.navigation.about')" :url="route('about')" />
+                            <x-footer-link :title="__('global.navigation.sponsors')" :url="route('sponsors')" />
+                            <x-footer-link :title="__('global.navigation.snippets')" url="https://snippets.laravel.cm" />
+                            <x-footer-link
+                                :title="__('global.navigation.branding')"
+                                url="https://github.com/caneco/laravel-country-logomarks/blob/main/src/cm/README.md"
+                            />
+                        </ul>
+                    </div>
+                    <div>
+                        <h3 class="text-sm font-semibold uppercase tracking-wider text-white">
+                            {{ __('global.footer.legal') }}
+                        </h3>
+                        <ul class="mt-6 space-y-3">
+                            <x-footer-link :title="__('global.navigation.terms')" :url="route('terms')" />
+                            <x-footer-link :title="__('global.navigation.privacy')" :url="route('privacy')" />
+                            <x-footer-link :title="__('global.navigation.rules')" :url="route('rules')" />
+                            <x-footer-link :title="__('global.navigation.faq')" :url="route('faq')" />
+                        </ul>
+                    </div>
+                </div>
+                <div class="mt-12 lg:mt-0">
+                    <div class="sm:max-w-lg lg:max-w-none">
+                        <h3 class="text-sm font-semibold uppercase tracking-wider text-white">
+                            {{ __('global.joins_us.title') }}
+                        </h3>
+                        <p class="mt-6 text-sm text-gray-300">
+                            {{ __('global.joins_us.description') }}
+                        </p>
+                    </div>
+                    <div class="mt-6 flex items-center text-sm font-medium space-x-4 sm:space-x-6">
+                        <x-link href="https://discord.gg/KNp6brbyVD" class="inline-flex items-center gap-2 text-gray-300 hover:text-white">
+                            <x-icon.discord class="size-5 text-[#5865F2]" aria-hidden="true" />
+                            Discord
+                        </x-link>
+                        <x-link href="https://t.me/laravelcameroun" class="inline-flex items-center gap-2 text-gray-300 hover:text-white">
+                            <x-icon.telegram class="size-5 text-[#34AADF]" aria-hidden="true" />
+                            Telegram
+                        </x-link>
+                        <x-link href="https://chat.whatsapp.com/G8e98Ms0MgSLEOGd3Uai1i" class="inline-flex items-center gap-2 text-gray-300 hover:text-white">
+                            <x-icon.whatsapp class="size-5 text-[#28D146]" aria-hidden="true" />
+                            WhatsApp
+                        </x-link>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="border-t border-white/10 py-6 sm:flex sm:items-center sm:justify-between lg:py-8">
-            <p class="text-center text-sm leading-6 text-gray-400 lg:text-left">
-                {{ __('global.footer.copyright', ['date' => date('Y')]) }}
-            </p>
-            <div class="mt-4 flex items-center justify-center space-x-4 sm:mt-0 lg:justify-start">
-                <x-link href="{{ route('twitter') }}" class="text-gray-400 hover:text-gray-300">
-                    <span class="sr-only">Twitter</span>
-                    <x-icon.twitter class="size-5" aria-hidden="true" />
-                </x-link>
+            <div class="border-t border-white/10 py-6 sm:flex sm:items-center sm:justify-between lg:py-8">
+                <p class="text-center text-sm leading-6 text-gray-400 lg:text-left">
+                    {{ __('global.footer.copyright', ['date' => date('Y')]) }}
+                </p>
+                <div class="mt-4 flex items-center justify-center space-x-4 sm:mt-0 lg:justify-start">
+                    <x-link href="https://twitter.com/laravelcm" class="text-gray-400 hover:text-gray-300">
+                        <span class="sr-only">Twitter</span>
+                        <x-icon.twitter class="size-5" aria-hidden="true" />
+                    </x-link>
 
-                <x-link href="{{ route('facebook') }}" class="text-gray-400 hover:text-gray-300">
-                    <span class="sr-only">Facebook</span>
-                    <x-icon.facebook class="size-6" aria-hidden="true" />
-                </x-link>
+                    <x-link href="https://facebook.com/laravelcm" class="text-gray-400 hover:text-gray-300">
+                        <span class="sr-only">Facebook</span>
+                        <x-icon.facebook class="size-6" aria-hidden="true" />
+                    </x-link>
 
-                <x-link href="{{ route('linkedin') }}" class="text-gray-400 hover:text-gray-300">
-                    <span class="sr-only">LinkedIn</span>
-                    <x-icon.linkedin class="size-6" aria-hidden="true" />
-                </x-link>
+                    <x-link href="https://www.linkedin.com/company/laravel-cameroun" class="text-gray-400 hover:text-gray-300">
+                        <span class="sr-only">LinkedIn</span>
+                        <x-icon.linkedin class="size-6" aria-hidden="true" />
+                    </x-link>
 
-                <x-link href="{{ route('github') }}" class="text-gray-400 hover:text-gray-300">
-                    <span class="sr-only">GitHub</span>
-                    <x-icon.github class="size-6" aria-hidden="true" />
-                </x-link>
+                    <x-link href="https://github.com/laravelcm" class="text-gray-400 hover:text-gray-300">
+                        <span class="sr-only">GitHub</span>
+                        <x-icon.github class="size-6" aria-hidden="true" />
+                    </x-link>
 
-                <x-link href="{{ route('youtube') }}" class="text-gray-400 hover:text-gray-300">
-                    <span class="sr-only">YouTube</span>
-                    <x-icon.youtube class="size-6" aria-hidden="true" />
-                </x-link>
+                    <x-link href="https://www.youtube.com/channel/UCbQPQ8q31uQmuKtyRnATLSw" class="text-gray-400 hover:text-gray-300">
+                        <span class="sr-only">YouTube</span>
+                        <x-icon.youtube class="size-6" aria-hidden="true" />
+                    </x-link>
+                </div>
             </div>
-        </div>
+        </x-container>
     </div>
 </footer>
diff --git a/resources/views/components/nav-link.blade.php b/resources/views/components/nav-link.blade.php
deleted file mode 100644
index 39872f8e..00000000
--- a/resources/views/components/nav-link.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-@props([
-    'active',
-])
-
-@php
-    $classes =
-        $active ?? false
-            ? 'group flex items-center rounded-md bg-green-100 px-3 py-2 font-sans text-sm font-medium text-green-800 transition duration-150 ease-in-out'
-            : 'group flex items-center rounded-md px-3 py-2 font-sans text-sm font-medium text-gray-500 dark:text-gray-400 transition duration-150 ease-in-out hover:bg-skin-card';
-@endphp
-
-<a {{ $attributes->twMerge(['class' => $classes]) }}>
-    {{ $slot }}
-</a>
diff --git a/resources/views/components/nav/forum-link.blade.php b/resources/views/components/nav/forum-link.blade.php
new file mode 100644
index 00000000..8ef5740f
--- /dev/null
+++ b/resources/views/components/nav/forum-link.blade.php
@@ -0,0 +1,26 @@
+@props([
+    'active' => false,
+    'href' => '#',
+    'icon',
+])
+
+@php
+    $activeClasses = $active
+        ? 'ring-1 ring-gray-200 bg-gray-100 dark:bg-gray-800 dark:ring-white/10'
+        : 'text-gray-600 hover:text-gray-900 hover:bg-gray-100 dark:text-gray-400 dark:hover:bg-gray-800 dark:hover:text-white';
+@endphp
+
+<x-link
+    :href="$href"
+    {{ $attributes->class([
+        'group flex items-center gap-2 py-2 px-3 rounded-lg text-sm font-medium transition duration-200 ease-in-out',
+        $activeClasses
+    ]) }}
+>
+    @if($icon instanceof \Illuminate\View\ComponentAttributeBag)
+        {{ $icon }}
+    @else
+        @svg($icon, 'size-5 text-gray-400 dark:text-gray-500', ['stroke-width' => '1.5', 'aria-hidden' => true])
+    @endif
+    {{ $slot }}
+</x-link>
diff --git a/resources/views/components/section-header.blade.php b/resources/views/components/section-header.blade.php
index 9be5799b..33226faf 100644
--- a/resources/views/components/section-header.blade.php
+++ b/resources/views/components/section-header.blade.php
@@ -4,6 +4,6 @@
 ])
 
 <div>
-    <h3 class="font-heading font-bold text-xl leading-7 text-gray-900 sm:text-2xl">{{ $title }}</h3>
+    <h3 class="font-heading font-bold text-xl leading-7 text-gray-900 dark:text-white sm:text-2xl">{{ $title }}</h3>
     <p class="mt-2 leading-6 text-gray-500 dark:text-gray-400 sm:max-w-3xl sm:text-base">{{ $content }}</p>
 </div>
diff --git a/resources/views/components/skeleton.blade.php b/resources/views/components/skeleton.blade.php
index de953cc0..02b356af 100644
--- a/resources/views/components/skeleton.blade.php
+++ b/resources/views/components/skeleton.blade.php
@@ -1,11 +1,11 @@
-<div class="mx-auto w-full rounded-md border border-skin-base bg-skin-card p-4 shadow-sm">
+<div class="mx-auto w-full rounded-lg border border-gray-200 bg-white p-4 shadow-sm dark:bg-gray-900 dark:border-white/20">
     <div class="flex animate-pulse space-x-4">
         <div class="flex-1 space-y-4 py-1">
-            <div class="h-4 w-3/4 rounded bg-skin-card-muted"></div>
+            <div class="h-4 w-3/4 rounded-lg bg-gray-100 dark:bg-gray-800"></div>
             <div class="space-y-2">
-                <div class="h-4 rounded bg-skin-card-muted"></div>
-                <div class="h-4 w-5/6 rounded bg-skin-card-muted"></div>
-                <div class="h-4 w-5/6 rounded bg-skin-card-muted"></div>
+                <div class="h-4 rounded bg-gray-100 dark:bg-gray-800"></div>
+                <div class="h-4 w-5/6 rounded bg-gray-100 dark:bg-gray-800"></div>
+                <div class="h-4 w-5/6 rounded bg-gray-100 dark:bg-gray-800"></div>
             </div>
         </div>
     </div>
diff --git a/resources/views/components/soon.blade.php b/resources/views/components/soon.blade.php
deleted file mode 100644
index eef97e88..00000000
--- a/resources/views/components/soon.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-<span class="ml-2 inline-flex rounded-full bg-green-100 px-1.5 py-0.5 text-xs leading-4 text-green-800">Bientôt</span>
diff --git a/resources/views/faq.blade.php b/resources/views/faq.blade.php
index bb61ae99..c61efee7 100644
--- a/resources/views/faq.blade.php
+++ b/resources/views/faq.blade.php
@@ -68,7 +68,7 @@
                         </p>
                         <p>
                             Mais la communauté dispose aussi d'un groupe
-                            <a href="{{ route('telegram') }}">Telegram</a>
+                            <a href="https://t.me/laravelcameroun">Telegram</a>
                             et d'un groupe WhatsApp (limite par les règles de gestion de groupe de WhatsApp) qui sont
                             accessibles par tous.
                         </p>
@@ -264,7 +264,7 @@
                         </p>
                         <p>
                             Mais la communauté dispose aussi d'un groupe
-                            <a href="{{ route('telegram') }}">Telegram</a>
+                            <a href="https://t.me/laravelcameroun">Telegram</a>
                             et d'un groupe WhatsApp (limite par les règles de gestion de groupe de WhatsApp) qui sont
                             accessibles par tous.
                         </p>
@@ -487,7 +487,7 @@
                         </p>
                         <p>
                             Mais la communauté dispose aussi d'un groupe
-                            <a href="{{ route('telegram') }}">Telegram</a>
+                            <a href="https://t.me/laravelcameroun">Telegram</a>
                             et d'un groupe WhatsApp (limite par les règles de gestion de groupe de WhatsApp) qui sont
                             accessibles par tous.
                         </p>
diff --git a/resources/views/forum/index.blade.php b/resources/views/forum/index.blade.php
deleted file mode 100644
index e9c83f39..00000000
--- a/resources/views/forum/index.blade.php
+++ /dev/null
@@ -1,25 +0,0 @@
-@php(($subTitle = isset($channel) ? $channel->name : null))
-
-<x-app-layout :title="__('pages/forum.channel_title', ['channel' => isset($subTitle) ? ' ~ ' . $subTitle : ''])">
-    <x-container class="py-12">
-        <div class="relative lg:grid lg:grid-cols-9 lg:gap-8">
-            <div class="lg:col-span-2 lg:block">
-                @include('forum._channels')
-            </div>
-
-            <div class="mt-6 space-y-5 sm:mt-0 lg:col-span-7">
-                <x-status-message />
-
-                <div class="my-10 space-y-6 sm:space-y-5 lg:mb-32">
-                    @foreach ($threads as $thread)
-                        <x-forum.thread-overview :thread="$thread" />
-                    @endforeach
-
-                    <div class="mt-10">
-                        {{ $threads->links() }}
-                    </div>
-                </div>
-            </div>
-        </div>
-    </x-container>
-</x-app-layout>
diff --git a/resources/views/layouts/forum.blade.php b/resources/views/layouts/forum.blade.php
new file mode 100644
index 00000000..66dd0264
--- /dev/null
+++ b/resources/views/layouts/forum.blade.php
@@ -0,0 +1,47 @@
+<x-app-layout :title="$title ?? null">
+    <x-container class="py-12">
+        <div class="relative lg:grid lg:grid-cols-9 lg:gap-12">
+            <div class="lg:col-span-2 lg:block">
+                <nav class="sticky top-10 space-y-6">
+                    @isset($buttons)
+                        {{ $buttons }}
+                    @endisset
+
+                    <div class="space-y-2">
+                        <x-nav.forum-link icon="untitledui-file-02">
+                            {{ __('pages/forum.navigation.threads') }}
+                        </x-nav.forum-link>
+                        <x-nav.forum-link icon="untitledui-git-branch">
+                            {{ __('pages/forum.navigation.channels') }}
+                        </x-nav.forum-link>
+                        <x-nav.forum-link icon="untitledui-user-left">
+                            {{ __('pages/forum.navigation.me') }}
+                        </x-nav.forum-link>
+                        <x-nav.forum-link icon="untitledui-bell-ringing-03">
+                            {{ __('pages/forum.navigation.following') }}
+                        </x-nav.forum-link>
+                        <x-nav.forum-link icon="untitledui-heart">
+                            {{ __('pages/forum.navigation.popular') }}
+                        </x-nav.forum-link>
+                        <x-nav.forum-link icon="untitledui-check-verified">
+                            {{ __('pages/forum.navigation.solve') }}
+                        </x-nav.forum-link>
+                        <x-nav.forum-link icon="untitledui-help-circle">
+                            {{ __('pages/forum.navigation.unresolved') }}
+                        </x-nav.forum-link>
+                        <x-nav.forum-link icon="untitledui-message-x-square">
+                            {{ __('pages/forum.navigation.no_reply') }}
+                        </x-nav.forum-link>
+                        <x-nav.forum-link icon="untitledui-trophy-02">
+                            {{ __('pages/forum.navigation.leaderboard') }}
+                        </x-nav.forum-link>
+                    </div>
+                </nav>
+            </div>
+
+            <div class="mt-6 sm:mt-0 lg:col-span-7">
+                {{ $slot }}
+            </div>
+        </div>
+    </x-container>
+</x-app-layout>
diff --git a/resources/views/livewire/components/channels-selector.blade.php b/resources/views/livewire/components/channels-selector.blade.php
index d8fa2290..991367e5 100644
--- a/resources/views/livewire/components/channels-selector.blade.php
+++ b/resources/views/livewire/components/channels-selector.blade.php
@@ -49,7 +49,7 @@ class="absolute z-10 mt-1 w-60 rounded-lg bg-white dark:bg-gray-800 shadow-lg ri
                         @click="reset()"
                         class="flex items-center w-full py-2 px-4 text-gray-500 hover:text-gray-900 dark:text-gray-400 dark:hover:text-gray-300"
                     >
-                        {{ __('pages/forum.reset_channel') }}
+                        {{ __('global.reset') }}
                     </button>
                 </div>
             @endisset
diff --git a/resources/views/livewire/pages/forum/index.blade.php b/resources/views/livewire/pages/forum/index.blade.php
index 1ede0137..58bbb9a9 100644
--- a/resources/views/livewire/pages/forum/index.blade.php
+++ b/resources/views/livewire/pages/forum/index.blade.php
@@ -1,28 +1,42 @@
-<x-container class="py-12">
-    <div class="relative lg:grid lg:grid-cols-9 lg:gap-8">
-        <div class="lg:col-span-2 lg:block">
-            <nav class="space-y-6">
-                <x-buttons.primary :href="route('forum.new')" class="gap-2 justify-between">
-                    {{ __('pages/forum.new_thread') }}
-                    <x-untitledui-plus class="size-4" stroke-width="1.5" aria-hidden="true" />
-                </x-buttons.primary>
-            </nav>
-        </div>
+<div>
+    <x-slot:buttons>
+        <x-buttons.primary :href="route('forum.new')" class="gap-2 w-full justify-center py-2.5">
+            {{ __('pages/forum.new_thread') }}
+            <span class="absolute pointer-events-none right-0 pr-3">
+                <x-untitledui-plus class="size-5" aria-hidden="true" />
+            </span>
+        </x-buttons.primary>
+    </x-slot:buttons>
 
-        <div class="mt-6 sm:mt-0 lg:col-span-7">
-            <div class="flex items-center gap-6">
-                <livewire:components.channels-selector />
-            </div>
+    <div class="flex items-center justify-between gap-6">
+        <livewire:components.channels-selector />
+        <form wire:submit="launchSearch">
+            <x-filament::input.wrapper class="relative max-w-60 w-full">
+                <span class="pointer-events-none absolute top-2.5 left-0 pl-2.5">
+                    <x-untitledui-search-md class="size-4 text-gray-400 dark:text-gray-500" aria-hidden="true" />
+                </span>
+                <x-filament::input
+                    type="search"
+                    id="thread-search"
+                    name="search"
+                    class="pl-8"
+                    wire:model="search"
+                    aria-label="{{ __('global.search') }}"
+                    :placeholder="__('pages/forum.thread_search')"
+                />
+            </x-filament::input.wrapper>
+        </form>
+    </div>
 
-            <div class="mt-6 space-y-6 sm:space-y-5 lg:mb-32">
-                @foreach ($threads as $thread)
-                    <x-forum.thread-overview :thread="$thread" />
-                @endforeach
+    <div class="mt-6 lg:mb-12">
+        <div class="space-y-6">
+            @foreach ($threads as $thread)
+                <x-forum.thread-overview :thread="$thread" />
+            @endforeach
+        </div>
 
-                <div class="mt-10">
-                    {{ $threads->links() }}
-                </div>
-            </div>
+        <div class="mt-10">
+            {{ $threads->links() }}
         </div>
     </div>
-</x-container>
+</div>
diff --git a/resources/views/livewire/reactions.blade.php b/resources/views/livewire/reactions.blade.php
index cab17d54..b3a242fa 100644
--- a/resources/views/livewire/reactions.blade.php
+++ b/resources/views/livewire/reactions.blade.php
@@ -1,34 +1,25 @@
-<div class="relative" x-data="{ showReactions: false }">
+<div class="relative inline-flex items-center" x-data="{ showReactions: false }">
+    @php
+        $buttonClasses = 'inline-flex items-center justify-center size-6 rounded-full bg-white hover:bg-gray-100 dark:bg-gray-900 dark:hover:bg-white/10 focus:outline-none';
+    @endphp
+
     @if ($model->getReactionsSummary()->isEmpty())
         <button
             @click="showReactions = ! showReactions"
-            class="flex items-center text-sm leading-5 text-gray-500 dark:text-gray-400 hover:underline focus:outline-none focus:ring-0"
+            class="inline-flex items-center gap-2 text-sm leading-5 text-gray-500 dark:text-gray-400 hover:underline focus:outline-none"
         >
             @if ($withPlaceHolder)
-                Soyez le premier à réagir
+                {{ __('global.first_to_react') }}
             @endif
 
-            <svg
-                xmlns="http://www.w3.org/2000/svg"
-                fill="none"
-                viewBox="0 0 24 24"
-                stroke-width="1.5"
-                stroke="currentColor"
-                class="ml-1.5 size-5"
-            >
-                <path
-                    stroke-linecap="round"
-                    stroke-linejoin="round"
-                    d="M15.182 15.182a4.5 4.5 0 01-6.364 0M21 12a9 9 0 11-18 0 9 9 0 0118 0zM9.75 9.75c0 .414-.168.75-.375.75S9 10.164 9 9.75 9.168 9 9.375 9s.375.336.375.75zm-.375 0h.008v.015h-.008V9.75zm5.625 0c0 .414-.168.75-.375.75s-.375-.336-.375-.75.168-.75.375-.75.375.336.375.75zm-.375 0h.008v.015h-.008V9.75z"
-                />
-            </svg>
+            <x-untitledui-face-smile class="size-4" stroke-width="1.5" aria-hidden="true" />
         </button>
     @else
         <button
             @click="showReactions = ! showReactions"
             @class([
-                'relative flex h-8 cursor-pointer items-center justify-between',
-                'rounded-md rounded-md bg-skin-card px-3 py-2 shadow hover:bg-skin-card-muted' => $withBackground,
+                'relative flex items-center h-8 cursor-pointer items-center justify-between',
+                'rounded-lg bg-white px-3 py-2 shadow hover:bg-gray-50' => $withBackground,
             ])
         >
             <div class="flex items-center justify-center space-x-2">
@@ -56,70 +47,33 @@ class="size-4"
         x-transition:leave="transition duration-75 ease-in"
         x-transition:leave-start="scale-100 transform opacity-100"
         x-transition:leave-end="scale-95 transform opacity-0"
-        @class([
-            'absolute z-30 mt-4 w-56 origin-top rounded-md shadow-lg',
-            'left-0' => $direction === 'right',
-            'right-0' => $direction !== 'right',
-        ])
+        class="absolute z-30 left-6 w-auto origin-top-left"
         style="display: none"
     >
-        <div class="rounded-md bg-skin-card p-3 pt-4 shadow-lg">
-            <h5 class="ml-1 text-xs font-medium text-gray-500 dark:text-gray-400">Sélectionnez Une:</h5>
-            <div class="reactions no-load mt-2 grid grid-cols-4 gap-2">
-                <button
-                    type="button"
-                    class="col-span-1 flex size-8 cursor-pointer items-center justify-center rounded-md hover:bg-skin-card-muted focus:outline-none"
-                    wire:click="userReacted('clap')"
-                >
+        <div class="rounded-full bg-white ring-1 ring-inset ring-gray-100 px-3 py-1.5 dark:bg-gray-800 dark:ring-white/10">
+            <div class="reactions flex items-center gap-4">
+                <button type="button" class="{{ $buttonClasses }}" wire:click="userReacted('clap')">
                     <img src="{{ asset('/images/reactions/clap.svg') }}" class="size-5" alt="clap emoji" />
                 </button>
-                <button
-                    type="button"
-                    class="col-span-1 flex size-8 cursor-pointer items-center justify-center rounded-md hover:bg-skin-card-muted focus:outline-none"
-                    wire:click="userReacted('fire')"
-                >
+                <button type="button" class="{{ $buttonClasses }}" wire:click="userReacted('fire')">
                     <img src="{{ asset('/images/reactions/fire.svg') }}" class="size-5" alt="fire emoji" />
                 </button>
-                <button
-                    type="button"
-                    class="col-span-1 flex size-8 cursor-pointer items-center justify-center rounded-md hover:bg-skin-card-muted focus:outline-none"
-                    wire:click="userReacted('handshake')"
-                >
+                <button type="button" class="{{ $buttonClasses }}" wire:click="userReacted('handshake')">
                     <img src="{{ asset('/images/reactions/handshake.svg') }}" class="size-5" alt="handshake emoji" />
                 </button>
-                <button
-                    type="button"
-                    class="col-span-1 flex size-8 cursor-pointer items-center justify-center rounded-md hover:bg-skin-card-muted focus:outline-none"
-                    wire:click="userReacted('joy')"
-                >
+                <button type="button" class="{{ $buttonClasses }}" wire:click="userReacted('joy')">
                     <img src="{{ asset('/images/reactions/joy.svg') }}" class="size-5" alt="joy emoji" />
                 </button>
-                <button
-                    type="button"
-                    class="col-span-1 flex size-8 cursor-pointer items-center justify-center rounded-md hover:bg-skin-card-muted focus:outline-none"
-                    wire:click="userReacted('love')"
-                >
+                <button type="button" class="{{ $buttonClasses }}" wire:click="userReacted('love')">
                     <img src="{{ asset('/images/reactions/love.svg') }}" class="size-5" alt="love emoji" />
                 </button>
-                <button
-                    type="button"
-                    class="col-span-1 flex size-8 cursor-pointer items-center justify-center rounded-md hover:bg-skin-card-muted focus:outline-none"
-                    wire:click="userReacted('money')"
-                >
+                <button type="button" class="{{ $buttonClasses }}" wire:click="userReacted('money')">
                     <img src="{{ asset('/images/reactions/money.svg') }}" class="size-5" alt="money emoji" />
                 </button>
-                <button
-                    type="button"
-                    class="col-span-1 flex size-8 cursor-pointer items-center justify-center rounded-md hover:bg-skin-card-muted focus:outline-none"
-                    wire:click="userReacted('party')"
-                >
+                <button type="button" class="{{ $buttonClasses }}" wire:click="userReacted('party')">
                     <img src="{{ asset('/images/reactions/party.svg') }}" class="size-5" alt="party emoji" />
                 </button>
-                <button
-                    type="button"
-                    class="col-span-1 flex size-8 cursor-pointer items-center justify-center rounded-md hover:bg-skin-card-muted focus:outline-none"
-                    wire:click="userReacted('pray')"
-                >
+                <button type="button" class="{{ $buttonClasses }}" wire:click="userReacted('pray')">
                     <img src="{{ asset('/images/reactions/pray.svg') }}" class="size-5" alt="pray" />
                 </button>
             </div>
diff --git a/resources/views/sponsors/index.blade.php b/resources/views/sponsors/index.blade.php
index 4db3ec5c..d8a7aa6f 100644
--- a/resources/views/sponsors/index.blade.php
+++ b/resources/views/sponsors/index.blade.php
@@ -17,27 +17,27 @@
                             <div class="focus:outline-none">
                                 <p class="text-sm font-medium text-gray-900">Laravel Cameroun</p>
                                 <div class="mt-2 flex items-center space-x-4">
-                                    <a href="{{ route('twitter') }}" class="text-skin-muted hover:text-gray-500 dark:text-gray-400">
+                                    <a href="https://twitter.com/laravelcm" class="text-skin-muted hover:text-gray-500 dark:text-gray-400">
                                         <span class="sr-only">Twitter</span>
                                         <x-icon.twitter class="size-5" />
                                     </a>
 
-                                    <a href="{{ route('facebook') }}" class="text-skin-muted hover:text-gray-500 dark:text-gray-400">
+                                    <a href="https://facebook.com/laravelcm" class="text-skin-muted hover:text-gray-500 dark:text-gray-400">
                                         <span class="sr-only">Facebook</span>
                                         <x-icon.facebook class="size-5" />
                                     </a>
 
-                                    <a href="{{ route('linkedin') }}" class="text-skin-muted hover:text-gray-500 dark:text-gray-400">
+                                    <a href="https://www.linkedin.com/company/laravel-cameroun" class="text-skin-muted hover:text-gray-500 dark:text-gray-400">
                                         <span class="sr-only">LinkedIn</span>
                                         <x-icon.linkedin class="size-5" />
                                     </a>
 
-                                    <a href="{{ route('github') }}" class="text-skin-muted hover:text-gray-500 dark:text-gray-400">
+                                    <a href="https://github.com/laravelcm" class="text-skin-muted hover:text-gray-500 dark:text-gray-400">
                                         <span class="sr-only">Github</span>
                                         <x-icon.github class="size-5" />
                                     </a>
 
-                                    <a href="{{ route('youtube') }}" class="text-skin-muted hover:text-gray-500 dark:text-gray-400">
+                                    <a href="https://www.youtube.com/channel/UCbQPQ8q31uQmuKtyRnATLSw" class="text-skin-muted hover:text-gray-500 dark:text-gray-400">
                                         <span class="sr-only">YouTube</span>
                                         <x-icon.youtube class="size-5" />
                                     </a>
diff --git a/resources/views/vendor/blade-ui-kit/components/forms/inputs/email.blade.php b/resources/views/vendor/blade-ui-kit/components/forms/inputs/email.blade.php
deleted file mode 100644
index 05a5dd81..00000000
--- a/resources/views/vendor/blade-ui-kit/components/forms/inputs/email.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-<x-input name="{{ $name }}" type="email" :value="$value" {{ $attributes }} />
diff --git a/resources/views/vendor/blade-ui-kit/components/forms/inputs/input.blade.php b/resources/views/vendor/blade-ui-kit/components/forms/inputs/input.blade.php
deleted file mode 100644
index cd628689..00000000
--- a/resources/views/vendor/blade-ui-kit/components/forms/inputs/input.blade.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="{{ $attributes->get('container-class') }}">
-    <div class="{{ $attributes->get('container-input-class') }} relative">
-        @include('partials._leading-addons')
-
-        <input
-            name="{{ $name }}"
-            type="{{ $type }}"
-            id="{{ $id }}"
-            @if ($value)value="{{ $value }}"@endif
-            @if ($errors->has($name))aria-invalid="true"@endif
-            {{
-                $attributes->class([
-                    'block w-full rounded-md border-skin-input bg-skin-input text-gray-500 dark:text-gray-400 placeholder-skin-input shadow-sm focus:border-flag-green focus:placeholder-skin-input-focus focus:outline-none focus:ring-flag-green sm:text-sm',
-                    'block w-full min-w-0 flex-1 rounded-none rounded-r-md' => $attributes->get('leading-addon'),
-                    'pl-16 sm:pl-14' => $attributes->get('inline-addon'),
-                    'pl-10' => $attributes->get('leading-icon') || $attributes->get('isPhone'),
-                    'border-red-300 text-red-500 placeholder-red-300 focus:border-red-500 focus:outline-none focus:ring-red-500' => $errors->has($name),
-                ])
-            }}
-        />
-
-        @if ($errors->has($name))
-            <div class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-3">
-                <x-untitledui-alert-triangle class="size-5 text-red-500" />
-            </div>
-        @endif
-    </div>
-
-    @if ($errors->has($name))
-        @foreach ($errors->get($name) as $error)
-            <p class="mt-2 text-sm text-red-500">{{ $error }}</p>
-        @endforeach
-    @endif
-</div>
diff --git a/resources/views/vendor/blade-ui-kit/components/forms/inputs/password.blade.php b/resources/views/vendor/blade-ui-kit/components/forms/inputs/password.blade.php
deleted file mode 100644
index dbde5c9d..00000000
--- a/resources/views/vendor/blade-ui-kit/components/forms/inputs/password.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-<x-input name="{{ $name }}" type="password" {{ $attributes }} />
diff --git a/resources/views/vendor/blade-ui-kit/components/forms/inputs/textarea.blade.php b/resources/views/vendor/blade-ui-kit/components/forms/inputs/textarea.blade.php
deleted file mode 100644
index 261c9e35..00000000
--- a/resources/views/vendor/blade-ui-kit/components/forms/inputs/textarea.blade.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="relative">
-    <textarea
-        name="{{ $name }}"
-        id="{{ $id }}"
-        rows="{{ $rows }}"
-        {{
-            $attributes->merge([
-                'class' => 'bg-skin-input shadow-sm focus:border-flag-green focus:ring-flag-green mt-1 block w-full text-gray-500 dark:text-gray-400 focus:outline-none sm:text-sm font-normal border-skin-input rounded-md' . ($errors->has($name) ? ' border-red-300 text-red-900 placeholder-red-300 focus:ring-red-500 focus:border-red-500' : ''),
-            ])
-        }}
-    >
-{{ old($name, $slot) }}</textarea
-    >
-
-    @if ($errors->has($name))
-        <div class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-3">
-            <x-untitledui-alert-triangle class="size-5 text-red-500" />
-        </div>
-    @endif
-
-    @if ($errors->has($name))
-        @foreach ($errors->get($name) as $error)
-            <p class="mt-2 text-sm text-red-500">{{ $error }}</p>
-        @endforeach
-    @endif
-</div>
diff --git a/resources/views/vendor/blade-ui-kit/components/forms/label.blade.php b/resources/views/vendor/blade-ui-kit/components/forms/label.blade.php
deleted file mode 100644
index a69b2764..00000000
--- a/resources/views/vendor/blade-ui-kit/components/forms/label.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<label for="{{ $for }}" {{ $attributes->merge(['class' => 'block text-sm font-medium leading-5 text-gray-500 dark:text-gray-400']) }}>
-    {{ $slot->isNotEmpty() ? $slot : $fallback }}
-</label>
diff --git a/resources/views/vendor/livewire-ui-spotlight/.gitkeep b/resources/views/vendor/livewire-ui-spotlight/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/resources/views/vendor/livewire-ui-spotlight/spotlight.blade.php b/resources/views/vendor/livewire-ui-spotlight/spotlight.blade.php
deleted file mode 100644
index 73140ad4..00000000
--- a/resources/views/vendor/livewire-ui-spotlight/spotlight.blade.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<div>
-    @isset($jsPath)
-        <script>
-            {!! file_get_contents($jsPath) !!}
-        </script>
-    @endisset
-
-    @isset($cssPath)
-        <style>
-            {!! file_get_contents($cssPath) !!}
-        </style>
-    @endisset
-
-    <div
-        x-data="LivewireUISpotlight({
-                    componentId: '{{ $this->id }}',
-                    placeholder: '{{ trans("livewire-ui-spotlight::spotlight.placeholder") }}',
-                    commands: {{ $commands }},
-                })"
-        x-init="init()"
-        x-show="isOpen"
-        x-cloak
-        @foreach (config("livewire-ui-spotlight.shortcuts") as $key)
-            @keydown.window.prevent.cmd.
-            {{ $key }}="toggleOpen()"
-            @keydown.window.prevent.ctrl.{{ $key }}="toggleOpen()"
-        @endforeach
-        @keydown.window.escape="isOpen = false"
-        @toggle-spotlight.window="toggleOpen()"
-        class="fixed inset-0 z-50 flex items-start justify-center px-4 pt-16 sm:pt-24"
-    >
-        <div
-            x-show="isOpen"
-            x-transition:enter="duration-200 ease-out"
-            x-transition:enter-start="opacity-0"
-            x-transition:enter-end="opacity-100"
-            x-transition:leave="duration-150 ease-in"
-            x-transition:leave-start="opacity-100"
-            x-transition:leave-end="opacity-0"
-            class="fixed inset-0 backdrop-blur-sm backdrop-filter transition-opacity"
-        >
-            <div class="absolute inset-0 bg-gray-900 opacity-70"></div>
-        </div>
-        <div
-            x-show="isOpen && filteredItems().length <= 0"
-            x-transition:enter="delay-200 duration-300 ease-out"
-            x-transition:enter-start="-translate-y-12 opacity-0"
-            x-transition:enter-end="translate-y-0 opacity-100"
-            x-transition:leave="duration-150 ease-in"
-            x-transition:leave-start="translate-y-0 opacity-50"
-            x-transition:leave-end="scale-95 opacity-0"
-            class="fixed flex h-auto w-full transform items-center justify-center px-4 pt-16 text-gray-300 transition-all sm:px-0 sm:pt-24"
-        >
-            <template x-if="
-                inputPlaceholder ==
-                    '{{ trans("livewire-ui-spotlight::spotlight.placeholder") }}'
-            ">
-                <div class="w-full max-w-lg">
-                    <div class="overflow-hidden rounded-lg bg-gray-100 bg-opacity-20 shadow-xl">
-                        <div class="flex items-center p-5">
-                            <div class="px-2 text-sm text-gray-200">Tapez</div>
-                            <div class="rounded-lg bg-gray-900 px-3 py-1.5 text-xs font-medium uppercase text-gray-100">
-                                Article
-                            </div>
-                            <div class="px-2 text-sm text-gray-200">pour rechercher dans les articles</div>
-                        </div>
-                        <div class="h-0 w-full border-b border-gray-300 opacity-20"></div>
-                        <div class="flex items-center p-5">
-                            <div class="px-2 text-sm text-gray-200">Tapez</div>
-                            <div class="rounded-lg bg-gray-900 px-3 py-1.5 text-xs font-medium uppercase text-gray-100">
-                                Discussion
-                            </div>
-                            <div class="px-2 text-sm text-gray-200">pour rechercher dans les discussions</div>
-                        </div>
-                        <div class="h-0 w-full border-b border-gray-300 opacity-20"></div>
-                        <div class="flex items-center p-5">
-                            <div class="px-2 text-sm text-gray-200">Tapez</div>
-                            <div class="rounded-lg bg-gray-900 px-3 py-1.5 text-xs font-medium uppercase text-gray-100">
-                                Sujet
-                            </div>
-                            <div class="px-2 text-sm text-gray-200">pour rechercher un sujet dans le forum</div>
-                        </div>
-                        <div class="h-0 w-full border-b border-gray-300 opacity-20"></div>
-                        <div class="flex items-center p-5">
-                            <div class="px-2 text-sm text-gray-200">Tapez</div>
-                            <div class="rounded-lg bg-gray-900 px-3 py-1.5 text-xs font-medium uppercase text-gray-100">
-                                User
-                            </div>
-                            <div class="px-2 text-sm text-gray-200">pour rechercher un utilisateur spécifique</div>
-                        </div>
-                    </div>
-                    <div class="mt-5 px-2 text-center text-xs text-gray-200 opacity-50">
-                        ou, tapez une section pour accéder rapidement à cette page.
-                    </div>
-                </div>
-            </template>
-            <template x-if="
-                inputPlaceholder !=
-                    '{{ trans("livewire-ui-spotlight::spotlight.placeholder") }}'
-            ">
-                <div class="w-full max-w-lg rounded-lg bg-gray-100 bg-opacity-10 p-5 shadow-xl">
-                    <span>Suivant,</span>
-                    <span x-text="inputPlaceholder" class="lowercase"></span>
-                </div>
-            </template>
-        </div>
-
-        <div
-            @click.outside="isOpen = false"
-            x-show="isOpen"
-            x-transition:enter="duration-200 ease-out"
-            x-transition:enter-start="scale-95 opacity-0"
-            x-transition:enter-end="scale-100 opacity-100"
-            x-transition:leave="duration-150 ease-in"
-            x-transition:leave-start="scale-100 opacity-100"
-            x-transition:leave-end="scale-95 opacity-0"
-            class="relative w-full max-w-lg transform overflow-hidden rounded-lg bg-gray-900 shadow-xl transition-all"
-        >
-            <div class="relative">
-                <div class="absolute right-5 flex h-full items-center">
-                    <svg
-                        class="size-5 animate-spin text-white"
-                        xmlns="http://www.w3.org/2000/svg"
-                        fill="none"
-                        viewBox="0 0 24 24"
-                        wire:loading.delay
-                    >
-                        <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4" />
-                        <path
-                            class="opacity-75"
-                            fill="currentColor"
-                            d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
-                        />
-                    </svg>
-                </div>
-                <input
-                    @keydown.tab.prevent=""
-                    @keydown.prevent.stop.enter="go()"
-                    @keydown.prevent.arrow-up="selectUp()"
-                    @keydown.prevent.arrow-down="selectDown()"
-                    x-ref="input"
-                    x-model="input"
-                    type="text"
-                    style="caret-color: #6b7280; border: 0 !important"
-                    class="w-full appearance-none bg-transparent px-6 py-4 text-lg text-gray-300 placeholder-gray-500 outline-none focus:border-0 focus:border-transparent focus:shadow-none focus:outline-none"
-                    x-bind:placeholder="inputPlaceholder"
-                />
-            </div>
-            <div class="border-t border-gray-800" x-show="filteredItems().length > 0" style="display: none">
-                <ul x-ref="results" style="max-height: 265px" class="overflow-y-auto">
-                    <template x-for="(item, i) in filteredItems()" :key>
-                        <li>
-                            <button
-                                @click="go(item[0].item.id)"
-                                class="block w-full px-6 py-3 text-left"
-                                :class="{ 'bg-gray-700': selected === i, 'hover:bg-gray-800': selected !== i }"
-                            >
-                                <span
-                                    x-text="item[0].item.name"
-                                    :class="{'text-gray-300': selected !== i, 'text-white': selected === i }"
-                                ></span>
-                                <span
-                                    x-text="item[0].item.description"
-                                    class="ml-1 font-normal"
-                                    :class="{'text-gray-500': selected !== i, 'text-gray-400': selected === i }"
-                                ></span>
-                            </button>
-                        </li>
-                    </template>
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/vendor/livewire/simple-tailwind.blade.php b/resources/views/vendor/livewire/simple-tailwind.blade.php
index f5c4e1ad..ccf676db 100644
--- a/resources/views/vendor/livewire/simple-tailwind.blade.php
+++ b/resources/views/vendor/livewire/simple-tailwind.blade.php
@@ -18,7 +18,7 @@
                 {{-- Previous Page Link --}}
                 @if ($paginator->onFirstPage())
                     <span
-                        class="relative inline-flex cursor-default items-center rounded-md border border-skin-input bg-skin-card px-4 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400"
+                        class="relative inline-flex cursor-default items-center rounded-lg border border-gray-200 dark:border-white/10 bg-white dark:bg-gray-800 px-4 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400"
                     >
                         {!! __('pagination.previous') !!}
                     </span>
@@ -31,7 +31,7 @@ class="relative inline-flex cursor-default items-center rounded-md border border
                             wire:click="setPage('{{ $paginator->previousCursor()->encode() }}','{{ $paginator->getCursorName() }}')"
                             x-on:click="{{ $scrollIntoViewJsSnippet }}"
                             wire:loading.attr="disabled"
-                            class="focus:shadow-outline-green relative inline-flex items-center rounded-md border border-skin-input bg-skin-card px-4 py-2 text-sm font-medium leading-5 text-gray-900 transition duration-150 ease-in-out hover:text-gray-500 dark:text-gray-400 focus:border-green-300 focus:outline-none active:bg-skin-footer"
+                            class="focus:shadow-outline-green relative inline-flex items-center rounded-lg border border-gray-200 dark:border-white/10 bg-white dark:bg-gray-800 px-4 py-2 text-sm font-medium leading-5 text-gray-900 transition duration-150 ease-in-out hover:text-gray-500 dark:text-gray-400 focus:border-green-300 focus:outline-none active:bg-skin-footer"
                         >
                             {!! __('pagination.previous') !!}
                         </button>
@@ -42,7 +42,7 @@ class="focus:shadow-outline-green relative inline-flex items-center rounded-md b
                             x-on:click="{{ $scrollIntoViewJsSnippet }}"
                             wire:loading.attr="disabled"
                             dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}"
-                            class="focus:shadow-outline-green relative inline-flex items-center rounded-md border border-skin-input bg-skin-card px-4 py-2 text-sm font-medium leading-5 text-gray-900 transition duration-150 ease-in-out hover:text-gray-500 dark:text-gray-400 focus:border-green-300 focus:outline-none active:bg-skin-footer"
+                            class="focus:shadow-outline-green relative inline-flex items-center rounded-lg border border-gray-200 dark:border-white/10 bg-white dark:bg-gray-800 px-4 py-2 text-sm font-medium leading-5 text-gray-900 transition duration-150 ease-in-out hover:text-gray-500 dark:text-gray-400 focus:border-green-300 focus:outline-none active:bg-skin-footer"
                         >
                             {!! __('pagination.previous') !!}
                         </button>
@@ -61,7 +61,7 @@ class="focus:shadow-outline-green relative inline-flex items-center rounded-md b
                             wire:click="setPage('{{ $paginator->nextCursor()->encode() }}','{{ $paginator->getCursorName() }}')"
                             x-on:click="{{ $scrollIntoViewJsSnippet }}"
                             wire:loading.attr="disabled"
-                            class="focus:shadow-outline-green relative inline-flex items-center rounded-md border border-skin-input bg-skin-card px-4 py-2 text-sm font-medium leading-5 text-gray-900 transition duration-150 ease-in-out hover:text-gray-500 dark:text-gray-400 focus:border-green-300 focus:outline-none active:bg-skin-footer"
+                            class="focus:shadow-outline-green relative inline-flex items-center rounded-lg border border-gray-200 dark:border-white/10 bg-white dark:bg-gray-800 px-4 py-2 text-sm font-medium leading-5 text-gray-900 transition duration-150 ease-in-out hover:text-gray-500 dark:text-gray-400 focus:border-green-300 focus:outline-none active:bg-skin-footer"
                         >
                             {!! __('pagination.next') !!}
                         </button>
@@ -72,14 +72,14 @@ class="focus:shadow-outline-green relative inline-flex items-center rounded-md b
                             x-on:click="{{ $scrollIntoViewJsSnippet }}"
                             wire:loading.attr="disabled"
                             dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}"
-                            class="focus:shadow-outline-green relative inline-flex items-center rounded-md border border-skin-input bg-skin-card px-4 py-2 text-sm font-medium leading-5 text-gray-900 transition duration-150 ease-in-out hover:text-gray-500 dark:text-gray-400 focus:border-green-300 focus:outline-none active:bg-skin-footer"
+                            class="focus:shadow-outline-green relative inline-flex items-center rounded-lg border border-gray-200 dark:border-white/10 bg-white dark:bg-gray-800 px-4 py-2 text-sm font-medium leading-5 text-gray-900 transition duration-150 ease-in-out hover:text-gray-500 dark:text-gray-400 focus:border-green-300 focus:outline-none active:bg-skin-footer"
                         >
                             {!! __('pagination.next') !!}
                         </button>
                     @endif
                 @else
                     <span
-                        class="relative inline-flex cursor-default items-center rounded-md border border-skin-input bg-skin-card px-4 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400"
+                        class="relative inline-flex cursor-default items-center rounded-lg border border-gray-200 dark:border-white/10 bg-white dark:bg-gray-800 px-4 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400"
                     >
                         {!! __('pagination.next') !!}
                     </span>
diff --git a/resources/views/vendor/livewire/tailwind.blade.php b/resources/views/vendor/livewire/tailwind.blade.php
index f92e630b..29b5e92d 100644
--- a/resources/views/vendor/livewire/tailwind.blade.php
+++ b/resources/views/vendor/livewire/tailwind.blade.php
@@ -18,7 +18,7 @@
                 <span>
                     @if ($paginator->onFirstPage())
                         <span
-                            class="relative inline-flex cursor-default items-center rounded-md border border-skin-input bg-skin-card px-4 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400"
+                            class="relative inline-flex cursor-default items-center rounded-lg border border-gray-200 dark:border-white/10 bg-white dark:bg-gray-800 px-4 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400"
                         >
                             {!! __('pagination.previous') !!}
                         </span>
@@ -29,7 +29,7 @@ class="relative inline-flex cursor-default items-center rounded-md border border
                             x-on:click="{{ $scrollIntoViewJsSnippet }}"
                             wire:loading.attr="disabled"
                             dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.before"
-                            class="focus:shadow-outline-green relative inline-flex items-center rounded-md border border-skin-input bg-skin-card px-4 py-2 text-sm font-medium leading-5 text-gray-700 transition duration-150 ease-in-out hover:text-gray-500 dark:text-gray-400 focus:border-green-300 focus:outline-none active:bg-skin-footer"
+                            class="focus:shadow-outline-green relative inline-flex items-center rounded-lg border border-gray-200 dark:border-white/10 bg-white dark:bg-gray-800 px-4 py-2 text-sm font-medium leading-5 text-gray-700 transition duration-150 ease-in-out hover:text-gray-500 dark:text-gray-400 focus:border-green-300 focus:outline-none active:bg-skin-footer"
                         >
                             {!! __('pagination.previous') !!}
                         </button>
@@ -44,13 +44,13 @@ class="focus:shadow-outline-green relative inline-flex items-center rounded-md b
                             x-on:click="{{ $scrollIntoViewJsSnippet }}"
                             wire:loading.attr="disabled"
                             dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.before"
-                            class="focus:shadow-outline-green relative ml-3 inline-flex items-center rounded-md border border-skin-input bg-skin-card px-4 py-2 text-sm font-medium leading-5 text-gray-700 transition duration-150 ease-in-out hover:text-gray-500 dark:text-gray-400 focus:border-green-300 focus:outline-none active:bg-skin-footer"
+                            class="focus:shadow-outline-green relative ml-3 inline-flex items-center rounded-lg border border-gray-200 dark:border-white/10 bg-white dark:bg-gray-800 px-4 py-2 text-sm font-medium leading-5 text-gray-700 transition duration-150 ease-in-out hover:text-gray-500 dark:text-gray-400 focus:border-green-300 focus:outline-none active:bg-skin-footer"
                         >
                             {!! __('pagination.next') !!}
                         </button>
                     @else
                         <span
-                            class="relative ml-3 inline-flex cursor-default items-center rounded-md border border-skin-input bg-skin-card px-4 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400"
+                            class="relative ml-3 inline-flex cursor-default items-center rounded-lg border border-gray-200 dark:border-white/10 bg-white dark:bg-gray-800 px-4 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400"
                         >
                             {!! __('pagination.next') !!}
                         </span>
@@ -61,25 +61,24 @@ class="relative ml-3 inline-flex cursor-default items-center rounded-md border b
             <div class="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
                 <div>
                     <p class="font-sans text-sm leading-5 text-gray-500 dark:text-gray-400">
-                        <span>{!! __('Affichage de') !!}</span>
+                        <span>{!! __('pagination.showing') !!}</span>
                         <span class="font-medium">{{ $paginator->firstItem() }}</span>
-                        <span>{!! __('à') !!}</span>
+                        <span>{!! __('pagination.to') !!}</span>
                         <span class="font-medium">{{ $paginator->lastItem() }}</span>
-                        <span>{!! __('sur') !!}</span>
+                        <span>{!! __('pagination.of') !!}</span>
                         <span class="font-medium">{{ $paginator->total() }}</span>
-                        <span>{!! __('résultats') !!}</span>
+                        <span>{!! __('pagination.results') !!}</span>
                     </p>
                 </div>
 
                 <div>
-                    <span class="relative z-0 inline-flex rounded-md shadow-sm">
+                    <span class="relative z-0 inline-flex rounded-lg shadow-sm">
                         <span>
                             {{-- Previous Page Link --}}
-
                             @if ($paginator->onFirstPage())
                                 <span aria-disabled="true" aria-label="{{ __('pagination.previous') }}">
                                     <span
-                                        class="relative inline-flex cursor-default items-center rounded-l-md border border-skin-input bg-skin-card px-2 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400"
+                                        class="relative inline-flex cursor-default items-center rounded-l-lg border border-gray-200 dark:border-white/10 bg-white dark:bg-gray-800 px-2 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400"
                                         aria-hidden="true"
                                     >
                                         <svg class="size-5" fill="currentColor" viewBox="0 0 20 20">
@@ -98,7 +97,7 @@ class="relative inline-flex cursor-default items-center rounded-l-md border bord
                                     x-on:click="{{ $scrollIntoViewJsSnippet }}"
                                     dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.after"
                                     rel="prev"
-                                    class="focus:shadow-outline-green relative inline-flex items-center rounded-l-md border border-skin-input bg-skin-card px-2 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400 transition duration-150 ease-in-out hover:text-skin-muted focus:z-10 focus:border-green-300 focus:outline-none active:bg-skin-footer active:text-gray-500 dark:text-gray-400"
+                                    class="focus:shadow-outline-green relative inline-flex items-center rounded-l-lg border border-gray-200 dark:border-white/10 bg-white dark:bg-gray-800 px-2 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400 transition duration-150 ease-in-out hover:text-skin-muted focus:z-10 focus:border-green-300 focus:outline-none active:bg-skin-footer active:text-gray-500 dark:text-gray-400"
                                     aria-label="{{ __('pagination.previous') }}"
                                 >
                                     <svg class="size-5" fill="currentColor" viewBox="0 0 20 20">
@@ -118,7 +117,7 @@ class="focus:shadow-outline-green relative inline-flex items-center rounded-l-md
                             @if (is_string($element))
                                 <span aria-disabled="true">
                                     <span
-                                        class="relative -ml-px inline-flex cursor-default items-center border border-skin-input bg-skin-card px-4 py-2 text-sm font-medium leading-5 text-gray-700"
+                                        class="relative -ml-px inline-flex cursor-default items-center border border-gray-200 dark:border-white/10 bg-white dark:bg-gray-800 px-4 py-2 text-sm font-medium leading-5 text-gray-700"
                                     >
                                         {{ $element }}
                                     </span>
@@ -132,7 +131,7 @@ class="relative -ml-px inline-flex cursor-default items-center border border-ski
                                         @if ($page == $paginator->currentPage())
                                             <span aria-current="page">
                                                 <span
-                                                    class="relative -ml-px inline-flex cursor-default items-center border border-skin-input bg-skin-card px-4 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400"
+                                                    class="relative -ml-px inline-flex cursor-default items-center border border-gray-200 dark:border-white/10 bg-gray-100/40 dark:bg-gray-700 px-4 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400"
                                                 >
                                                     {{ $page }}
                                                 </span>
@@ -142,8 +141,8 @@ class="relative -ml-px inline-flex cursor-default items-center border border-ski
                                                 type="button"
                                                 wire:click="gotoPage({{ $page }}, '{{ $paginator->getPageName() }}')"
                                                 x-on:click="{{ $scrollIntoViewJsSnippet }}"
-                                                class="focus:shadow-outline-green relative -ml-px inline-flex items-center border border-skin-input bg-skin-card px-4 py-2 text-sm font-medium leading-5 text-gray-700 transition duration-150 ease-in-out hover:text-gray-500 dark:text-gray-400 focus:z-10 focus:border-green-300 focus:outline-none active:bg-skin-footer"
-                                                aria-label="{{ __('Aller à la page :page', ['page' => $page]) }}"
+                                                class="focus:shadow-outline-green relative -ml-px inline-flex items-center border border-gray-200 dark:border-white/10 bg-white dark:bg-gray-800 px-4 py-2 text-sm font-medium leading-5 text-gray-700 transition duration-150 ease-in-out hover:text-gray-500 dark:text-gray-400 focus:z-10 focus:border-green-300 focus:outline-none active:bg-skin-footer"
+                                                aria-label="{{ __('pagination.go_to_page', ['page' => $page]) }}"
                                             >
                                                 {{ $page }}
                                             </button>
@@ -155,7 +154,6 @@ class="focus:shadow-outline-green relative -ml-px inline-flex items-center borde
 
                         <span>
                             {{-- Next Page Link --}}
-
                             @if ($paginator->hasMorePages())
                                 <button
                                     type="button"
@@ -163,7 +161,7 @@ class="focus:shadow-outline-green relative -ml-px inline-flex items-center borde
                                     x-on:click="{{ $scrollIntoViewJsSnippet }}"
                                     dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.after"
                                     rel="next"
-                                    class="focus:shadow-outline-green relative -ml-px inline-flex items-center rounded-r-md border border-skin-input bg-skin-card px-2 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400 transition duration-150 ease-in-out hover:text-skin-muted focus:z-10 focus:border-green-300 focus:outline-none active:bg-skin-footer active:text-gray-500 dark:text-gray-400"
+                                    class="focus:shadow-outline-green relative -ml-px inline-flex items-center rounded-r-lg border border-gray-200 dark:border-white/10 bg-white dark:bg-gray-800 px-2 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400 transition duration-150 ease-in-out hover:text-skin-muted focus:z-10 focus:border-green-300 focus:outline-none active:bg-skin-footer active:text-gray-500 dark:text-gray-400"
                                     aria-label="{{ __('pagination.next') }}"
                                 >
                                     <svg class="size-5" fill="currentColor" viewBox="0 0 20 20">
@@ -177,7 +175,7 @@ class="focus:shadow-outline-green relative -ml-px inline-flex items-center round
                             @else
                                 <span aria-disabled="true" aria-label="{{ __('pagination.next') }}">
                                     <span
-                                        class="relative -ml-px inline-flex cursor-default items-center rounded-r-md border border-skin-input bg-skin-card px-2 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400"
+                                        class="relative -ml-px inline-flex cursor-default items-center rounded-r-lg border border-gray-200 dark:border-white/10 bg-white dark:bg-gray-800 px-2 py-2 text-sm font-medium leading-5 text-gray-500 dark:text-gray-400"
                                         aria-hidden="true"
                                     >
                                         <svg class="size-5" fill="currentColor" viewBox="0 0 20 20">
diff --git a/resources/views/vendor/mail/html/footer.blade.php b/resources/views/vendor/mail/html/footer.blade.php
index 6c637807..452a11ce 100644
--- a/resources/views/vendor/mail/html/footer.blade.php
+++ b/resources/views/vendor/mail/html/footer.blade.php
@@ -18,7 +18,7 @@
                         <tbody>
                             <tr>
                                 <td>
-                                    <a href="{{ route('facebook') }}" target="_blank">
+                                    <a href="https://facebook.com/laravelcm" target="_blank">
                                         <svg
                                             class="social-icon"
                                             fill="currentColor"
@@ -35,7 +35,7 @@ class="social-icon"
                                 </td>
                                 <td width="30" style="font-size: 1px; line-height: 1px"></td>
                                 <td>
-                                    <a href="{{ route('twitter') }}" target="_blank">
+                                    <a href="https://twitter.com/laravelcm" target="_blank">
                                         <svg
                                             class="social-icon"
                                             viewBox="0 0 1200 1227"
@@ -50,7 +50,7 @@ class="social-icon"
                                 </td>
                                 <td width="30" style="font-size: 1px; line-height: 1px"></td>
                                 <td>
-                                    <a href="{{ route('youtube') }}" target="_blank">
+                                    <a href="https://www.youtube.com/channel/UCbQPQ8q31uQmuKtyRnATLSw" target="_blank">
                                         <svg
                                             class="social-icon"
                                             fill="currentColor"
@@ -65,7 +65,7 @@ class="social-icon"
                                 </td>
                                 <td width="30" style="font-size: 1px; line-height: 1px"></td>
                                 <td>
-                                    <a href="{{ route('linkedin') }}" target="_blank">
+                                    <a href="https://www.linkedin.com/company/laravel-cameroun" target="_blank">
                                         <svg
                                             class="social-icon"
                                             fill="currentColor"
@@ -80,7 +80,7 @@ class="social-icon"
                                 </td>
                                 <td width="30" style="font-size: 1px; line-height: 1px"></td>
                                 <td>
-                                    <a href="{{ route('github') }}" target="_blank">
+                                    <a href="https://github.com/laravelcm" target="_blank">
                                         <svg
                                             class="social-icon"
                                             fill="currentColor"
@@ -97,7 +97,7 @@ class="social-icon"
                                 </td>
                                 <td width="30" style="font-size: 1px; line-height: 1px"></td>
                                 <td>
-                                    <a href="{{ route('telegram') }}" target="_blank">
+                                    <a href="https://t.me/laravelcameroun" target="_blank">
                                         <svg
                                             class="social-icon"
                                             fill="currentColor"
diff --git a/routes/web.php b/routes/web.php
index 6d4472b0..ec568836 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -82,21 +82,6 @@
 // Notifications
 Route::view('notifications', 'user.notifications')->name('notifications')->middleware('auth');
 
-// Redirect Route
-Route::redirectMap([
-    '.env' => 'https://www.youtube.com/watch?v=M8ogFbLP9XQ',
-    'wp-login' => 'https://www.youtube.com/watch?v=M8ogFbLP9XQ',
-    'wp-admin' => 'https://www.youtube.com/watch?v=M8ogFbLP9XQ',
-    'facebook' => 'https://facebook.com/laravelcm',
-    'twitter' => 'https://twitter.com/laravelcm',
-    'telegram' => 'https://t.me/laravelcameroun',
-    'linkedin' => 'https://www.linkedin.com/company/laravel-cameroun',
-    'github' => 'https://github.com/laravelcm',
-    'whatsapp' => 'https://chat.whatsapp.com/G8e98Ms0MgSLEOGd3Uai1i',
-    'discord' => 'https://discord.gg/KNp6brbyVD',
-    'youtube' => 'https://www.youtube.com/channel/UCbQPQ8q31uQmuKtyRnATLSw',
-]);
-
 Route::feeds();
 
 Route::get('sponsors', [SponsoringController::class, 'sponsors'])->name('sponsors');
diff --git a/tests/Feature/Actions/.gitkeep b/tests/Feature/Actions/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/Feature/Actions/Discussion/CreateDiscussionActionTest.php b/tests/Feature/Actions/Discussion/CreateDiscussionActionTest.php
index 39e8574f..0b8a95a4 100644
--- a/tests/Feature/Actions/Discussion/CreateDiscussionActionTest.php
+++ b/tests/Feature/Actions/Discussion/CreateDiscussionActionTest.php
@@ -6,8 +6,11 @@
 use App\Data\Discussion\CreateDiscussionData;
 use App\Models\Discussion;
 use App\Models\Tag;
+use Illuminate\Support\Facades\Notification;
 
 beforeEach(function (): void {
+    Notification::fake();
+
     $this->user = $this->login();
     $this->tagOne = Tag::factory()->create(['name' => 'Tag 1', 'concerns' => ['discussion']]);
     $this->tagTwo = Tag::factory()->create(['name' => 'Tag 2', 'concerns' => ['discussion', 'post']]);
diff --git a/tests/Feature/Article/SendTelegramNotificationTest.php b/tests/Feature/Article/SendTelegramNotificationTest.php
index ebf8d03f..d8981622 100644
--- a/tests/Feature/Article/SendTelegramNotificationTest.php
+++ b/tests/Feature/Article/SendTelegramNotificationTest.php
@@ -13,9 +13,9 @@
     $this->user = $this->login();
 });
 
-test('Send notification on telegram after submition on article', function (): void {
+test('Send notification on telegram after submission on article', function (): void {
+    Notification::fake();
 
-    // 2- soumission d'article par le user connecté
     $file = UploadedFile::fake()->image('article.png');
 
     $article = Livewire::actingAs($this->user)->test(Create::class)
@@ -30,10 +30,9 @@
         ->set('canonical_url', 'https://laravel.cm')
         ->call('store');
 
-    expect(Article::count())
+    expect(Article::query()->count())
         ->toBe(1);
 
-    // 3- Envois de la notification au modérateur sur un channel telegram
     if ($article->submitted_at) {
         Notification::assertSentTo(
             notifiable: $this->user,
@@ -42,5 +41,4 @@
     }
 
     Notification::assertCount(1);
-
 });
diff --git a/tests/Feature/Forum/DiscussionTest.php b/tests/Feature/Forum/DiscussionTest.php
index 796a0df4..9518fe55 100644
--- a/tests/Feature/Forum/DiscussionTest.php
+++ b/tests/Feature/Forum/DiscussionTest.php
@@ -44,7 +44,7 @@
         'subject_type' => 'discussion',
     ]);
 
-    $activity = Activity::first();
+    $activity = Activity::query()->first();
 
     $this->assertEquals($activity->subject->id, $discussion->id);
 
diff --git a/tests/Feature/Forum/ThreadTest.php b/tests/Feature/Forum/ThreadTest.php
index a04623b7..6ee45325 100644
--- a/tests/Feature/Forum/ThreadTest.php
+++ b/tests/Feature/Forum/ThreadTest.php
@@ -8,6 +8,7 @@
 use App\Models\Thread;
 use App\Models\User;
 use Carbon\Carbon;
+use Illuminate\Support\Collection;
 
 it('can find by slug', function (): void {
     Thread::factory()->create(['slug' => 'foo']);
@@ -47,7 +48,7 @@
         'subject_type' => 'thread',
     ]);
 
-    $activity = Activity::first();
+    $activity = Activity::query()->first();
 
     $this->assertEquals($activity->subject->id, $thread->id);
 
@@ -146,45 +147,3 @@
     // When providing a slug with invalid url characters, a random 5 character string is returned.
     expect($thread->slug())->toMatch('/\w{5}/');
 });
-
-// Helpers
-function createThreadFromToday(): Thread
-{
-    $today = Carbon::now();
-
-    return Thread::factory()->create(['created_at' => $today]);
-}
-
-function createThreadFromYesterday(): Thread
-{
-    $yesterday = Carbon::yesterday();
-
-    return Thread::factory()->create(['created_at' => $yesterday]);
-}
-
-function createThreadFromTwoDaysAgo(): Thread
-{
-    $twoDaysAgo = Carbon::now()->subDays(2);
-
-    return Thread::factory()->create(['created_at' => $twoDaysAgo]);
-}
-
-function createResolvedThread(): Thread
-{
-    $thread = createThreadFromToday();
-    $reply = Reply::factory()->create();
-    $user = User::factory()->create();
-    $thread->markSolution($reply, $user);
-
-    return $thread;
-}
-
-function createActiveThread(): Thread
-{
-    $thread = createThreadFromToday();
-    $reply = Reply::factory()->create();
-    $reply->to($thread);
-    $reply->save();
-
-    return $thread;
-}
diff --git a/tests/Feature/Livewire/DiscussionTest.php b/tests/Feature/Livewire/DiscussionTest.php
index a98f3721..5aa906dc 100644
--- a/tests/Feature/Livewire/DiscussionTest.php
+++ b/tests/Feature/Livewire/DiscussionTest.php
@@ -14,6 +14,8 @@
 
 describe(Create::class, function (): void {
     it('should save a discussion and send Telegram notification', function (): void {
+        Notification::fake();
+
         Livewire::test(Create::class)
             ->set('title', 'My Discussion')
             ->set('body', '## My Discussion content')
diff --git a/tests/Pest.php b/tests/Pest.php
index 4e38fab1..eb3ae5c1 100644
--- a/tests/Pest.php
+++ b/tests/Pest.php
@@ -2,7 +2,60 @@
 
 declare(strict_types=1);
 
+use App\Models\Reply;
+use App\Models\Thread;
+use App\Models\User;
+use Carbon\Carbon;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Collection;
 
 uses(Tests\TestCase::class, RefreshDatabase::class)
     ->in('Feature');
+
+function createThreadFromToday(int $count = 1): Thread | Collection
+{
+    $today = Carbon::now();
+
+    if ($count === 1) {
+        return Thread::factory()->create(['created_at' => $today]);
+    }
+
+    return Thread::factory()
+        ->count($count)
+        ->create(['created_at' => $today]);
+}
+
+function createThreadFromYesterday(): Thread
+{
+    $yesterday = Carbon::yesterday();
+
+    return Thread::factory()->create(['created_at' => $yesterday]);
+}
+
+function createThreadFromTwoDaysAgo(): Thread
+{
+    $twoDaysAgo = Carbon::now()->subDays(2);
+
+    return Thread::factory()->create(['created_at' => $twoDaysAgo]);
+}
+
+function createResolvedThread(): Thread
+{
+    $thread = createThreadFromToday();
+    $reply = Reply::factory()->create();
+    $user = User::factory()->create();
+    $thread->markSolution($reply, $user);
+
+    return $thread;
+}
+
+function createActiveThread(): Thread
+{
+    /** @var Thread $thread */
+    $thread = createThreadFromToday();
+    $reply = Reply::factory()->create();
+    $reply->to($thread);
+    $reply->save();
+
+    return $thread;
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
index dab304ad..0bc1eb94 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -6,7 +6,6 @@
 
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
 use Illuminate\Support\Facades\Artisan;
-use Illuminate\Support\Facades\Notification;
 
 abstract class TestCase extends BaseTestCase
 {
@@ -18,7 +17,5 @@ protected function setUp(): void
         parent::setUp();
 
         Artisan::call('config:clear');
-
-        Notification::fake();
     }
 }

From 26775c50c91e779ca345c1684f3acaf4bd343ff3 Mon Sep 17 00:00:00 2001
From: Arthur Monney <monneylobe@gmail.com>
Date: Wed, 23 Oct 2024 21:32:21 +0200
Subject: [PATCH 3/8] chore: update threads listing and components

---
 app/Livewire/Components/Channels.php          | 16 ----
 .../Components/Slideovers/ThreadForm.php      | 29 ++++++++
 composer.json                                 |  1 +
 composer.lock                                 | 62 +++++++++++++++-
 config/livewire-slide-over.php                | 64 ++++++++++++++++
 resources/js/app.js                           |  1 +
 .../forum/thread-overview.blade.php           |  2 +-
 resources/views/layouts/app.blade.php         |  1 +
 .../slideovers/thread-form.blade.php          |  4 +
 .../livewire/pages/forum/create.blade.php     |  3 +
 .../livewire/pages/forum/index.blade.php      |  4 +-
 .../livewire-slide-over/slide-over.blade.php  | 74 +++++++++++++++++++
 routes/forum.php                              |  2 +-
 .../Components/Slideovers/ThreadFormTest.php  | 11 +++
 tests/Feature/Livewire/DiscussionTest.php     |  2 +-
 .../Livewire/Pages/Forum/IndexTest.php        | 16 ++++
 16 files changed, 270 insertions(+), 22 deletions(-)
 delete mode 100644 app/Livewire/Components/Channels.php
 create mode 100644 app/Livewire/Components/Slideovers/ThreadForm.php
 create mode 100644 config/livewire-slide-over.php
 create mode 100644 resources/views/livewire/components/slideovers/thread-form.blade.php
 create mode 100644 resources/views/livewire/pages/forum/create.blade.php
 create mode 100644 resources/views/vendor/livewire-slide-over/slide-over.blade.php
 create mode 100644 tests/Feature/Livewire/Components/Slideovers/ThreadFormTest.php

diff --git a/app/Livewire/Components/Channels.php b/app/Livewire/Components/Channels.php
deleted file mode 100644
index 8906b7fb..00000000
--- a/app/Livewire/Components/Channels.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Livewire\Components;
-
-use Illuminate\Contracts\View\View;
-use Livewire\Component;
-
-final class Channels extends Component
-{
-    public function render(): View
-    {
-        return view('livewire.components.channels');
-    }
-}
diff --git a/app/Livewire/Components/Slideovers/ThreadForm.php b/app/Livewire/Components/Slideovers/ThreadForm.php
new file mode 100644
index 00000000..4661fa2b
--- /dev/null
+++ b/app/Livewire/Components/Slideovers/ThreadForm.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Livewire\Components\Slideovers;
+
+use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Auth;
+use Laravelcm\LivewireSlideOvers\SlideOverComponent;
+
+final class ThreadForm extends SlideOverComponent
+{
+    public function mount(): void
+    {
+        if (! Auth::check()) {
+            $this->redirect(route('login'), navigate: true);
+        }
+    }
+
+    public static function panelMaxWidth(): string
+    {
+        return '2xl';
+    }
+
+    public function render(): View
+    {
+        return view('livewire.components.slideovers.thread-form');
+    }
+}
diff --git a/composer.json b/composer.json
index b406634a..6e404597 100644
--- a/composer.json
+++ b/composer.json
@@ -30,6 +30,7 @@
     "laravel/socialite": "^5.6.3",
     "laravel/tinker": "^2.8.1",
     "laravelcm/laravel-subscriptions": "^1.0",
+    "laravelcm/livewire-slide-overs": "^1.0",
     "livewire/livewire": "^3.0",
     "mckenziearts/blade-untitledui-icons": "^1.3",
     "notchpay/notchpay-php": "^1.3",
diff --git a/composer.lock b/composer.lock
index 3b3b1e54..d9e41d54 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "42f558fa0f8ae1e1ed438d0842232bcf",
+    "content-hash": "2f61037f9a5ce54e25cb939458b800e0",
     "packages": [
         {
             "name": "abraham/twitteroauth",
@@ -5443,6 +5443,66 @@
             ],
             "time": "2024-07-24T04:08:22+00:00"
         },
+        {
+            "name": "laravelcm/livewire-slide-overs",
+            "version": "v1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravelcm/livewire-slide-overs.git",
+                "reference": "eaacf38da9bf159707b1f66a08f06361df2299a8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravelcm/livewire-slide-overs/zipball/eaacf38da9bf159707b1f66a08f06361df2299a8",
+                "reference": "eaacf38da9bf159707b1f66a08f06361df2299a8",
+                "shasum": ""
+            },
+            "require": {
+                "livewire/livewire": "^3.4",
+                "php": "^8.2",
+                "spatie/laravel-package-tools": "^1.15"
+            },
+            "require-dev": {
+                "laravel/pint": "^1.1",
+                "orchestra/testbench": "^8.5",
+                "pestphp/pest": "^2.34",
+                "pestphp/pest-plugin-livewire": "^2.1"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Laravelcm\\LivewireSlideOvers\\LivewireSlideOverServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laravelcm\\LivewireSlideOvers\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Arthur Monney",
+                    "email": "monneylobe@gmail.com"
+                }
+            ],
+            "description": "Livewire component that provides drawers (slide overs) that support multiple children while maintaining state.",
+            "keywords": [
+                "laravel",
+                "livewire",
+                "slide-overs"
+            ],
+            "support": {
+                "issues": "https://github.com/laravelcm/livewire-slide-overs/issues",
+                "source": "https://github.com/laravelcm/livewire-slide-overs/tree/v1.0.8"
+            },
+            "time": "2024-07-12T23:00:38+00:00"
+        },
         {
             "name": "league/commonmark",
             "version": "2.5.3",
diff --git a/config/livewire-slide-over.php b/config/livewire-slide-over.php
new file mode 100644
index 00000000..f4707846
--- /dev/null
+++ b/config/livewire-slide-over.php
@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Include CSS
+    |--------------------------------------------------------------------------
+    |
+    | The SLide over uses TailwindCSS, if you don't use TailwindCSS you will need
+    | to set this parameter to true. This includes the modern-normalize css.
+    |
+    */
+    'include_css' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Include JS
+    |--------------------------------------------------------------------------
+    |
+    | Livewire Slide Overs will inject the required Javascript in your blade template.
+    | If you want to bundle the required Javascript you can set this to false
+    | and add `require('vendor/laravelcm/livewire-slide-overs/resources/js/slide-over');`
+    | to your script bundler like webpack.
+    |
+    */
+    'include_js' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Slide Over Position
+    |--------------------------------------------------------------------------
+    | Configure which way the slide-over will open
+    |
+    | Available slide overs position
+    | Position::Right, Position::Left, Position::Bottom
+    |
+    */
+
+    'default_position' => \Laravelcm\LivewireSlideOvers\Position::Right,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Slide Over Component Defaults
+    |--------------------------------------------------------------------------
+    |
+    | Configure the default properties for a slide-over component.
+    |
+    | Supported slide_over_max_width
+    | 'sm', 'md', 'lg', 'xl', '2xl', '3xl', '4xl', '5xl', '6xl', '7xl'
+    */
+
+    'component_defaults' => [
+        'slide_over_max_width' => 'xl',
+        'close_slide_over_on_click_away' => true,
+        'close_slide_over_on_escape' => true,
+        'close_slide_over_on_escape_is_forceful' => true,
+        'dispatch_close_event' => false,
+        'destroy_on_close' => false,
+    ],
+
+];
diff --git a/resources/js/app.js b/resources/js/app.js
index 1558b9d9..c5a9bfb2 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -1,4 +1,5 @@
 import { Livewire, Alpine } from '../../vendor/livewire/livewire/dist/livewire.esm'
+import '../../vendor/laravelcm/livewire-slide-overs/resources/js/slide-over';
 
 import intersect from '@alpinejs/intersect'
 import Tooltip from '@ryangjchandler/alpine-tooltip'
diff --git a/resources/views/components/forum/thread-overview.blade.php b/resources/views/components/forum/thread-overview.blade.php
index 0e392e75..fbc8765a 100644
--- a/resources/views/components/forum/thread-overview.blade.php
+++ b/resources/views/components/forum/thread-overview.blade.php
@@ -2,7 +2,7 @@
     'thread',
 ])
 
-<article class="rounded-xl cursor-pointer bg-white p-4 ring-1 ring-inset ring-gray-100 dark:bg-gray-800 dark:ring-white/10 lg:py-5 lg:px-6" aria-labelledby="{{ $thread->slug }}">
+<article class="rounded-xl cursor-pointer bg-white p-4 ring-1 ring-inset ring-gray-200/60 dark:bg-gray-800 dark:ring-white/10 lg:py-5 lg:px-6" aria-labelledby="{{ $thread->slug }}">
     @if (count($channels = $thread->channels->load('parent')))
         <div class="hidden mb-2 lg:flex flex-wrap lg:gap-1.5">
             @foreach ($channels as $channel)
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index ece9960c..73dd74bc 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -44,6 +44,7 @@
     {{-- @livewire('livewire-ui-spotlight') --}}
     @livewire('wire-elements-modal')
     @livewire(\Filament\Notifications\Livewire\Notifications::class)
+    @livewire(\Laravelcm\LivewireSlideOvers\SlideOverPanel::class)
 
     @filamentScripts
     @livewireScriptConfig
diff --git a/resources/views/livewire/components/slideovers/thread-form.blade.php b/resources/views/livewire/components/slideovers/thread-form.blade.php
new file mode 100644
index 00000000..f2903e01
--- /dev/null
+++ b/resources/views/livewire/components/slideovers/thread-form.blade.php
@@ -0,0 +1,4 @@
+<div>
+    {{-- If you look to others for fulfillment, you will never truly be fulfilled. --}}
+    Ma modale
+</div>
diff --git a/resources/views/livewire/pages/forum/create.blade.php b/resources/views/livewire/pages/forum/create.blade.php
new file mode 100644
index 00000000..d5f5aa42
--- /dev/null
+++ b/resources/views/livewire/pages/forum/create.blade.php
@@ -0,0 +1,3 @@
+<div>
+    {{-- The best athlete wants his opponent at his best. --}}
+</div>
diff --git a/resources/views/livewire/pages/forum/index.blade.php b/resources/views/livewire/pages/forum/index.blade.php
index 58bbb9a9..abea9fcd 100644
--- a/resources/views/livewire/pages/forum/index.blade.php
+++ b/resources/views/livewire/pages/forum/index.blade.php
@@ -1,6 +1,6 @@
 <div>
     <x-slot:buttons>
-        <x-buttons.primary :href="route('forum.new')" class="gap-2 w-full justify-center py-2.5">
+        <x-buttons.primary type="button" onclick="Livewire.dispatch('openPanel', { component: 'components.slideovers.thread-form' })" class="gap-2 w-full justify-center py-2.5">
             {{ __('pages/forum.new_thread') }}
             <span class="absolute pointer-events-none right-0 pr-3">
                 <x-untitledui-plus class="size-5" aria-hidden="true" />
@@ -19,7 +19,7 @@
                     type="search"
                     id="thread-search"
                     name="search"
-                    class="pl-8"
+                    class="!pl-8"
                     wire:model="search"
                     aria-label="{{ __('global.search') }}"
                     :placeholder="__('pages/forum.thread_search')"
diff --git a/resources/views/vendor/livewire-slide-over/slide-over.blade.php b/resources/views/vendor/livewire-slide-over/slide-over.blade.php
new file mode 100644
index 00000000..46176ce4
--- /dev/null
+++ b/resources/views/vendor/livewire-slide-over/slide-over.blade.php
@@ -0,0 +1,74 @@
+<div>
+    @isset($jsPath)
+        <script>
+            {!! file_get_contents($jsPath) !!}
+        </script>
+    @endisset
+
+    @isset($cssPath)
+        <style>
+            {!! file_get_contents($cssPath) !!}
+        </style>
+    @endisset
+
+    <section
+        x-data="SlideOver()"
+        x-on:close.stop="setShowPropertyTo(false)"
+        x-on:keydown.escape.window="closePanelOnEscape()"
+        x-show="open"
+        class="relative z-50"
+        x-ref="dialog"
+        aria-modal="true"
+        x-cloak
+    >
+        <div
+            x-cloak
+            x-show="open"
+            x-on:click="closePanelOnClickAway()"
+            x-transition:enter="duration-500 ease-in-out"
+            x-transition:enter-start="opacity-0"
+            x-transition:enter-end="opacity-100"
+            x-transition:leave="duration-500 ease-in-out"
+            x-transition:leave-start="opacity-100"
+            x-transition:leave-end="opacity-0"
+            class="fixed inset-0 bg-gray-800 bg-opacity-75 backdrop-blur-sm transition-opacity"
+        ></div>
+
+        <div class="fixed inset-0 overflow-hidden">
+            <div class="absolute inset-0 overflow-hidden">
+                <div class="pointer-events-none fixed inset-y-0 right-0 flex max-w-full pl-10">
+                    <div
+                        x-cloak
+                        x-show="open && showActiveComponent"
+                        x-transition:enter="transform transition duration-500 ease-in-out"
+                        x-transition:enter-start="translate-x-full"
+                        x-transition:enter-end="translate-x-0"
+                        x-transition:leave="transform transition duration-500 ease-in-out"
+                        x-transition:leave-start="translate-x-0"
+                        x-transition:leave-end="translate-x-full"
+                        class="pointer-events-auto w-screen p-2"
+                        x-bind:class="panelWidth"
+                        x-trap.noscroll.inert="open && showActiveComponent"
+                        @click.away="closePanelOnClickAway()"
+                        aria-modal="true"
+                    >
+                        <div class="h-full bg-white rounded-xl shadow-xl dark:bg-gray-900">
+                            @forelse ($components as $id => $component)
+                                <div
+                                    class="h-full"
+                                    x-show.immediate="activeComponent == '{{ $id }}'"
+                                    x-ref="{{ $id }}"
+                                    wire:key="{{ $id }}"
+                                >
+                                    @livewire($component['name'], $component['arguments'], key($id))
+                                </div>
+                            @empty
+
+                            @endforelse
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+</div>
diff --git a/routes/forum.php b/routes/forum.php
index f95dece2..3b805d31 100644
--- a/routes/forum.php
+++ b/routes/forum.php
@@ -7,8 +7,8 @@
 use Illuminate\Support\Facades\Route;
 
 Route::get('/', Forum\Index::class)->name('index');
+Route::get('/new-thread', [ThreadController::class, 'create'])->name('new');
 
 Route::get('/channels/{channel}', [ThreadController::class, 'channel'])->name('channels');
-Route::get('/new-thread', [ThreadController::class, 'create'])->name('new');
 Route::get('/{thread}', [ThreadController::class, 'show'])->name('show');
 Route::get('/{thread}/edit', [ThreadController::class, 'edit'])->name('edit');
diff --git a/tests/Feature/Livewire/Components/Slideovers/ThreadFormTest.php b/tests/Feature/Livewire/Components/Slideovers/ThreadFormTest.php
new file mode 100644
index 00000000..303c6c49
--- /dev/null
+++ b/tests/Feature/Livewire/Components/Slideovers/ThreadFormTest.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Livewire\Components\Slideovers\ThreadForm;
+use Livewire\Livewire;
+
+it('renders successfully', function () {
+    Livewire::test(ThreadForm::class)
+        ->assertStatus(200);
+});
diff --git a/tests/Feature/Livewire/DiscussionTest.php b/tests/Feature/Livewire/DiscussionTest.php
index 5aa906dc..3218f9c9 100644
--- a/tests/Feature/Livewire/DiscussionTest.php
+++ b/tests/Feature/Livewire/DiscussionTest.php
@@ -21,7 +21,7 @@
             ->set('body', '## My Discussion content')
             ->call('store');
 
-        expect(Discussion::count())
+        expect(Discussion::query()->count())
             ->toBe(1);
 
         Notification::assertSentTo(
diff --git a/tests/Feature/Livewire/Pages/Forum/IndexTest.php b/tests/Feature/Livewire/Pages/Forum/IndexTest.php
index 07d9982f..3ade6d17 100644
--- a/tests/Feature/Livewire/Pages/Forum/IndexTest.php
+++ b/tests/Feature/Livewire/Pages/Forum/IndexTest.php
@@ -3,11 +3,27 @@
 declare(strict_types=1);
 
 use App\Livewire\Pages\Forum\Index;
+use App\Models\Thread;
 use Livewire\Livewire;
 
+use function Pest\Laravel\get;
+
 describe(Index::class, function (): void {
     it('forum page renders successfully', function (): void {
+        get(route('forum.index'))->assertOk();
+
         Livewire::test(Index::class)
             ->assertStatus(200);
     })->group('forum');
+
+    it('forum page renders views with threads', function (): void {
+        get(route('forum.index'))->assertOk();
+
+        Thread::factory()->count(50)->create();
+
+        Livewire::test(Index::class)
+            ->assertViewHas('threads', fn ($threads) => count($threads) === 10)
+            ->assertSee(__('pagination.next'))
+            ->assertStatus(200);
+    });
 });

From 873e78942ab1b39743732c66fe80b327b84c08d8 Mon Sep 17 00:00:00 2001
From: Arthur Monney <monneylobe@gmail.com>
Date: Thu, 24 Oct 2024 23:35:46 +0200
Subject: [PATCH 4/8] feat: add create and update thread

---
 app/Actions/Forum/SubscribeToThreadAction.php |  28 ++
 app/Exceptions/UnverifiedUserException.php    |   9 +
 .../Components/Slideovers/ThreadForm.php      | 109 ++++++-
 app/Livewire/Forum/CreateThread.php           |  80 ------
 app/Models/Activity.php                       |  20 +-
 app/Models/Subscribe.php                      |   7 +
 app/Models/Thread.php                         |   3 +-
 app/Models/User.php                           |   8 +
 app/Policies/ThreadPolicy.php                 |   2 +-
 app/Traits/HasAuthor.php                      |   7 +-
 app/Traits/RecordsActivity.php                |   9 +-
 composer.lock                                 | 130 ++++-----
 lang/en/actions.php                           |   2 +
 lang/en/global.php                            |  10 +
 lang/en/notifications.php                     |  10 +
 lang/fr/actions.php                           |   2 +
 lang/fr/global.php                            |  10 +
 lang/fr/notifications.php                     |  10 +
 lang/fr/validation.php                        |   4 +-
 resources/css/forms.css                       |  62 ----
 .../components/buttons/default.blade.php      |   2 +-
 .../views/components/buttons/submit.blade.php |   4 +-
 .../components/dropdown-profile.blade.php     |   4 +-
 .../components/form-slider-over.blade.php     |  46 +++
 resources/views/errors/minimal.blade.php      | 266 ++++++++----------
 resources/views/forum/create.blade.php        |  18 --
 .../slideovers/thread-form.blade.php          |  32 ++-
 .../livewire/forum/create-thread.blade.php    |  23 --
 tests/Feature/Forum/ThreadTest.php            |  89 +++---
 .../Components/Slideovers/ThreadFormTest.php  | 109 ++++++-
 30 files changed, 648 insertions(+), 467 deletions(-)
 create mode 100644 app/Actions/Forum/SubscribeToThreadAction.php
 create mode 100644 app/Exceptions/UnverifiedUserException.php
 delete mode 100644 app/Livewire/Forum/CreateThread.php
 create mode 100644 resources/views/components/form-slider-over.blade.php
 delete mode 100644 resources/views/forum/create.blade.php
 delete mode 100644 resources/views/livewire/forum/create-thread.blade.php

diff --git a/app/Actions/Forum/SubscribeToThreadAction.php b/app/Actions/Forum/SubscribeToThreadAction.php
new file mode 100644
index 00000000..6794efd1
--- /dev/null
+++ b/app/Actions/Forum/SubscribeToThreadAction.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Forum;
+
+use App\Events\ThreadWasCreated;
+use App\Gamify\Points\ThreadCreated;
+use App\Models\Subscribe;
+use App\Models\Thread;
+use Illuminate\Support\Facades\Auth;
+use Ramsey\Uuid\Uuid;
+
+final class SubscribeToThreadAction
+{
+    public function execute(Thread $thread): void
+    {
+        $subscription = new Subscribe;
+        $subscription->uuid = Uuid::uuid4()->toString();
+        $subscription->user()->associate(Auth::user());
+        $subscription->subscribeAble()->associate($thread);
+
+        $thread->subscribes()->save($subscription);
+
+        givePoint(new ThreadCreated($thread));
+        event(new ThreadWasCreated($thread));
+    }
+}
diff --git a/app/Exceptions/UnverifiedUserException.php b/app/Exceptions/UnverifiedUserException.php
new file mode 100644
index 00000000..53dc7164
--- /dev/null
+++ b/app/Exceptions/UnverifiedUserException.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions;
+
+use Exception;
+
+final class UnverifiedUserException extends Exception {}
diff --git a/app/Livewire/Components/Slideovers/ThreadForm.php b/app/Livewire/Components/Slideovers/ThreadForm.php
index 4661fa2b..d6657ba3 100644
--- a/app/Livewire/Components/Slideovers/ThreadForm.php
+++ b/app/Livewire/Components/Slideovers/ThreadForm.php
@@ -4,17 +4,41 @@
 
 namespace App\Livewire\Components\Slideovers;
 
+use App\Actions\Forum\SubscribeToThreadAction;
+use App\Exceptions\UnverifiedUserException;
+use App\Models\Thread;
+use Filament\Forms;
+use Filament\Forms\Concerns\InteractsWithForms;
+use Filament\Forms\Contracts\HasForms;
+use Filament\Forms\Form;
+use Filament\Notifications\Notification;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Str;
 use Laravelcm\LivewireSlideOvers\SlideOverComponent;
 
-final class ThreadForm extends SlideOverComponent
+/**
+ * @property Form $form
+ */
+final class ThreadForm extends SlideOverComponent implements HasForms
 {
-    public function mount(): void
+    use InteractsWithForms;
+
+    public ?Thread $thread = null;
+
+    public ?array $data = [];
+
+    public function mount(?int $threadId = null): void
     {
         if (! Auth::check()) {
             $this->redirect(route('login'), navigate: true);
         }
+
+        $this->thread = $threadId
+            ? Thread::query()->findOrFail($threadId)
+            : new Thread;
+
+        $this->form->fill(array_merge($this->thread->toArray(), ['user_id' => Auth::id()]));
     }
 
     public static function panelMaxWidth(): string
@@ -22,6 +46,87 @@ public static function panelMaxWidth(): string
         return '2xl';
     }
 
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\Hidden::make('user_id'),
+                Forms\Components\TextInput::make('title')
+                    ->label(__('validation.attributes.title'))
+                    ->helperText(__('Maximum de 75 caractères.'))
+                    ->required()
+                    ->live(onBlur: true)
+                    ->afterStateUpdated(function (string $operation, $state, Forms\Set $set): void {
+                        $set('slug', Str::slug($state));
+                    })
+                    ->maxLength(75),
+                Forms\Components\Hidden::make('slug'),
+                Forms\Components\Select::make('channels')
+                    ->relationship(name: 'channels', titleAttribute: 'name')
+                    ->searchable()
+                    ->required()
+                    ->minItems(1)
+                    ->maxItems(3)
+                    ->multiple(),
+                Forms\Components\MarkdownEditor::make('body')
+                    ->fileAttachmentsDisk('public')
+                    ->toolbarButtons([
+                        'attachFiles',
+                        'blockquote',
+                        'bold',
+                        'bulletList',
+                        'codeBlock',
+                        'link',
+                    ])
+                    ->label(__('validation.attributes.content'))
+                    ->required()
+                    ->minLength(20),
+            ])
+            ->statePath('data')
+            ->model($this->thread);
+    }
+
+    public function save(): void
+    {
+        // @phpstan-ignore-next-line
+        if (! Auth::user()->hasVerifiedEmail()) {
+            throw new UnverifiedUserException(
+                message: __('notifications.exceptions.unverified_user')
+            );
+        }
+
+        $this->validate();
+
+        if ($this->thread?->id) {
+            $this->authorize('update', $this->thread);
+        }
+
+        if ($this->thread?->id) {
+            $this->thread->update($this->form->getState());
+            $this->form->model($this->thread)->saveRelationships();
+        } else {
+            $thread = Thread::query()->create($this->form->getState());
+            $this->form->model($thread)->saveRelationships();
+
+            app(SubscribeToThreadAction::class)->execute($thread);
+        }
+
+        Notification::make()
+            ->title(
+                $this->thread?->id
+                    ? __('notifications.thread.updated')
+                    : __('notifications.thread.created'),
+            )
+            ->success()
+            ->send();
+
+        $this->dispatch('thread.save');
+
+        $this->closePanel();
+
+        $this->form->fill();
+    }
+
     public function render(): View
     {
         return view('livewire.components.slideovers.thread-form');
diff --git a/app/Livewire/Forum/CreateThread.php b/app/Livewire/Forum/CreateThread.php
deleted file mode 100644
index 84f7b3a8..00000000
--- a/app/Livewire/Forum/CreateThread.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Livewire\Forum;
-
-use App\Events\ThreadWasCreated;
-use App\Gamify\Points\ThreadCreated;
-use App\Models\Channel;
-use App\Models\Thread;
-use App\Traits\WithChannelsAssociation;
-use Illuminate\Contracts\View\View;
-use Illuminate\Support\Facades\Auth;
-use Livewire\Component;
-use Ramsey\Uuid\Uuid;
-
-final class CreateThread extends Component
-{
-    use WithChannelsAssociation;
-
-    public string $title = '';
-
-    public string $body = '';
-
-    /**
-     * @var string[]
-     */
-    protected $listeners = ['markdown-x:update' => 'onMarkdownUpdate'];
-
-    /**
-     * @var string[]
-     */
-    protected $rules = [
-        'title' => 'required|max:75',
-        'body' => 'required',
-    ];
-
-    public function onMarkdownUpdate(string $content): void
-    {
-        $this->body = $content;
-    }
-
-    public function store(): void
-    {
-        $this->validate();
-        $author = Auth::user();
-
-        $thread = Thread::create([
-            'title' => $this->title,
-            'body' => $this->body,
-            'slug' => $this->title,
-            'user_id' => $author->id, // @phpstan-ignore-line
-        ]);
-
-        $thread->syncChannels($this->associateChannels);
-
-        // Subscribe author to the thread.
-        $subscription = new \App\Models\Subscribe;
-        $subscription->uuid = Uuid::uuid4()->toString();
-        $subscription->user()->associate($author);
-        $subscription->subscribeAble()->associate($thread);
-
-        $thread->subscribes()->save($subscription);
-
-        givePoint(new ThreadCreated($thread));
-
-        if (app()->environment('production')) {
-            event(new ThreadWasCreated($thread));
-        }
-
-        $this->redirectRoute('forum.show', $thread);
-    }
-
-    public function render(): View
-    {
-        return view('livewire.forum.create-thread', [
-            'channels' => Channel::all(),
-        ]);
-    }
-}
diff --git a/app/Models/Activity.php b/app/Models/Activity.php
index e8add905..a3475784 100644
--- a/app/Models/Activity.php
+++ b/app/Models/Activity.php
@@ -4,12 +4,24 @@
 
 namespace App\Models;
 
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Support\Collection;
 
+/**
+ * @property-read int $id
+ * @property int $user_id
+ * @property array | null $data
+ * @property string $subject_type
+ * @property int $subject_id
+ * @property string $type
+ * @property User $user
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ */
 final class Activity extends Model
 {
     use HasFactory;
@@ -36,18 +48,14 @@ public function user(): BelongsTo
         return $this->belongsTo(User::class);
     }
 
-    /**
-     * @return array<string, \Illuminate\Support\Collection<int|string, \Illuminate\Support\Collection<int|string, Activity>>>
-     */
-    public static function feed(User $user, int $take = 50): array
+    public static function feed(User $user, int $take = 50): Collection
     {
-        // @phpstan-ignore-next-line
         return self::where('user_id', $user->id)
             ->latest()
             ->with('subject')
             ->take($take)
             ->get()
-            ->groupBy(fn (Activity $activity) => $activity->created_at->format('Y-m-d')); // @phpstan-ignore-line
+            ->groupBy(fn (Activity $activity) => $activity->created_at->format('Y-m-d'));
     }
 
     public static function latestFeed(User $user, int $take = 10): Collection
diff --git a/app/Models/Subscribe.php b/app/Models/Subscribe.php
index c94e1317..9b956467 100644
--- a/app/Models/Subscribe.php
+++ b/app/Models/Subscribe.php
@@ -10,6 +10,13 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
+/**
+ * @property string $uuid
+ * @property int $user_id
+ * @property int $subscribeable_id
+ * @property string $subscribeable_type
+ * @property User $user
+ */
 final class Subscribe extends Model
 {
     use HasFactory;
diff --git a/app/Models/Thread.php b/app/Models/Thread.php
index 55aa5230..a5a1bb4f 100644
--- a/app/Models/Thread.php
+++ b/app/Models/Thread.php
@@ -43,6 +43,7 @@
  * @property int | null $resolved_by
  * @property User | null $resolvedBy
  * @property User $user
+ * @property \Illuminate\Database\Eloquent\Collection | Channel[] $channels
  */
 final class Thread extends Model implements Feedable, ReactableInterface, ReplyInterface, SubscribeInterface, Viewable
 {
@@ -228,7 +229,7 @@ public function toFeedItem(): FeedItem
             ->summary($this->body)
             ->updated($updatedAt)
             ->link(route('forum.show', $this->slug))
-            ->authorName($this->user->name); // @phpstan-ignore-line
+            ->authorName($this->user->name);
     }
 
     /**
diff --git a/app/Models/User.php b/app/Models/User.php
index 73019b48..159864eb 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -32,6 +32,14 @@
 use Spatie\MediaLibrary\InteractsWithMedia;
 use Spatie\Permission\Traits\HasRoles;
 
+/**
+ * @property-read int $id
+ * @property string $name
+ * @property string $email
+ * @property string $username
+ * @property string $bio
+ * @property Collection | Activity[] $activities
+ */
 final class User extends Authenticatable implements FeaturableInterface, FilamentUser, HasAvatar, HasMedia, HasName, MustVerifyEmail
 {
     use Featurable;
diff --git a/app/Policies/ThreadPolicy.php b/app/Policies/ThreadPolicy.php
index 1e8d8894..25640f3f 100644
--- a/app/Policies/ThreadPolicy.php
+++ b/app/Policies/ThreadPolicy.php
@@ -19,7 +19,7 @@ final class ThreadPolicy
 
     public function update(User $user, Thread $thread): bool
     {
-        return $thread->isAuthoredBy($user) || $user->isModerator() || $user->isAdmin();
+        return $thread->isAuthoredBy($user);
     }
 
     public function delete(User $user, Thread $thread): bool
diff --git a/app/Traits/HasAuthor.php b/app/Traits/HasAuthor.php
index adda508f..b3aa5aeb 100644
--- a/app/Traits/HasAuthor.php
+++ b/app/Traits/HasAuthor.php
@@ -21,12 +21,7 @@ public function user(): BelongsTo
         return $this->belongsTo(User::class);
     }
 
-    public function getUser(): ?User
-    {
-        return $this->user;
-    }
-
-    public function isAuthoredBy(User $user): ?bool
+    public function isAuthoredBy(User $user): bool
     {
         return $this->user?->is($user);
     }
diff --git a/app/Traits/RecordsActivity.php b/app/Traits/RecordsActivity.php
index 347de8a5..4632c238 100644
--- a/app/Traits/RecordsActivity.php
+++ b/app/Traits/RecordsActivity.php
@@ -6,13 +6,14 @@
 
 use App\Models\Activity;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Support\Facades\Auth;
 use ReflectionClass;
 
 trait RecordsActivity
 {
     protected static function bootRecordsActivity(): void
     {
-        if (auth()->guest()) {
+        if (Auth::guest()) {
             return;
         }
 
@@ -40,14 +41,14 @@ protected static function getActivitiesToRecord(): array
      */
     protected function recordActivity(string $event, bool $useDefaultEvent = true, array $data = []): void
     {
-        $this->activity()->create([
-            'user_id' => auth()->id(),
+        $this->activities()->create([
+            'user_id' => Auth::id(),
             'type' => $useDefaultEvent ? $this->getActivityType($event) : $event,
             'data' => $data,
         ]);
     }
 
-    public function activity(): MorphMany
+    public function activities(): MorphMany
     {
         return $this->morphMany(Activity::class, 'subject');
     }
diff --git a/composer.lock b/composer.lock
index d9e41d54..c4daf8c5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2672,16 +2672,16 @@
         },
         {
             "name": "filament/actions",
-            "version": "v3.2.119",
+            "version": "v3.2.121",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
-                "reference": "addd6a6f5e8e250a34c7c12bcb4060cc5ecbb9e8"
+                "reference": "1c79f2ffefdee6a21995717a52f006a541b971bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/actions/zipball/addd6a6f5e8e250a34c7c12bcb4060cc5ecbb9e8",
-                "reference": "addd6a6f5e8e250a34c7c12bcb4060cc5ecbb9e8",
+                "url": "https://api.github.com/repos/filamentphp/actions/zipball/1c79f2ffefdee6a21995717a52f006a541b971bc",
+                "reference": "1c79f2ffefdee6a21995717a52f006a541b971bc",
                 "shasum": ""
             },
             "require": {
@@ -2721,20 +2721,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-16T12:07:31+00:00"
+            "time": "2024-10-24T13:46:52+00:00"
         },
         {
             "name": "filament/filament",
-            "version": "v3.2.119",
+            "version": "v3.2.121",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
-                "reference": "6ab7628f7a0c164d694a540dfe69b8d79484fd7d"
+                "reference": "5e9a946d0b64c1ef9a7ef1cb256a427f2838dbc2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/6ab7628f7a0c164d694a540dfe69b8d79484fd7d",
-                "reference": "6ab7628f7a0c164d694a540dfe69b8d79484fd7d",
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/5e9a946d0b64c1ef9a7ef1cb256a427f2838dbc2",
+                "reference": "5e9a946d0b64c1ef9a7ef1cb256a427f2838dbc2",
                 "shasum": ""
             },
             "require": {
@@ -2786,20 +2786,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-17T09:39:37+00:00"
+            "time": "2024-10-24T13:47:13+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v3.2.119",
+            "version": "v3.2.121",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "9eaf88275da18777b1738514db6083e34b1700d4"
+                "reference": "68c9f7f4bd9677f6f99d21396dfbe69cfa142584"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/9eaf88275da18777b1738514db6083e34b1700d4",
-                "reference": "9eaf88275da18777b1738514db6083e34b1700d4",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/68c9f7f4bd9677f6f99d21396dfbe69cfa142584",
+                "reference": "68c9f7f4bd9677f6f99d21396dfbe69cfa142584",
                 "shasum": ""
             },
             "require": {
@@ -2842,20 +2842,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-16T12:07:33+00:00"
+            "time": "2024-10-24T13:47:01+00:00"
         },
         {
             "name": "filament/infolists",
-            "version": "v3.2.119",
+            "version": "v3.2.121",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
-                "reference": "f107a83c3ac042a4d4608d45173cf88c0c55276c"
+                "reference": "2d934d4d7f420fc1165ced33df0959a656163a0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/f107a83c3ac042a4d4608d45173cf88c0c55276c",
-                "reference": "f107a83c3ac042a4d4608d45173cf88c0c55276c",
+                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/2d934d4d7f420fc1165ced33df0959a656163a0c",
+                "reference": "2d934d4d7f420fc1165ced33df0959a656163a0c",
                 "shasum": ""
             },
             "require": {
@@ -2893,20 +2893,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-16T12:07:29+00:00"
+            "time": "2024-10-24T13:47:00+00:00"
         },
         {
             "name": "filament/notifications",
-            "version": "v3.2.119",
+            "version": "v3.2.121",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
-                "reference": "b56b155efd4290459d944a1b3d515b5aaf54846d"
+                "reference": "c19df07c801c5550de0d30957c5a316f53019533"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/notifications/zipball/b56b155efd4290459d944a1b3d515b5aaf54846d",
-                "reference": "b56b155efd4290459d944a1b3d515b5aaf54846d",
+                "url": "https://api.github.com/repos/filamentphp/notifications/zipball/c19df07c801c5550de0d30957c5a316f53019533",
+                "reference": "c19df07c801c5550de0d30957c5a316f53019533",
                 "shasum": ""
             },
             "require": {
@@ -2945,20 +2945,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-16T12:07:28+00:00"
+            "time": "2024-10-23T07:36:14+00:00"
         },
         {
             "name": "filament/support",
-            "version": "v3.2.119",
+            "version": "v3.2.121",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
-                "reference": "85d83838ec0290fffba2be3f99a8b0840da1dc01"
+                "reference": "fa8ada5101be964daa8f112616945a8f2ca5929e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/support/zipball/85d83838ec0290fffba2be3f99a8b0840da1dc01",
-                "reference": "85d83838ec0290fffba2be3f99a8b0840da1dc01",
+                "url": "https://api.github.com/repos/filamentphp/support/zipball/fa8ada5101be964daa8f112616945a8f2ca5929e",
+                "reference": "fa8ada5101be964daa8f112616945a8f2ca5929e",
                 "shasum": ""
             },
             "require": {
@@ -3004,20 +3004,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-16T12:07:44+00:00"
+            "time": "2024-10-24T13:47:33+00:00"
         },
         {
             "name": "filament/tables",
-            "version": "v3.2.119",
+            "version": "v3.2.121",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
-                "reference": "fac7e8e9a787aef94f45938fd47b50ea3f9d3bff"
+                "reference": "7800832d8507a418787c5f05bd562b65d4601827"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/fac7e8e9a787aef94f45938fd47b50ea3f9d3bff",
-                "reference": "fac7e8e9a787aef94f45938fd47b50ea3f9d3bff",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/7800832d8507a418787c5f05bd562b65d4601827",
+                "reference": "7800832d8507a418787c5f05bd562b65d4601827",
                 "shasum": ""
             },
             "require": {
@@ -3056,11 +3056,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-16T12:07:46+00:00"
+            "time": "2024-10-24T13:47:33+00:00"
         },
         {
             "name": "filament/widgets",
-            "version": "v3.2.119",
+            "version": "v3.2.121",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
@@ -4705,16 +4705,16 @@
         },
         {
             "name": "laravel/fortify",
-            "version": "v1.24.2",
+            "version": "v1.24.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/fortify.git",
-                "reference": "42695c45087e5abb3e173725b4f1ef4956a7b47d"
+                "reference": "0e9c9ec6f9c36f4d8a4b7b5df78e4dfccec47797"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/fortify/zipball/42695c45087e5abb3e173725b4f1ef4956a7b47d",
-                "reference": "42695c45087e5abb3e173725b4f1ef4956a7b47d",
+                "url": "https://api.github.com/repos/laravel/fortify/zipball/0e9c9ec6f9c36f4d8a4b7b5df78e4dfccec47797",
+                "reference": "0e9c9ec6f9c36f4d8a4b7b5df78e4dfccec47797",
                 "shasum": ""
             },
             "require": {
@@ -4766,7 +4766,7 @@
                 "issues": "https://github.com/laravel/fortify/issues",
                 "source": "https://github.com/laravel/fortify"
             },
-            "time": "2024-09-16T19:20:52+00:00"
+            "time": "2024-10-18T13:43:00+00:00"
         },
         {
             "name": "laravel/framework",
@@ -6619,16 +6619,16 @@
         },
         {
             "name": "mckenziearts/blade-untitledui-icons",
-            "version": "v1.3",
+            "version": "v1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mckenziearts/blade-untitledui-icons.git",
-                "reference": "46c98a2f5c8fa41960a997b2e2cb0481e431240d"
+                "reference": "31319c395bdcf2c734f24dba9277f238144b0edf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mckenziearts/blade-untitledui-icons/zipball/46c98a2f5c8fa41960a997b2e2cb0481e431240d",
-                "reference": "46c98a2f5c8fa41960a997b2e2cb0481e431240d",
+                "url": "https://api.github.com/repos/mckenziearts/blade-untitledui-icons/zipball/31319c395bdcf2c734f24dba9277f238144b0edf",
+                "reference": "31319c395bdcf2c734f24dba9277f238144b0edf",
                 "shasum": ""
             },
             "require": {
@@ -6672,7 +6672,7 @@
             ],
             "support": {
                 "issues": "https://github.com/mckenziearts/blade-untitledui-icons/issues",
-                "source": "https://github.com/mckenziearts/blade-untitledui-icons/tree/v1.3"
+                "source": "https://github.com/mckenziearts/blade-untitledui-icons/tree/v1.3.1"
             },
             "funding": [
                 {
@@ -6680,7 +6680,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-04-05T11:39:07+00:00"
+            "time": "2024-10-20T09:06:46+00:00"
         },
         {
             "name": "mobiledetect/mobiledetectlib",
@@ -10367,16 +10367,16 @@
         },
         {
             "name": "spatie/laravel-data",
-            "version": "4.10.1",
+            "version": "4.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-data.git",
-                "reference": "d3113c6bc03a6f1c241074d6f5832e05daa7ca77"
+                "reference": "df5b58baebae34475ca35338b4e9a131c9e2a8e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-data/zipball/d3113c6bc03a6f1c241074d6f5832e05daa7ca77",
-                "reference": "d3113c6bc03a6f1c241074d6f5832e05daa7ca77",
+                "url": "https://api.github.com/repos/spatie/laravel-data/zipball/df5b58baebae34475ca35338b4e9a131c9e2a8e0",
+                "reference": "df5b58baebae34475ca35338b4e9a131c9e2a8e0",
                 "shasum": ""
             },
             "require": {
@@ -10402,7 +10402,7 @@
                 "phpstan/extension-installer": "^1.1",
                 "phpunit/phpunit": "^10.0",
                 "spatie/invade": "^1.0",
-                "spatie/laravel-typescript-transformer": "^2.3",
+                "spatie/laravel-typescript-transformer": "^2.5",
                 "spatie/pest-plugin-snapshots": "^2.1",
                 "spatie/test-time": "^1.2"
             },
@@ -10439,7 +10439,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-data/issues",
-                "source": "https://github.com/spatie/laravel-data/tree/4.10.1"
+                "source": "https://github.com/spatie/laravel-data/tree/4.11.1"
             },
             "funding": [
                 {
@@ -10447,7 +10447,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-10-07T08:36:46+00:00"
+            "time": "2024-10-23T07:14:53+00:00"
         },
         {
             "name": "spatie/laravel-feed",
@@ -11170,16 +11170,16 @@
         },
         {
             "name": "spatie/robots-txt",
-            "version": "2.2.2",
+            "version": "2.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/robots-txt.git",
-                "reference": "560d6d1776ee3a13af26ac4e04171a5d32f3923f"
+                "reference": "31763e5ca23fb0efa6dc6b700beb5ebfeab89432"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/robots-txt/zipball/560d6d1776ee3a13af26ac4e04171a5d32f3923f",
-                "reference": "560d6d1776ee3a13af26ac4e04171a5d32f3923f",
+                "url": "https://api.github.com/repos/spatie/robots-txt/zipball/31763e5ca23fb0efa6dc6b700beb5ebfeab89432",
+                "reference": "31763e5ca23fb0efa6dc6b700beb5ebfeab89432",
                 "shasum": ""
             },
             "require": {
@@ -11214,7 +11214,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/robots-txt/issues",
-                "source": "https://github.com/spatie/robots-txt/tree/2.2.2"
+                "source": "https://github.com/spatie/robots-txt/tree/2.2.3"
             },
             "funding": [
                 {
@@ -11226,7 +11226,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-25T08:55:09+00:00"
+            "time": "2024-10-22T08:17:03+00:00"
         },
         {
             "name": "spatie/temporary-directory",
@@ -15140,16 +15140,16 @@
         },
         {
             "name": "laravel/sail",
-            "version": "v1.36.0",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sail.git",
-                "reference": "f184d3d687155d06bc8cb9ff6dc48596a138460c"
+                "reference": "5d385f2e698f0f774cdead82aff5d989fb95309b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sail/zipball/f184d3d687155d06bc8cb9ff6dc48596a138460c",
-                "reference": "f184d3d687155d06bc8cb9ff6dc48596a138460c",
+                "url": "https://api.github.com/repos/laravel/sail/zipball/5d385f2e698f0f774cdead82aff5d989fb95309b",
+                "reference": "5d385f2e698f0f774cdead82aff5d989fb95309b",
                 "shasum": ""
             },
             "require": {
@@ -15199,7 +15199,7 @@
                 "issues": "https://github.com/laravel/sail/issues",
                 "source": "https://github.com/laravel/sail"
             },
-            "time": "2024-10-10T13:26:02+00:00"
+            "time": "2024-10-21T17:13:38+00:00"
         },
         {
             "name": "mockery/mockery",
diff --git a/lang/en/actions.php b/lang/en/actions.php
index a131fde7..d0432224 100644
--- a/lang/en/actions.php
+++ b/lang/en/actions.php
@@ -8,5 +8,7 @@
     'edit' => 'Edit',
     'approve' => 'Approve',
     'delete' => 'Delete',
+    'cancel' => 'Cancel',
+    'save' => 'Save',
 
 ];
diff --git a/lang/en/global.php b/lang/en/global.php
index 36bfb4a9..316905cb 100644
--- a/lang/en/global.php
+++ b/lang/en/global.php
@@ -54,5 +54,15 @@
     'reset' => 'Reset',
     'answers' => 'answers',
     'first_to_react' => 'Be the first to react',
+    'rule_advise' => "Make sure you've read our rules before proceeding.",
+    'read_rules' => 'Learn about rules',
+    'error_title' => 'Error',
+    'error_description' => 'There seems to be a problem right now! Please try again later.',
+    'forum_description' => 'Learn, discover and share in the Forum.',
+    'podcasts_description' => 'Radio programs on development and IT in general.',
+    'rules_description' => 'User guide and site settings.',
+    'articles_description' => 'The latest news and information on the Blog.',
+    'popular_pages' => 'Popular pages',
+    'back_home' => 'Or return to homepage',
 
 ];
diff --git a/lang/en/notifications.php b/lang/en/notifications.php
index 24685a37..0ac6e029 100644
--- a/lang/en/notifications.php
+++ b/lang/en/notifications.php
@@ -8,4 +8,14 @@
         'created' => 'Thank you for submitting your article. We will only contact you once we have accepted your article.',
     ],
 
+    'thread' => [
+        'created' => 'Thread was successfully created.',
+        'updated' => 'Thread was successfully updated.',
+        'deleted' => 'Thread was successfully deleted.',
+    ],
+
+    'exceptions' => [
+        'unverified_user' => "Vous n'êtes pas autorisé à effectuer cette. Votre e-mail n'est pas vérifiée",
+    ],
+
 ];
diff --git a/lang/fr/actions.php b/lang/fr/actions.php
index 4925039d..480f102a 100644
--- a/lang/fr/actions.php
+++ b/lang/fr/actions.php
@@ -8,5 +8,7 @@
     'edit' => 'Éditer',
     'approve' => 'Approuver',
     'delete' => 'Supprimer',
+    'cancel' => 'Annuler',
+    'save' => 'Enregistrer',
 
 ];
diff --git a/lang/fr/global.php b/lang/fr/global.php
index 5cd9d651..94ae36f8 100644
--- a/lang/fr/global.php
+++ b/lang/fr/global.php
@@ -54,5 +54,15 @@
     'reset' => 'Réinitialiser',
     'answers' => 'réponses',
     'first_to_react' => 'Soyez le premier à réagir',
+    'rule_advise' => "Assurez-vous d'avoir lu nos règles avant de continuer.",
+    'read_rules' => 'Consulter les règles',
+    'error_title' => 'Erreur',
+    'error_description' => 'Il semble y avoir un problème en ce moment ! Veuillez réessayer plus tard.',
+    'forum_description' => 'Apprenez, découvrez, partagez dans le Forum.',
+    'podcasts_description' => "Des émissions radios pour dans le domaine du développement et de l'IT en général.",
+    'rules_description' => "Guide d'utilisation et paramétrage du site.",
+    'articles_description' => 'Les dernières nouveautés, informations sur le Blog.',
+    'popular_pages' => 'Pages Populaires',
+    'back_home' => "Ou retourner à l'accueil",
 
 ];
diff --git a/lang/fr/notifications.php b/lang/fr/notifications.php
index 7da5bcdb..b35c7407 100644
--- a/lang/fr/notifications.php
+++ b/lang/fr/notifications.php
@@ -8,4 +8,14 @@
         'created' => 'Merci d\'avoir soumis votre article. Vous aurez des nouvelles que lorsque nous accepterons votre article.',
     ],
 
+    'thread' => [
+        'created' => 'Votre sujet à été crée.',
+        'updated' => 'Votre sujet à été modifié.',
+        'deleted' => 'Le sujet a été supprimé.',
+    ],
+
+    'exceptions' => [
+        'unverified_user' => "Vous n'êtes pas autorisé à effectuer cette. Votre e-mail n'est pas vérifiée",
+    ],
+
 ];
diff --git a/lang/fr/validation.php b/lang/fr/validation.php
index 22d42a54..ad4818f7 100644
--- a/lang/fr/validation.php
+++ b/lang/fr/validation.php
@@ -170,7 +170,7 @@
         'age' => 'âge',
         'available' => 'disponible',
         'city' => 'ville',
-        'content' => 'contenu',
+        'content' => 'Contenu',
         'country' => 'pays',
         'current_password' => 'mot de passe actuel',
         'date' => 'date',
@@ -193,7 +193,7 @@
         'sex' => 'sexe',
         'size' => 'taille',
         'time' => 'heure',
-        'title' => 'titre',
+        'title' => 'Titre',
         'username' => 'Pseudo d\'utilisateur',
         'year' => 'année',
     ],
diff --git a/resources/css/forms.css b/resources/css/forms.css
index d299edaa..76e2396a 100644
--- a/resources/css/forms.css
+++ b/resources/css/forms.css
@@ -16,65 +16,3 @@ input::-webkit-inner-spin-button {
     -webkit-appearance: none;
     margin: 0; /* <-- Apparently some margin are still there even though it's hidden */
 }
-
-/** Choices.js **/
-.choices {
-    margin-top: 8px;
-}
-
-.standard .choices__input.choices__input--cloned {
-    @apply hidden;
-}
-
-.standard .choices__inner {
-    @apply flex h-12 w-full items-center rounded border border-gray-300 bg-white p-2 !important;
-}
-
-.standard .choices__list--dropdown {
-    @apply border-2 border-gray-300 !important;
-}
-
-.standard .choices__list--dropdown .choices__list {
-    @apply border border-gray-500 bg-white !important;
-}
-
-.standard .choices__list--single {
-    @apply p-0 !important;
-}
-
-.standard .choices__item {
-    @apply my-0 cursor-pointer rounded border-0 bg-white px-2 py-1 text-sm text-gray-500 !important;
-}
-
-.standard .choices__item.choices__item--choice {
-    @apply rounded-none py-2 !important;
-}
-
-.standard .choices__item.choices__item--choice.choices__item--selectable {
-    @apply rounded-none bg-white p-2 text-gray-500 !important;
-}
-
-.standard .choices__item.choices__item--choice.choices__item--selectable:hover {
-    @apply bg-white !important;
-}
-
-.standard .choices__item.choices__item--selectable {
-    @apply border-green-500 bg-green-500 text-white !important;
-}
-
-.standard .choices__item.is-highlighted {
-    @apply border-green-600 bg-green-600 text-white !important;
-}
-
-.standard .choices[data-type*='select-one']:after {
-    border-color: var(--color-input-border) transparent transparent transparent !important;
-}
-
-.standard .choices[data-type*='select-one'] .choices__input {
-    @apply rounded-none border-b-2 border-gray-300 !important;
-}
-
-.standard .choices__item.choices__item--choice.choices__item--selectable.is-highlighted,
-.standard .choices__item.choices__item--choice.is-selected.choices__item--selectable {
-    @apply border-green-500 bg-green-500 text-white !important;
-}
diff --git a/resources/views/components/buttons/default.blade.php b/resources/views/components/buttons/default.blade.php
index 246d616f..54a9e3f2 100644
--- a/resources/views/components/buttons/default.blade.php
+++ b/resources/views/components/buttons/default.blade.php
@@ -1,5 +1,5 @@
 @php
-    $classes = 'inline-flex justify-center py-2 px-4 bg-white border-0 ring-1 ring-gray-200 rounded-lg shadow-sm text-sm text-gray-700 hover:text-gray-900 dark:text-gray-400 hover:bg-gray-50/50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-white focus:ring-green-500 dark:bg-gray-800 dark:focus:ring-offset-gray-900';
+    $classes = 'inline-flex justify-center py-2 px-4 bg-white border-0 ring-1 ring-gray-200 dark:ring-white/20 rounded-lg shadow-sm text-sm text-gray-700 hover:text-gray-900 dark:text-gray-400 hover:bg-gray-50 dark:hover:bg-white/10 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-white focus:ring-green-500 dark:bg-gray-800 dark:focus:ring-offset-gray-900';
 @endphp
 
 @if ($attributes->hasAny(['href', ':href']))
diff --git a/resources/views/components/buttons/submit.blade.php b/resources/views/components/buttons/submit.blade.php
index 04f76acf..e5f2ee1e 100644
--- a/resources/views/components/buttons/submit.blade.php
+++ b/resources/views/components/buttons/submit.blade.php
@@ -4,9 +4,9 @@
 
 <x-buttons.primary
     type="submit"
-    {{ $attributes->twMerge(['class' => 'data-[loading]:pointer-events-none']) }}
+    {{ $attributes->twMerge(['class' => 'relative data-[loading]:pointer-events-none']) }}
 >
-    <span class="[[data-loading]>&]:opacity-0 transition-opacity">
+    <span class="[[data-loading]>&]:opacity-0 transition-opacity delay-100">
         {{ $title }}
     </span>
     <span class="[[data-loading]>&]:opacity-100 opacity-0 absolute inset-0 flex items-center justify-center">
diff --git a/resources/views/components/dropdown-profile.blade.php b/resources/views/components/dropdown-profile.blade.php
index 08283f99..430649fb 100644
--- a/resources/views/components/dropdown-profile.blade.php
+++ b/resources/views/components/dropdown-profile.blade.php
@@ -58,7 +58,7 @@ class="mr-3 size-5 flex-none text-skin-muted group-hover:text-primary-600"
             </div>
         @endif
 
-        @feature('job_profile')
+        {{--@feature('job_profile')
             <div class="px-3.5 py-2" role="none">
                 <div class="flex items-center justify-between">
                     <h5 class="text-sm leading-5 text-gray-500 dark:text-gray-400">Profil Développeur</h5>
@@ -148,7 +148,7 @@ class="mt-3 inline-block w-full rounded-md border border-skin-base px-1.5 py-2 t
                     </a>
                 </div>
             </div>
-        @endfeature
+        @endfeature--}}
 
         <div class="px-3.5 py-1.5" role="none">
             <a
diff --git a/resources/views/components/form-slider-over.blade.php b/resources/views/components/form-slider-over.blade.php
new file mode 100644
index 00000000..8884f4fb
--- /dev/null
+++ b/resources/views/components/form-slider-over.blade.php
@@ -0,0 +1,46 @@
+@props([
+    'action',
+    'title',
+    'description' => null,
+])
+
+<form wire:submit="{{ $action }}" class="flex h-full flex-col divide-y divide-gray-200/60 dark:divide-white/20">
+    <div class="h-0 flex-1 overflow-y-auto py-6">
+        <header class="px-4 sm:px-6">
+            <div class="flex items-start justify-between">
+                <h2 class="text-lg font-medium text-gray-900 dark:text-white lg:text-xl">
+                    {{ $title }}
+                </h2>
+                <div class="ml-3 flex h-7 items-center">
+                    <button
+                        type="button"
+                        class="rounded-lg bg-white text-gray-400 hover:text-gray-500 focus:outline-none dark:bg-gray-900 dark:text-gray-500 dark:hover:text-gray-300"
+                        wire:click="$dispatch('closePanel')"
+                    >
+                        <span class="sr-only">{{ __('global.close_navigation') }}</span>
+                        <x-untitledui-x class="size-6" stroke-width="1.5" aria-hidden="true" />
+                    </button>
+                </div>
+            </div>
+            @if ($description)
+                <div class="mt-1">
+                    <p class="text-sm text-gray-500 dark:text-gray-400">
+                        {{ $description }}
+                    </p>
+                </div>
+            @endif
+        </header>
+        <div class="mt-8 flex-1 px-4 sm:px-6">
+            {{ $slot }}
+        </div>
+    </div>
+    <div class="flex shrink-0 justify-end space-x-4 p-4">
+        <x-buttons.default wire:click="$dispatch('closePanel')" type="button" class="mt-3 sm:mt-0 sm:w-auto">
+            {{ __('actions.cancel') }}
+        </x-buttons.default>
+        <x-buttons.submit
+            wire.loading.attr="data-loading"
+            :title="__('actions.save')"
+        />
+    </div>
+</form>
diff --git a/resources/views/errors/minimal.blade.php b/resources/views/errors/minimal.blade.php
index 71efc1f6..63300f21 100644
--- a/resources/views/errors/minimal.blade.php
+++ b/resources/views/errors/minimal.blade.php
@@ -1,160 +1,126 @@
-<!DOCTYPE html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" class="{{ get_current_theme() }}">
-    <head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-
-        <title>@yield('title')</title>
-
-        <!-- Fonts -->
-        <link rel="preconnect" href="https://fonts.gstatic.com" />
-        <!-- Styles -->
-        <link href="https://fonts.cdnfonts.com/css/operator-mono" rel="stylesheet" />
-        <link rel="stylesheet" href="https://rsms.me/inter/inter.css" />
-        <link href="{{ mix('css/app.css') }}" rel="stylesheet" />
-
-        @include('partials._favicons')
-        @include('partials._fathom')
-    </head>
-    <body class="bg-skin-body font-sans antialiased">
-        <main class="mx-auto w-full max-w-7xl px-4 sm:px-6 lg:px-8">
-            <div class="shrink-0 pt-16">
-                <img
-                    class="logo-white mx-auto h-12 w-auto sm:h-16"
-                    src="{{ asset('/images/laravelcm.svg') }}"
-                    alt="Laravel.cm"
-                />
-                <img
-                    class="logo-dark mx-auto h-12 w-auto sm:h-16"
-                    src="{{ asset('/images/laravelcm-white.svg') }}"
-                    alt="Laravel.cm"
-                />
+<x-app-layout>
+    <x-container>
+        <div class="mx-auto max-w-xl py-16 sm:py-24">
+            <div class="text-center">
+                <p class="text-sm font-semibold uppercase tracking-wide text-primary-600">
+                    {{ __('global.error_title') }}
+                    @yield('code')
+                </p>
+                <h1 class="font-heading mt-2 text-4xl font-extrabold tracking-tight text-gray-900 sm:text-5xl dark:text-white">
+                    @yield('message')
+                </h1>
+                <p class="mt-2 text-lg text-gray-500 dark:text-gray-400">
+                    {{ __('global.error_description') }}
+                </p>
             </div>
-            <div class="mx-auto max-w-xl py-16 sm:py-24">
-                <div class="text-center">
-                    <p class="font-sans text-sm font-semibold uppercase tracking-wide text-primary-600">
-                        Erreur
-                        @yield('code')
-                    </p>
-                    <h1 class="mt-2 font-sans text-4xl font-extrabold tracking-tight text-gray-900 sm:text-5xl">
-                        @yield('message')
-                    </h1>
-                    <p class="mt-2 text-lg font-normal text-gray-500 dark:text-gray-400">
-                        Il semble y avoir un problème en ce moment ! Veuillez réessayer plus tard.
-                    </p>
-                </div>
-                <div class="mt-12">
-                    <h2 class="font-sans text-sm font-semibold uppercase tracking-wide text-gray-500 dark:text-gray-400">
-                        Pages Populaires
-                    </h2>
-                    <ul role="list" class="mt-4 divide-y divide-skin-base border-b border-t border-skin-base">
-                        <li class="relative flex items-start space-x-4 py-6">
-                            <div class="shrink-0">
-                                <span class="flex size-12 items-center justify-center rounded-lg bg-green-50">
-                                    <x-heroicon-o-book-open class="size-6 text-green-700" />
+            <div class="mt-12">
+                <h2 class="text-sm font-semibold uppercase tracking-wider text-gray-700 dark:text-gray-300">
+                    {{ __('global.popular_pages') }}
+                </h2>
+                <ul role="list" class="mt-4 divide-y divide-gray-200 dark:divide-white/20 border-b border-t border-gray-200 dark:border-white/20">
+                    <li class="relative flex items-start space-x-4 py-6">
+                        <div class="shrink-0">
+                            <span class="flex size-12 items-center justify-center rounded-lg bg-primary-50 ring-1 ring-primary-300">
+                                <x-heroicon-o-book-open class="size-6 text-primary-700" aria-hidden="true" />
+                            </span>
+                        </div>
+                        <div class="min-w-0 flex-1">
+                            <h3 class="font-medium text-gray-900 dark:text-white">
+                                <span class="rounded-lg focus-within:ring-2 focus-within:ring-primary-500 focus-within:ring-offset-2">
+                                    <x-link :href="route('forum.index')" class="focus:outline-none">
+                                        <span class="absolute inset-0" aria-hidden="true"></span>
+                                        {{ __('global.navigation.forum') }}
+                                    </x-link>
                                 </span>
-                            </div>
-                            <div class="min-w-0 flex-1">
-                                <h3 class="font-sans text-base font-medium text-gray-900">
-                                    <span
-                                        class="rounded-sm focus-within:ring-2 focus-within:ring-green-500 focus-within:ring-offset-2"
-                                    >
-                                        <a href="{{ route('forum.index') }}" class="focus:outline-none">
-                                            <span class="absolute inset-0" aria-hidden="true"></span>
-                                            Forum
-                                        </a>
-                                    </span>
-                                </h3>
-                                <p class="text-base text-gray-500 dark:text-gray-400">Apprenez, découvrez, partagez dans le Forum.</p>
-                            </div>
-                            <div class="shrink-0 self-center">
-                                <x-heroicon-s-chevron-right class="size-5 text-skin-muted" />
-                            </div>
-                        </li>
+                            </h3>
+                            <p class="text-gray-500 dark:text-gray-400">
+                                {{ __('global.forum_description') }}
+                            </p>
+                        </div>
+                        <div class="shrink-0 self-center">
+                            <x-heroicon-s-chevron-right class="size-5 text-gray-400 dark:text-gray-500" aria-hidden="true" />
+                        </div>
+                    </li>
 
-                        <li class="relative flex items-start space-x-4 py-6">
-                            <div class="shrink-0">
-                                <span class="flex size-12 items-center justify-center rounded-lg bg-green-50">
-                                    <x-heroicon-o-microphone class="size-6 text-green-700" />
+                    <li class="relative flex items-start space-x-4 py-6">
+                        <div class="shrink-0">
+                            <span class="flex size-12 items-center justify-center rounded-lg bg-primary-50 ring-1 ring-primary-300">
+                                <x-heroicon-o-rss class="size-6 text-primary-700" aria-hidden="true" />
+                            </span>
+                        </div>
+                        <div class="min-w-0 flex-1">
+                            <h3 class="font-medium text-gray-900 dark:text-white">
+                                <span class="rounded-lg focus-within:ring-2 focus-within:ring-primary-500 focus-within:ring-offset-2">
+                                    <x-link :href="route('articles')" class="focus:outline-none">
+                                        <span class="absolute inset-0" aria-hidden="true"></span>
+                                        {{ __('global.navigation.articles') }}
+                                    </x-link>
                                 </span>
-                            </div>
-                            <div class="min-w-0 flex-1">
-                                <h3 class="font-sans text-base font-medium text-gray-900">
-                                    <span
-                                        class="rounded-sm focus-within:ring-2 focus-within:ring-green-500 focus-within:ring-offset-2"
-                                    >
-                                        <a href="#" class="focus:outline-none">
-                                            <span class="absolute inset-0" aria-hidden="true"></span>
-                                            Podcasts
-                                        </a>
-                                    </span>
-                                </h3>
-                                <p class="text-base text-gray-500 dark:text-gray-400">Des émissions radios pour la culture.</p>
-                            </div>
-                            <div class="shrink-0 self-center">
-                                <x-heroicon-s-chevron-right class="size-5 text-skin-muted" />
-                            </div>
-                        </li>
+                            </h3>
+                            <p class="text-gray-500 dark:text-gray-400">
+                                {{ __('global.articles_description') }}
+                            </p>
+                        </div>
+                        <div class="shrink-0 self-center">
+                            <x-heroicon-s-chevron-right class="size-5 text-gray-400 dark:text-gray-500" aria-hidden="true" />
+                        </div>
+                    </li>
 
-                        <li class="relative flex items-start space-x-4 py-6">
-                            <div class="shrink-0">
-                                <span class="flex size-12 items-center justify-center rounded-lg bg-green-50">
-                                    <x-untitledui-bookmark class="size-6 text-green-700" />
+                    <li class="relative flex items-start space-x-4 py-6">
+                        <div class="shrink-0">
+                            <span class="flex size-12 items-center justify-center rounded-lg bg-primary-50 ring-1 ring-primary-300">
+                                <x-untitledui-bookmark class="size-6 text-primary-700" aria-hidden="true" />
+                            </span>
+                        </div>
+                        <div class="min-w-0 flex-1">
+                            <h3 class="font-medium text-gray-900 dark:text-white">
+                                <span class="rounded-sm focus-within:ring-2 focus-within:ring-primary-500 focus-within:ring-offset-2">
+                                    <x-link :href="route('rules')" class="focus:outline-none">
+                                        <span class="absolute inset-0" aria-hidden="true"></span>
+                                        {{ __('global.navigation.rules') }}
+                                    </x-link>
                                 </span>
-                            </div>
-                            <div class="min-w-0 flex-1">
-                                <h3 class="font-sans text-base font-medium text-gray-900">
-                                    <span
-                                        class="rounded-sm focus-within:ring-2 focus-within:ring-green-500 focus-within:ring-offset-2"
-                                    >
-                                        <a href="{{ route('rules') }}" class="focus:outline-none">
-                                            <span class="absolute inset-0" aria-hidden="true"></span>
-                                            Guides
-                                        </a>
-                                    </span>
-                                </h3>
-                                <p class="text-base text-gray-500 dark:text-gray-400">Guide d'utilisation et paramétrage du site.</p>
-                            </div>
-                            <div class="shrink-0 self-center">
-                                <x-heroicon-s-chevron-right class="size-5 text-skin-muted" />
-                            </div>
-                        </li>
+                            </h3>
+                            <p class="text-gray-500 dark:text-gray-400">
+                                {{ __('global.rules_description') }}
+                            </p>
+                        </div>
+                        <div class="shrink-0 self-center">
+                            <x-heroicon-s-chevron-right class="size-5 text-gray-400 dark:text-gray-500" aria-hidden="true" />
+                        </div>
+                    </li>
 
-                        <li class="relative flex items-start space-x-4 py-6">
-                            <div class="shrink-0">
-                                <span class="flex size-12 items-center justify-center rounded-lg bg-green-50">
-                                    <x-heroicon-o-rss class="size-6 text-green-700" />
+                    <li class="relative items-start space-x-4 py-6 hidden">
+                        <div class="shrink-0">
+                            <span class="flex size-12 items-center justify-center rounded-lg bg-primary-50 ring-1 ring-primary-300">
+                                <x-heroicon-o-microphone class="size-6 text-primary-700" aria-hidden="true" />
+                            </span>
+                        </div>
+                        <div class="min-w-0 flex-1">
+                            <h3 class="font-medium text-gray-900 dark:text-white">
+                                <span class="rounded-lg focus-within:ring-2 focus-within:ring-primary-500 focus-within:ring-offset-2">
+                                    <x-link href="#" class="focus:outline-none">
+                                        <span class="absolute inset-0" aria-hidden="true"></span>
+                                        {{ __('global.navigation.podcasts') }}
+                                    </x-link>
                                 </span>
-                            </div>
-                            <div class="min-w-0 flex-1">
-                                <h3 class="font-sans text-base font-medium text-gray-900">
-                                    <span
-                                        class="rounded-sm focus-within:ring-2 focus-within:ring-green-500 focus-within:ring-offset-2"
-                                    >
-                                        <a href="{{ route('articles') }}" class="focus:outline-none">
-                                            <span class="absolute inset-0" aria-hidden="true"></span>
-                                            Blog
-                                        </a>
-                                    </span>
-                                </h3>
-                                <p class="text-base text-gray-500 dark:text-gray-400">Lisez les dernières nouvelles et articles.</p>
-                            </div>
-                            <div class="shrink-0 self-center">
-                                <x-heroicon-s-chevron-right class="size-5 text-skin-muted" />
-                            </div>
-                        </li>
-                    </ul>
-                    <div class="mt-8">
-                        <a
-                            href="{{ url('/') }}"
-                            class="text-base font-medium text-primary-600 hover:text-primary-600-hover"
-                        >
-                            Ou retourner à l'accueil
-                            <span aria-hidden="true">&rarr;</span>
-                        </a>
-                    </div>
+                            </h3>
+                            <p class="text-gray-500 dark:text-gray-400">
+                                {{ __('global.podcasts_description') }}
+                            </p>
+                        </div>
+                        <div class="shrink-0 self-center">
+                            <x-heroicon-s-chevron-right class="size-5 text-gray-400 dark:text-gray-500" aria-hidden="true" />
+                        </div>
+                    </li>
+                </ul>
+                <div class="mt-8">
+                    <x-link :href="route('home')" class="font-medium text-primary-600 hover:text-primary-500">
+                        {{ __('global.back_home') }}
+                        <span aria-hidden="true">&rarr;</span>
+                    </x-link>
                 </div>
             </div>
-        </main>
-    </body>
-</html>
+        </div>
+    </x-container>
+</x-app-layout>
diff --git a/resources/views/forum/create.blade.php b/resources/views/forum/create.blade.php
deleted file mode 100644
index 96b43592..00000000
--- a/resources/views/forum/create.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<x-app-layout title="Créer un nouveau sujet">
-    <div class="mx-auto max-w-4xl py-12">
-        <div class="space-y-8 divide-y divide-skin-base sm:space-y-5">
-            <div>
-                <h3 class="font-heading text-lg font-medium leading-6 text-gray-900">Créer un sujet</h3>
-                <p class="mt-1 max-w-2xl text-sm font-normal text-gray-500 dark:text-gray-400">
-                    Assurez-vous d'avoir lu nos
-                    <a href="{{ route('rules') }}" class="font-medium text-primary-600 hover:text-primary-600-hover">
-                        règles de conduite
-                    </a>
-                    avant de continuer.
-                </p>
-            </div>
-
-            <livewire:forum.create-thread />
-        </div>
-    </div>
-</x-app-layout>
diff --git a/resources/views/livewire/components/slideovers/thread-form.blade.php b/resources/views/livewire/components/slideovers/thread-form.blade.php
index f2903e01..81c2dc96 100644
--- a/resources/views/livewire/components/slideovers/thread-form.blade.php
+++ b/resources/views/livewire/components/slideovers/thread-form.blade.php
@@ -1,4 +1,28 @@
-<div>
-    {{-- If you look to others for fulfillment, you will never truly be fulfilled. --}}
-    Ma modale
-</div>
+<x-form-slider-over
+    :title="$thread->id ? $thread->title : __('pages/forum.new_thread')"
+    action="save"
+>
+    <div class="space-y-4">
+        <div class="text-sm leading-6">
+            <p class="text-gray-500 dark:text-gray-400">{{ __('global.rule_advise') }}</p>
+            <x-link :href="route('rules')" class="inline-flex items-center gap-1.5 text-primary-500 hover:text-primary-600 hover:underline">
+                {{ __('global.read_rules') }}
+                <x-untitledui-arrow-block-right class="size-4" stroke-width="1.5" aria-hidden="true" />
+            </x-link>
+        </div>
+
+        <div class="rounded-xl bg-sky-50 p-4 ring-1 ring-inset ring-sky-200 dark:bg-sky-800/20 dark:ring-sky-700">
+            <div class="flex items-center gap-2">
+                <x-untitledui-alert-circle class="size-5 text-sky-400" aria-hidden="true" />
+                <h3 class="text-sm font-medium text-sky-800 dark:text-sky-400">
+                    {{ __('pages/forum.info.title') }}
+                </h3>
+            </div>
+            <p class="mt-1 text-sm text-sky-700 dark:text-sky-300">
+                {{ __('pages/forum.info.description') }}
+            </p>
+        </div>
+
+        {{ $this->form }}
+    </div>
+</x-form-slider-over>
diff --git a/resources/views/livewire/forum/create-thread.blade.php b/resources/views/livewire/forum/create-thread.blade.php
deleted file mode 100644
index 099881ec..00000000
--- a/resources/views/livewire/forum/create-thread.blade.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<div>
-    <div>
-        @include('livewire.forum._form')
-    </div>
-
-    <div class="mt-10 rounded-xl bg-yellow-50 p-4 ring-1 ring-inset ring-yellow-200">
-        <div class="flex">
-            <div class="shrink-0">
-                <x-untitledui-alert-triangle class="size-5 text-yellow-400" aria-hidden="true" />
-            </div>
-            <div class="ml-3">
-                <h3 class="text-sm font-medium text-yellow-800">
-                    {{ __('pages/forum.info.title') }}
-                </h3>
-                <div class="mt-2 text-sm text-yellow-700">
-                    <p>
-                        {{ __('pages/forum.info.description') }}
-                    </p>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/tests/Feature/Forum/ThreadTest.php b/tests/Feature/Forum/ThreadTest.php
index 6ee45325..aecac48e 100644
--- a/tests/Feature/Forum/ThreadTest.php
+++ b/tests/Feature/Forum/ThreadTest.php
@@ -17,83 +17,95 @@
 });
 
 it('can give an excerpt of its body', function (): void {
+    /** @var Thread $thread */
     $thread = Thread::factory()->make(['body' => 'This is a pretty long text.']);
 
     expect($thread->excerpt(7))->toEqual('This is...');
 });
 
 test('html in excerpts is markdown converted', function (): void {
+    /** @var Thread $thread */
     $thread = Thread::factory()->make(['body' => '<p>Thread body</p>']);
 
     expect($thread->excerpt())->toEqual("Thread body\n");
 });
 
 it('can have many channels', function (): void {
-    $channels = Channel::factory()->count(3)->create();
+    /** @var Thread $thread */
     $thread = Thread::factory()->create();
+    $channels = Channel::factory()->count(3)->create();
+
     $thread->channels()->attach($channels->modelKeys());
 
     expect($thread->channels->count())->toEqual(3);
-})->skip();
+});
 
 it('records activity when a thread is created', function (): void {
-    $user = $this->createUser();
-
-    $thread = Thread::factory()->create(['user_id' => $user->id]);
-
-    Activity::factory()->create([
-        'type' => 'created_thread',
-        'user_id' => $user->id,
-        'subject_id' => $thread->id,
-        'subject_type' => 'thread',
-    ]);
+    $user = $this->login();
 
+    Thread::factory()->create(['user_id' => $user->id]);
     $activity = Activity::query()->first();
 
-    $this->assertEquals($activity->subject->id, $thread->id);
-
-    $this->assertEquals($user->activities->count(), 1);
-})->skip();
+    expect($activity->subject)
+        ->toBeInstanceOf(Thread::class)
+        ->and($activity->type)
+        ->toEqual('created_thread')
+        ->and($user->activities->count())
+        ->toEqual(1);
+});
 
 test('its conversation is old when the oldest reply was six months ago', function (): void {
+    /** @var Thread $thread */
     $thread = Thread::factory()->create();
     $thread->replies()->save(Reply::factory()->make(['created_at' => now()->subMonths(7)]));
 
     expect($thread->isConversationOld())->toBeTrue();
 
-    $thread = Thread::factory()->create();
-    $thread->replies()->save(Reply::factory()->make());
+    /** @var Thread $newThread */
+    $newThread = Thread::factory()->create();
+    $newThread->replies()->save(Reply::factory()->make());
 
-    expect($thread->isConversationOld())->toBeFalse();
+    expect($newThread->isConversationOld())->toBeFalse();
 });
 
 test('its conversation is old when there are no replies but the creation date was six months ago', function (): void {
+    /** @var Thread $thread */
     $thread = Thread::factory()->create(['created_at' => now()->subMonths(7)]);
 
     expect($thread->isConversationOld())->toBeTrue();
 
-    $thread = Thread::factory()->create();
+    /** @var Thread $anotherThread */
+    $anotherThread = Thread::factory()->create();
 
-    expect($thread->isConversationOld())->toBeFalse();
+    expect($anotherThread->isConversationOld())->toBeFalse();
 });
 
 test('we can mark and unmark a reply as the solution', function (): void {
+    $user = $this->createUser();
+
+    /** @var Thread $thread */
     $thread = Thread::factory()->create();
+    /** @var Reply $reply */
     $reply = Reply::factory()->create(['replyable_id' => $thread->id]);
-    $user = $this->createUser();
 
-    expect($thread->isSolutionReply($reply))->toBeFalse();
-    expect($thread->fresh()->wasResolvedBy($user))->toBeFalse();
+    expect($thread->isSolutionReply($reply))
+        ->toBeFalse()
+        ->and($thread->fresh()?->wasResolvedBy($user))
+        ->toBeFalse();
 
     $thread->markSolution($reply, $user);
 
-    expect($thread->isSolutionReply($reply))->toBeTrue();
-    expect($thread->wasResolvedBy($user))->toBeTrue();
+    expect($thread->isSolutionReply($reply))
+        ->toBeTrue()
+        ->and($thread->wasResolvedBy($user))
+        ->toBeTrue();
 
     $thread->unmarkSolution();
 
-    expect($thread->isSolutionReply($reply))->toBeFalse();
-    expect($thread->fresh()->wasResolvedBy($user))->toBeFalse();
+    expect($thread->isSolutionReply($reply))
+        ->toBeFalse()
+        ->and($thread->fresh()?->wasResolvedBy($user))
+        ->toBeFalse();
 });
 
 it('can retrieve the latest threads in a correct order', function (): void {
@@ -110,12 +122,15 @@
 
 it('can retrieve only resolved threads', function (): void {
     createThreadFromToday();
+    /** @var Thread $resolvedThread */
     $resolvedThread = createResolvedThread();
 
-    $threads = Thread::resolved()->get();
+    $threads = Thread::query()->scopes('resolved')->get();
 
-    expect($threads)->toHaveCount(1);
-    expect($resolvedThread->is($threads->first()))->toBeTrue();
+    expect($threads)
+        ->toHaveCount(1)
+        ->and($resolvedThread->is($threads->first()))
+        ->toBeTrue();
 });
 
 it('can retrieve only active threads', function (): void {
@@ -124,8 +139,10 @@
 
     $threads = Thread::feedQuery()->active()->get();
 
-    expect($threads)->toHaveCount(1);
-    expect($activeThread->is($threads->first()))->toBeTrue();
+    expect($threads)
+        ->toHaveCount(1)
+        ->and($activeThread->is($threads->first()))
+        ->toBeTrue();
 });
 
 it('generates a slug when valid url characters provided', function (): void {
@@ -135,10 +152,10 @@
 });
 
 it('generates a unique slug when valid url characters provided', function (): void {
-    $threadOne = Thread::factory()->create(['slug' => 'Help with eloquent']);
-    $threadTwo = Thread::factory()->create(['slug' => 'Help with eloquent']);
+    Thread::factory()->create(['slug' => 'Help with eloquent']);
+    $thread = Thread::factory()->create(['slug' => 'Help with eloquent']);
 
-    expect($threadTwo->slug())->toEqual('help-with-eloquent-1');
+    expect($thread->slug())->toEqual('help-with-eloquent-1');
 });
 
 it('generates a slug when invalid url characters provided', function (): void {
diff --git a/tests/Feature/Livewire/Components/Slideovers/ThreadFormTest.php b/tests/Feature/Livewire/Components/Slideovers/ThreadFormTest.php
index 303c6c49..384f4d44 100644
--- a/tests/Feature/Livewire/Components/Slideovers/ThreadFormTest.php
+++ b/tests/Feature/Livewire/Components/Slideovers/ThreadFormTest.php
@@ -2,10 +2,115 @@
 
 declare(strict_types=1);
 
+use App\Exceptions\UnverifiedUserException;
 use App\Livewire\Components\Slideovers\ThreadForm;
+use App\Models\Channel;
+use App\Models\Thread;
+use App\Models\User;
+use Illuminate\Support\Facades\Notification;
 use Livewire\Livewire;
 
-it('renders successfully', function () {
+beforeEach(function (): void {
+    Notification::fake();
+});
+
+it('return redirect to unauthenticated user', function (): void {
+    Livewire::test(ThreadForm::class)
+        ->assertStatus(302);
+})->group('thread');
+
+it('render the component when authenticated user', function (): void {
+    $this->login();
+
     Livewire::test(ThreadForm::class)
         ->assertStatus(200);
-});
+})->group('thread');
+
+it('validate forms input', function (): void {
+    $this->login();
+
+    Livewire::test(ThreadForm::class)
+        ->fillForm([
+            'title' => '',
+            'body' => '',
+            'channels' => [],
+        ])
+        ->call('save')
+        ->assertHasFormErrors([
+            'title' => ['required'],
+            'body' => ['required'],
+        ]);
+})->group('thread');
+
+it('validate channels can extends 3 when create a thread', function (): void {
+    $this->login();
+
+    Livewire::test(ThreadForm::class)
+        ->fillForm([
+            'title' => 'I have a question about laravel Cameroun',
+            'body' => 'this is my kind body',
+            'channels' => ['laravel', 'php', 'tailwind', 'gaming'],
+        ])
+        ->call('save')
+        ->assertHasFormErrors([
+            'channels' => ['max'],
+        ]);
+})->group('thread');
+
+it('user can create a new thread', function (): void {
+    $user = $this->login();
+    $channels = Channel::factory()->count(3)->create();
+
+    Livewire::test(ThreadForm::class)
+        ->fillForm([
+            'title' => 'I have a question about laravel Cameroun',
+            'body' => 'this is my kind body',
+            'channels' => $channels->pluck('id')->toArray(),
+        ])
+        ->call('save')
+        ->assertHasNoFormErrors();
+
+    $thread = Thread::query()->first();
+
+    expect($thread?->user)->toBeInstanceOf(User::class)
+        ->and($thread?->user->is($user))
+        ->toBeTrue();
+})->group('thread');
+
+it('user cannot create thread with and unverified email address', function (): void {
+    $user = $this->createUser(['email_verified_at' => null]);
+    $channels = Channel::factory()->count(2)->create();
+
+    $this->actingAs($user);
+
+    Livewire::test(ThreadForm::class)
+        ->fillForm([
+            'title' => 'I have a question about laravel Cameroun',
+            'body' => 'this is my kind body',
+            'channels' => $channels->pluck('id')->toArray(),
+        ])
+        ->call('save');
+
+    expect(Thread::query()->first())
+        ->toBeNull();
+})
+    ->group('thread')
+    ->expectException(UnverifiedUserException::class);
+
+it('user cannot updated a thread that is not author', function (): void {
+    $this->login();
+
+    $author = User::factory()->create();
+    $thread = Thread::factory()->create(['user_id' => $author->id]);
+    $channels = Channel::factory()->count(3)->create();
+
+    $thread->channels()->attach($channels->modelKeys());
+
+    Livewire::test(ThreadForm::class, ['threadId' => $thread->id])
+        ->fillForm([
+            'title' => 'Updated thread question',
+            'body' => 'this is my kind body updated',
+        ])
+        ->call('save')
+        ->assertStatus(403);
+})->group('thread');

From 0461f6878a956676d9caad7f6c58a361edcad2df Mon Sep 17 00:00:00 2001
From: Arthur Monney <monneylobe@gmail.com>
Date: Sat, 26 Oct 2024 23:58:11 +0200
Subject: [PATCH 5/8] feat: Add detail thread wip

---
 app/Actions/Forum/SubscribeToThreadAction.php |   5 -
 app/Http/Controllers/ThreadController.php     |  20 ---
 .../Components/Slideovers/ThreadForm.php      |  22 ++-
 app/Livewire/Forum/CreateReply.php            |   2 +-
 app/Livewire/Forum/Reply.php                  |   3 -
 app/Livewire/Forum/Subscribe.php              |  33 ++---
 app/Livewire/Pages/Forum/DetailThread.php     |  28 ++++
 app/Livewire/Pages/Forum/Index.php            |   2 +-
 app/Livewire/Traits/WithAuthenticatedUser.php |  17 +++
 app/Models/Reply.php                          |   8 +-
 app/Policies/ReplyPolicy.php                  |  13 +-
 app/Traits/HasReplies.php                     |   2 -
 lang/en/global.php                            |  12 ++
 lang/en/pages/forum.php                       |  39 +++++
 lang/fr/global.php                            |  12 ++
 lang/fr/pages/forum.php                       |   9 ++
 resources/css/app.css                         |  56 +++----
 resources/css/tag.css                         |  54 +++----
 resources/css/torchlight.css                  |   4 +-
 resources/views/components/ads.blade.php      |  14 +-
 .../components/buttons/default.blade.php      |   2 +-
 resources/views/components/discord.blade.php  |  24 ++-
 .../components/dropdown-profile.blade.php     | 121 +++++++++------
 .../views/components/forum/channel.blade.php  |   4 +-
 .../components/forum/thread-author.blade.php  |   2 +
 .../forum/thread-metadata.blade.php           |  17 +++
 .../forum/thread-overview.blade.php           |  41 +++---
 .../views/components/forum/thread.blade.php   |  16 +-
 .../views/components/info-panel.blade.php     |   4 +-
 .../views/components/layouts/header.blade.php |   6 +-
 .../views/components/sticky-content.blade.php |   2 +-
 .../views/components/user/avatar.blade.php    |   6 +-
 .../views/components/user/points.blade.php    |   2 +-
 resources/views/forum/thread.blade.php        | 139 ------------------
 resources/views/home.blade.php                |   2 +-
 resources/views/layouts/forum.blade.php       |  25 +++-
 resources/views/livewire/editor.blade.php     |   6 +-
 .../views/livewire/forum/_form.blade.php      |  58 --------
 .../livewire/forum/create-reply.blade.php     |  55 +++----
 .../livewire/forum/edit-thread.blade.php      |   3 -
 .../views/livewire/forum/reply.blade.php      | 126 ++++++++++------
 .../views/livewire/forum/subscribe.blade.php  |  42 ++----
 .../pages/forum/detail-thread.blade.php       | 127 ++++++++++++++++
 .../livewire/pages/forum/index.blade.php      |  36 ++---
 routes/forum.php                              |   5 +-
 .../Livewire/Pages/Forum/DetailThreadTest.php |  11 ++
 46 files changed, 662 insertions(+), 575 deletions(-)
 create mode 100644 app/Livewire/Pages/Forum/DetailThread.php
 create mode 100644 app/Livewire/Traits/WithAuthenticatedUser.php
 create mode 100644 lang/en/pages/forum.php
 create mode 100644 resources/views/components/forum/thread-metadata.blade.php
 delete mode 100644 resources/views/livewire/forum/_form.blade.php
 delete mode 100644 resources/views/livewire/forum/edit-thread.blade.php
 create mode 100644 resources/views/livewire/pages/forum/detail-thread.blade.php
 create mode 100644 tests/Feature/Livewire/Pages/Forum/DetailThreadTest.php

diff --git a/app/Actions/Forum/SubscribeToThreadAction.php b/app/Actions/Forum/SubscribeToThreadAction.php
index 6794efd1..73bc91de 100644
--- a/app/Actions/Forum/SubscribeToThreadAction.php
+++ b/app/Actions/Forum/SubscribeToThreadAction.php
@@ -4,8 +4,6 @@
 
 namespace App\Actions\Forum;
 
-use App\Events\ThreadWasCreated;
-use App\Gamify\Points\ThreadCreated;
 use App\Models\Subscribe;
 use App\Models\Thread;
 use Illuminate\Support\Facades\Auth;
@@ -21,8 +19,5 @@ public function execute(Thread $thread): void
         $subscription->subscribeAble()->associate($thread);
 
         $thread->subscribes()->save($subscription);
-
-        givePoint(new ThreadCreated($thread));
-        event(new ThreadWasCreated($thread));
     }
 }
diff --git a/app/Http/Controllers/ThreadController.php b/app/Http/Controllers/ThreadController.php
index 7011e5c2..9b3cc36e 100644
--- a/app/Http/Controllers/ThreadController.php
+++ b/app/Http/Controllers/ThreadController.php
@@ -16,21 +16,6 @@ public function __construct()
         $this->middleware(['auth', 'verified'], ['only' => ['create', 'edit']]);
     }
 
-    public function index(Request $request): View
-    {
-        $filter = getFilter('sortBy', ['recent', 'resolved', 'unresolved']);
-        $threads = Thread::filter($request)
-            ->withviewscount()
-            ->orderByDesc('created_at')
-            ->paginate(10);
-
-        return view('forum.index', [
-            'channel' => null,
-            'threads' => $threads,
-            'filter' => $filter,
-        ]);
-    }
-
     public function channel(Request $request, Channel $channel): View
     {
         $filter = getFilter('sortBy', ['recent', 'resolved', 'unresolved']);
@@ -43,11 +28,6 @@ public function channel(Request $request, Channel $channel): View
         return view('forum.index', compact('channel', 'threads', 'filter'));
     }
 
-    public function create(): View
-    {
-        return view('forum.create');
-    }
-
     public function show(Thread $thread): View
     {
         views($thread)->record();
diff --git a/app/Livewire/Components/Slideovers/ThreadForm.php b/app/Livewire/Components/Slideovers/ThreadForm.php
index d6657ba3..6d2725f7 100644
--- a/app/Livewire/Components/Slideovers/ThreadForm.php
+++ b/app/Livewire/Components/Slideovers/ThreadForm.php
@@ -5,7 +5,10 @@
 namespace App\Livewire\Components\Slideovers;
 
 use App\Actions\Forum\SubscribeToThreadAction;
+use App\Events\ThreadWasCreated;
 use App\Exceptions\UnverifiedUserException;
+use App\Gamify\Points\ThreadCreated;
+use App\Livewire\Traits\WithAuthenticatedUser;
 use App\Models\Thread;
 use Filament\Forms;
 use Filament\Forms\Concerns\InteractsWithForms;
@@ -14,6 +17,8 @@
 use Filament\Notifications\Notification;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\HtmlString;
 use Illuminate\Support\Str;
 use Laravelcm\LivewireSlideOvers\SlideOverComponent;
 
@@ -23,6 +28,7 @@
 final class ThreadForm extends SlideOverComponent implements HasForms
 {
     use InteractsWithForms;
+    use WithAuthenticatedUser;
 
     public ?Thread $thread = null;
 
@@ -30,10 +36,6 @@ final class ThreadForm extends SlideOverComponent implements HasForms
 
     public function mount(?int $threadId = null): void
     {
-        if (! Auth::check()) {
-            $this->redirect(route('login'), navigate: true);
-        }
-
         $this->thread = $threadId
             ? Thread::query()->findOrFail($threadId)
             : new Thread;
@@ -81,6 +83,15 @@ public function form(Form $form): Form
                     ->label(__('validation.attributes.content'))
                     ->required()
                     ->minLength(20),
+                Forms\Components\Placeholder::make('')
+                    ->content(fn () => new HtmlString(Blade::render(<<<'Blade'
+                        <p class="-mt-2 text-sm leading-5 text-gray-500 dark:text-gray-400">
+                            {{ __('pages/forum.torchlight') }}
+                            <a href="https://torchlight.dev/docs/overview" target="_blank" class="font-medium text-primary-600 underline hover:text-primary-500">
+                                Torchlight
+                            </a>
+                        </p>
+                Blade))),
             ])
             ->statePath('data')
             ->model($this->thread);
@@ -109,6 +120,9 @@ public function save(): void
             $this->form->model($thread)->saveRelationships();
 
             app(SubscribeToThreadAction::class)->execute($thread);
+
+            givePoint(new ThreadCreated($thread));
+            event(new ThreadWasCreated($thread));
         }
 
         Notification::make()
diff --git a/app/Livewire/Forum/CreateReply.php b/app/Livewire/Forum/CreateReply.php
index ea56229a..fa5db7a0 100644
--- a/app/Livewire/Forum/CreateReply.php
+++ b/app/Livewire/Forum/CreateReply.php
@@ -41,7 +41,7 @@ public function onMarkdownUpdate(string $content): void
 
     public function save(): void
     {
-        $this->authorize(ReplyPolicy::CREATE, Reply::class);
+        $this->authorize('create', Reply::class);
 
         $this->validate();
 
diff --git a/app/Livewire/Forum/Reply.php b/app/Livewire/Forum/Reply.php
index 6f5fa5c1..8b6866dd 100644
--- a/app/Livewire/Forum/Reply.php
+++ b/app/Livewire/Forum/Reply.php
@@ -11,14 +11,11 @@
 use App\Policies\ThreadPolicy;
 use Filament\Notifications\Notification;
 use Illuminate\Contracts\View\View;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Facades\Auth;
 use Livewire\Component;
 
 final class Reply extends Component
 {
-    use AuthorizesRequests;
-
     public ReplyModel $reply;
 
     public Thread $thread;
diff --git a/app/Livewire/Forum/Subscribe.php b/app/Livewire/Forum/Subscribe.php
index 8c1f3c2d..9bcd4986 100644
--- a/app/Livewire/Forum/Subscribe.php
+++ b/app/Livewire/Forum/Subscribe.php
@@ -4,64 +4,51 @@
 
 namespace App\Livewire\Forum;
 
-use App\Models\Subscribe as SubscribeModel;
+use App\Actions\Forum\SubscribeToThreadAction;
 use App\Models\Thread;
-use App\Policies\ThreadPolicy;
 use Filament\Notifications\Notification;
 use Illuminate\Contracts\View\View;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Facades\Auth;
+use Livewire\Attributes\On;
 use Livewire\Component;
-use Ramsey\Uuid\Uuid;
 
 final class Subscribe extends Component
 {
-    use AuthorizesRequests;
-
     public Thread $thread;
 
-    /**
-     * @var string[]
-     */
-    protected $listeners = ['refresh' => '$refresh'];
-
     public function subscribe(): void
     {
-        $this->authorize(ThreadPolicy::SUBSCRIBE, $this->thread);
+        $this->authorize('subscribe', $this->thread);
 
-        $subscribe = new SubscribeModel;
-        $subscribe->uuid = Uuid::uuid4()->toString();
-        $subscribe->user()->associate(Auth::user());
-        $this->thread->subscribes()->save($subscribe);
+        app(SubscribeToThreadAction::class)->execute($this->thread);
 
         Notification::make()
-            ->title(__('Abonnement'))
-            ->body(__('Vous êtes maintenant abonné à ce sujet.'))
+            ->title(__('Vous êtes maintenant abonné à ce sujet.'))
             ->success()
             ->duration(5000)
             ->send();
 
-        $this->dispatch('refresh')->self();
+        $this->dispatch('subscription.update')->self();
     }
 
     public function unsubscribe(): void
     {
-        $this->authorize(ThreadPolicy::UNSUBSCRIBE, $this->thread);
+        $this->authorize('unsubscribe', $this->thread);
 
         $this->thread->subscribes()
             ->where('user_id', Auth::id())
             ->delete();
 
         Notification::make()
-            ->title(__('Désabonnement'))
-            ->body(__('Vous vous êtes désabonné de ce sujet.'))
+            ->title(__('Vous vous êtes désabonné de ce sujet.'))
             ->success()
             ->duration(5000)
             ->send();
 
-        $this->dispatch('refresh')->self();
+        $this->dispatch('subscription.update')->self();
     }
 
+    #[On('subscription.update')]
     public function render(): View
     {
         return view('livewire.forum.subscribe');
diff --git a/app/Livewire/Pages/Forum/DetailThread.php b/app/Livewire/Pages/Forum/DetailThread.php
new file mode 100644
index 00000000..4b0a9c82
--- /dev/null
+++ b/app/Livewire/Pages/Forum/DetailThread.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Livewire\Pages\Forum;
+
+use App\Models\Thread;
+use Illuminate\Contracts\View\View;
+use Livewire\Attributes\Layout;
+use Livewire\Component;
+
+#[Layout('layouts.forum')]
+final class DetailThread extends Component
+{
+    public Thread $thread;
+
+    public function mount(Thread $thread): void
+    {
+        $this->thread = $thread->load('replies.user', 'replies', 'latestReply');
+        views($thread)->record();
+    }
+
+    public function render(): View
+    {
+        return view('livewire.pages.forum.detail-thread')
+            ->title($this->thread->subject());
+    }
+}
diff --git a/app/Livewire/Pages/Forum/Index.php b/app/Livewire/Pages/Forum/Index.php
index 47b5405a..74cad474 100644
--- a/app/Livewire/Pages/Forum/Index.php
+++ b/app/Livewire/Pages/Forum/Index.php
@@ -24,7 +24,7 @@ final class Index extends Component
 
     public string $search = '';
 
-    public int $perPage = 10;
+    public int $perPage = 20;
 
     public function launchSearch(): void
     {
diff --git a/app/Livewire/Traits/WithAuthenticatedUser.php b/app/Livewire/Traits/WithAuthenticatedUser.php
new file mode 100644
index 00000000..2400d6cb
--- /dev/null
+++ b/app/Livewire/Traits/WithAuthenticatedUser.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Livewire\Traits;
+
+use Illuminate\Support\Facades\Auth;
+
+trait WithAuthenticatedUser
+{
+    public function boot(): void
+    {
+        if (! Auth::check()) {
+            $this->redirect(route('login'), navigate: true);
+        }
+    }
+}
diff --git a/app/Models/Reply.php b/app/Models/Reply.php
index 4bf959af..878a2b82 100644
--- a/app/Models/Reply.php
+++ b/app/Models/Reply.php
@@ -19,6 +19,12 @@
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Support\Str;
 
+/**
+ * @property-read int $id
+ * @property string $body
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ */
 final class Reply extends Model implements ReactableInterface, ReplyInterface
 {
     use HasAuthor;
@@ -53,7 +59,7 @@ public function solutionTo(): HasOne
 
     public function wasJustPublished(): bool
     {
-        return $this->created_at->gt(Carbon::now()->subMinute()); // @phpstan-ignore-line
+        return $this->created_at->gt(Carbon::now()->subMinute());
     }
 
     public function excerpt(int $limit = 100): string
diff --git a/app/Policies/ReplyPolicy.php b/app/Policies/ReplyPolicy.php
index 5b4521c7..10201611 100644
--- a/app/Policies/ReplyPolicy.php
+++ b/app/Policies/ReplyPolicy.php
@@ -9,22 +9,21 @@
 
 final class ReplyPolicy
 {
-    public const CREATE = 'create';
-
-    public const UPDATE = 'update';
-
-    public const DELETE = 'delete';
-
     public function create(User $user): bool
     {
         return $user->hasVerifiedEmail();
     }
 
-    public function update(User $user, Reply $reply): bool
+    public function manage(User $user, Reply $reply): bool
     {
         return $reply->isAuthoredBy($user) || $user->isModerator() || $user->isAdmin();
     }
 
+    public function update(User $user, Reply $reply): bool
+    {
+        return $reply->isAuthoredBy($user) && $user->hasVerifiedEmail();
+    }
+
     public function delete(User $user, Reply $reply): bool
     {
         return $reply->isAuthoredBy($user) || $user->isModerator() || $user->isAdmin();
diff --git a/app/Traits/HasReplies.php b/app/Traits/HasReplies.php
index 3ee7befd..b0ae2289 100644
--- a/app/Traits/HasReplies.php
+++ b/app/Traits/HasReplies.php
@@ -55,11 +55,9 @@ public function isConversationOld(): bool
 
         if ($reply = $this->replies()->latest()->first()) {
             /** @var $reply Reply */
-            // @phpstan-ignore-next-line
             return $reply->created_at->lt($sixMonthsAgo);
         }
 
-        // @phpstan-ignore-next-line
         return $this->created_at->lt($sixMonthsAgo);
     }
 }
diff --git a/lang/en/global.php b/lang/en/global.php
index 316905cb..a49876a0 100644
--- a/lang/en/global.php
+++ b/lang/en/global.php
@@ -23,6 +23,9 @@
         'rules' => 'Rules',
         'privacy' => 'Privacy Policy',
         'terms' => 'Terms & Conditions',
+        'settings' => 'Settings',
+        'profile' => 'Profile',
+        'dashboard' => 'Dashboard',
     ],
     'footer' => [
         'title' => 'Footer',
@@ -35,6 +38,7 @@
         'description' => 'Integrate our various communication platforms, receive tutorials, articles and podcasts on web design and programming.',
     ],
     'ask' => 'asked',
+    'posted' => 'posted',
     'posted_by' => 'Posted by',
     'members' => 'Members',
     'developers' => 'PHP & Laravel developers',
@@ -64,5 +68,13 @@
     'articles_description' => 'The latest news and information on the Blog.',
     'popular_pages' => 'Popular pages',
     'back_home' => 'Or return to homepage',
+    'signed_as' => 'Signed in as',
+    'view_more' => 'View more →',
+    'or' => 'or',
+    'need' => 'You need',
+    'discord' => [
+        'title' => 'Join discord',
+        'description' => 'Join the community Discord server and connect with other developers.',
+    ],
 
 ];
diff --git a/lang/en/pages/forum.php b/lang/en/pages/forum.php
new file mode 100644
index 00000000..8c14ced8
--- /dev/null
+++ b/lang/en/pages/forum.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+
+    'channel_title' => 'Forum :channel',
+    'channel_selector' => 'Select a channel',
+    'channel_placeholder' => 'Find a channel',
+    'channel_lists' => 'All',
+    'view_channel' => 'View',
+    'new_thread' => 'New thread',
+    'reply_thread' => 'Reply thread',
+    'subscribe_thread' => 'Subscribe',
+    'unsubscribe_thread' => 'Unsubscribe',
+    'navigation' => [
+        'threads' => 'All threads',
+        'channels' => 'Channels',
+        'me' => 'My questions',
+        'following' => 'Following',
+        'popular' => 'Popular',
+        'solve' => 'Solve',
+        'unresolved' => 'Unresolved',
+        'no_reply' => 'No answer',
+        'leaderboard' => 'Leaderboard',
+    ],
+    'info' => [
+        'title' => 'Helpful hints',
+        'description' => 'Please search for your question before posting your topic by using the search field in the navigation bar to see if it has already been answered.',
+    ],
+    'thread_search' => 'Search a thread',
+    'collaborate_thread' => 'to join the conversation.',
+    'verify_account' => 'You will need to verify your account before participating in this conversation.',
+    'received_link' => 'Received link',
+    'torchlight' => 'For code formatting (syntax color, language, etc.) we use',
+    'old_thread' => 'The last reply to this topic was more than six months ago. Consider opening a new topic if you have a similar question.',
+    'best_answer' => 'Best answer',
+
+];
diff --git a/lang/fr/global.php b/lang/fr/global.php
index 94ae36f8..41f897e2 100644
--- a/lang/fr/global.php
+++ b/lang/fr/global.php
@@ -23,6 +23,9 @@
         'rules' => 'Code de conduite',
         'privacy' => 'Confidentialité',
         'terms' => 'Conditions d’utilisation',
+        'settings' => 'Paramètres',
+        'profile' => 'Mon profil',
+        'dashboard' => 'Tableau de bord',
     ],
     'footer' => [
         'title' => 'Pied de page',
@@ -35,6 +38,7 @@
         'description' => 'Intégrez nos différentes plateformes de communication, recevez des tutoriels, articles et podcasts sur le design et la programmation web.',
     ],
     'ask' => 'a posé',
+    'posted' => 'a répondu',
     'posted_by' => 'Posté par',
     'members' => 'Membres',
     'developers' => 'Développeurs PHP & Laravel',
@@ -64,5 +68,13 @@
     'articles_description' => 'Les dernières nouveautés, informations sur le Blog.',
     'popular_pages' => 'Pages Populaires',
     'back_home' => "Ou retourner à l'accueil",
+    'signed_as' => 'Connecté en tant que',
+    'view_more' => 'En savoir plus →',
+    'or' => 'ou',
+    'need' => 'Il faut',
+    'discord' => [
+        'title' => 'Rejoindre Discord',
+        'description' => 'Rejoignez le serveur Discord de la communauté et connectez-vous avec d\'autres développeurs.',
+    ],
 
 ];
diff --git a/lang/fr/pages/forum.php b/lang/fr/pages/forum.php
index 0ae2cfa5..40634e21 100644
--- a/lang/fr/pages/forum.php
+++ b/lang/fr/pages/forum.php
@@ -10,6 +10,9 @@
     'channel_lists' => 'Toutes',
     'view_channel' => 'Afficher',
     'new_thread' => 'Nouveau sujet',
+    'reply_thread' => 'Répondre',
+    'subscribe_thread' => "S'abonner",
+    'unsubscribe_thread' => 'Se désabonner',
     'navigation' => [
         'threads' => 'Tous les sujets',
         'channels' => 'Channels',
@@ -26,5 +29,11 @@
         'description' => "Veuillez rechercher votre question avant de publier votre sujet en utilisant le champ de recherche dans la barre de navigation pour voir si elle n'a pas déjà été traitée.",
     ],
     'thread_search' => 'Rechercher un sujet',
+    'collaborate_thread' => 'pour participer à cette conversation.',
+    'verify_account' => 'Vous devrez vérifier votre compte avant de participer à cette conversation.',
+    'received_link' => 'Recevoir un lien',
+    'torchlight' => 'Pour le formatage du code (couleur syntaxique, langage, etc) nous utilisons',
+    'old_thread' => 'La dernière réponse à ce sujet remonte à plus de six mois. Pensez à ouvrir un nouveau sujet si vous avez une question similaire.',
+    'best_answer' => 'Meilleure réponse',
 
 ];
diff --git a/resources/css/app.css b/resources/css/app.css
index afa7ad15..b0d4a4dc 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -10,32 +10,32 @@
 @import 'header.css';
 
 :root {
-    --brand-laravel: #ff2d20;
-    --brand-livewire: #fb70a9;
-    --brand-inertia: #8b5cf6;
-    --brand-javascript: #f7df1e;
-    --brand-typesript: #007acc;
-    --brand-react: #53c1de;
-    --brand-vue-js: #41b883;
-    --brand-php: #777bb3;
-    --brand-digital-ocean: #0080ff;
-    --brand-forge: #19b69b;
-    --brand-packages: #4f46e5;
-    --brand-outils: #22d3ee;
-    --brand-tailwindcss: #06b6d4;
-    --brand-design: #78350f;
-    --brand-alpinejs: #2d3441;
-    --brand-open-source: #f97316;
-    --brand-freelance: #f43f5e;
-    --brand-salaire: #c7d2fe;
-    --brand-projets: #14b8a6;
-    --brand-entrepreneuriat: #0ea5e9;
-    --brand-paiement-en-ligne: #10b981;
-    --brand-branding: #ec4899;
-    --brand-applications: #0284c7;
-    --brand-developpement: #4d7c0f;
-    --brand-event: #36bffa;
-    --brand-tutoriel: #164e63;
-    --brand-communaute: #dd2590;
-    --brand-astuces: #d6bbfb;
+    --laravel: #F56857;
+    --livewire: #fb70a9;
+    --inertia: #8b5cf6;
+    --javascript: #f7df1e;
+    --typesript: #007acc;
+    --react: #53c1de;
+    --vue-js: #41b883;
+    --php: #777bb3;
+    --digital-ocean: #0080ff;
+    --forge: #19b69b;
+    --packages: #4f46e5;
+    --outils: #22d3ee;
+    --tailwindcss: #06b6d4;
+    --design: #78350f;
+    --alpinejs: #2d3441;
+    --open-source: #f97316;
+    --freelance: #f43f5e;
+    --salaire: #c7d2fe;
+    --projets: #14b8a6;
+    --entrepreneuriat: #0ea5e9;
+    --paiement-en-ligne: #10b981;
+    --branding: #ec4899;
+    --applications: #0284c7;
+    --developpement: #4d7c0f;
+    --event: #36bffa;
+    --tutoriel: #164e63;
+    --communaute: #dd2590;
+    --astuces: #d6bbfb;
 }
diff --git a/resources/css/tag.css b/resources/css/tag.css
index 939763ba..9cea98ca 100644
--- a/resources/css/tag.css
+++ b/resources/css/tag.css
@@ -1,99 +1,103 @@
 .brand-laravel {
-    color: var(--brand-laravel);
+    color: var(--laravel);
 }
 
 .brand-alpinejs {
-    color: var(--brand-alpinejs);
+    color: var(--alpinejs);
 }
 
 .brand-javascript {
-    color: var(--brand-javascript);
+    color: var(--javascript);
 }
 
 .brand-typesript {
-    color: var(--brand-typesript);
+    color: var(--typesript);
 }
 
 .brand-react {
-    color: var(--brand-react);
+    color: var(--react);
 }
 
 .brand-vue-js {
-    color: var(--brand-vue-js);
+    color: var(--vue-js);
 }
 
 .brand-php {
-    color: var(--brand-php);
+    color: var(--php);
 }
 
 .brand-digital-ocean {
-    color: var(--brand-digital-ocean);
+    color: var(--digital-ocean);
 }
 
 .brand-forge {
-    color: var(--brand-forge);
+    color: var(--forge);
 }
 
 .brand-packages {
-    color: var(--brand-packages);
+    color: var(--packages);
 }
 
 .brand-outils {
-    color: var(--brand-outils);
+    color: var(--outils);
 }
 
 .brand-tailwindcss {
-    color: var(--brand-tailwindcss);
+    color: var(--tailwindcss);
 }
 
 .brand-design {
-    color: var(--brand-design);
+    color: var(--design);
 }
 
 .brand-open-source {
-    color: var(--brand-open-source);
+    color: var(--open-source);
 }
 
 .brand-freelance {
-    color: var(--brand-freelance);
+    color: var(--freelance);
 }
 
 .brand-salaire {
-    color: var(--brand-salaire);
+    color: var(--salaire);
 }
 
 .brand-projets {
-    color: var(--brand-projets);
+    color: var(--projets);
 }
 
 .brand-entrepreneuriat {
-    color: var(--brand-entrepreneuriat);
+    color: var(--entrepreneuriat);
 }
 
 .brand-paiement-en-ligne {
-    color: var(--brand-paiement-en-ligne);
+    color: var(--paiement-en-ligne);
 }
 
 .brand-branding {
-    color: var(--brand-branding);
+    color: var(--branding);
 }
 
 .brand-applications {
-    color: var(--brand-applications);
+    color: var(--applications);
 }
 
 .brand-event {
-    color: var(--brand-event);
+    color: var(--event);
 }
 
 .brand-tutoriel {
-    color: var(--brand-tutoriel);
+    color: var(--tutoriel);
 }
 
 .brand-communaute {
-    color: var(--brand-communaute);
+    color: var(--communaute);
 }
 
 .brand-astuces {
-    color: var(--brand-astuces);
+    color: var(--astuces);
+}
+
+.is-channel {
+  @apply dark:border-white/20 dark:text-[var(--channel-color)] [&_svg]:dark:hover:fill-white dark:hover:text-white;
 }
diff --git a/resources/css/torchlight.css b/resources/css/torchlight.css
index 0919ba5f..7a3336fc 100644
--- a/resources/css/torchlight.css
+++ b/resources/css/torchlight.css
@@ -3,7 +3,7 @@
  overflow-x-auto is recommended.
 */
 pre {
-    @apply my-4 overflow-x-auto rounded;
+    @apply my-4 overflow-x-auto rounded-lg;
     padding: 0 !important;
 }
 
@@ -14,7 +14,7 @@ pre {
  colors extend edge to edge.
 */
 pre code.torchlight {
-    @apply block min-w-max py-6;
+    @apply block min-w-max py-6 max-h-[43.75rem];
 }
 
 /*
diff --git a/resources/views/components/ads.blade.php b/resources/views/components/ads.blade.php
index 2413451d..a6f49b37 100644
--- a/resources/views/components/ads.blade.php
+++ b/resources/views/components/ads.blade.php
@@ -1,26 +1,22 @@
 @php($ads = Illuminate\Support\Arr::random(config('lcm.ads')))
 
 <div id="laravelcm-ads">
-    <a href="{{ $ads['url'] }}" class="block">
+    <a href="{{ $ads['url'] }}" class="block rounded-lg overflow-hidden ring-1 ring-gray-100 shadow dark:ring-white/20">
         <img
-            class="rounded-lg"
+            class="aspect-[3/2] object-cover"
             src="{{ asset("/images/ads/{$ads['image']}.png") }}"
             alt="{{ $ads['alt'] }}"
-            width="457"
-            height="336"
         />
     </a>
-    <p class="mt-4 font-normal">
-        <a href="{{ $ads['url'] }}" class="text-sm leading-5 text-gray-500 dark:text-gray-400">
-            {{ $ads['description'] }}
-        </a>
+    <p class="mt-4 text-sm text-gray-500 dark:text-gray-300">
+        {{ __($ads['description']) }}
     </p>
     <div class="mt-2">
         <a
             href="{{ $ads['url'] }}"
             class="text-sm font-medium text-primary-600 hover:text-primary-600-hover hover:underline"
         >
-            En savoir plus →
+            {{ __('global.view_more') }}
         </a>
     </div>
 </div>
diff --git a/resources/views/components/buttons/default.blade.php b/resources/views/components/buttons/default.blade.php
index 54a9e3f2..f0cd4d26 100644
--- a/resources/views/components/buttons/default.blade.php
+++ b/resources/views/components/buttons/default.blade.php
@@ -1,5 +1,5 @@
 @php
-    $classes = 'inline-flex justify-center py-2 px-4 bg-white border-0 ring-1 ring-gray-200 dark:ring-white/20 rounded-lg shadow-sm text-sm text-gray-700 hover:text-gray-900 dark:text-gray-400 hover:bg-gray-50 dark:hover:bg-white/10 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-white focus:ring-green-500 dark:bg-gray-800 dark:focus:ring-offset-gray-900';
+    $classes = 'inline-flex justify-center py-2 px-4 bg-white border-0 ring-1 ring-gray-200 dark:ring-white/20 rounded-lg shadow-sm text-sm text-gray-700 hover:text-gray-900 dark:text-gray-400 hover:bg-white/50 dark:hover:bg-white/10 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-white focus:ring-green-500 dark:bg-gray-800 dark:focus:ring-offset-gray-900';
 @endphp
 
 @if ($attributes->hasAny(['href', ':href']))
diff --git a/resources/views/components/discord.blade.php b/resources/views/components/discord.blade.php
index d1303cfa..5aff6c10 100644
--- a/resources/views/components/discord.blade.php
+++ b/resources/views/components/discord.blade.php
@@ -1,11 +1,6 @@
-<div class="overflow-hidden">
-    <a href="https://discord.gg/KNp6brbyVD">
-        <svg
-            class="h-12 w-auto text-[#5865F2]"
-            fill="currentColor"
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 800 272.1"
-        >
+<div class="overflow-hidden bg-[#5865F2] rounded-xl p-4">
+    <a href="https://discord.gg/KNp6brbyVD" target="_blank">
+        <svg class="h-12 w-auto text-white" fill="currentColor" viewBox="0 0 800 272.1">
             <path
                 d="M142.8 120.1c-5.7 0-10.2 4.9-10.2 11s4.6 11 10.2 11c5.7 0 10.2-4.9 10.2-11s-4.6-11-10.2-11zM106.3 120.1c-5.7 0-10.2 4.9-10.2 11s4.6 11 10.2 11c5.7 0 10.2-4.9 10.2-11 .1-6.1-4.5-11-10.2-11z"
             />
@@ -13,12 +8,11 @@ class="h-12 w-auto text-[#5865F2]"
                 d="M191.4 36.9h-134c-11.3 0-20.5 9.2-20.5 20.5v134c0 11.3 9.2 20.5 20.5 20.5h113.4l-5.3-18.3 12.8 11.8 12.1 11.1 21.6 18.7V57.4c-.1-11.3-9.3-20.5-20.6-20.5zm-38.6 129.5s-3.6-4.3-6.6-8c13.1-3.7 18.1-11.8 18.1-11.8-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.4-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.6-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.2-1.8-1-2.8-1.7-2.8-1.7s4.8 7.9 17.5 11.7c-3 3.8-6.7 8.2-6.7 8.2-22.1-.7-30.5-15.1-30.5-15.1 0-31.9 14.4-57.8 14.4-57.8 14.4-10.7 28-10.4 28-10.4l1 1.2c-18 5.1-26.2 13-26.2 13s2.2-1.2 5.9-2.8c10.7-4.7 19.2-5.9 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.5 0 0-7.9-7.5-24.9-12.6l1.4-1.6s13.7-.3 28 10.4c0 0 14.4 25.9 14.4 57.8 0-.1-8.4 14.3-30.5 15zM303.8 79.7h-33.2V117l22.1 19.9v-36.2h11.8c7.5 0 11.2 3.6 11.2 9.4v27.7c0 5.8-3.5 9.7-11.2 9.7h-34v21.1h33.2c17.8.1 34.5-8.8 34.5-29.2v-29.8c.1-20.8-16.6-29.9-34.4-29.9zm174 59.7v-30.6c0-11 19.8-13.5 25.8-2.5l18.3-7.4c-7.2-15.8-20.3-20.4-31.2-20.4-17.8 0-35.4 10.3-35.4 30.3v30.6c0 20.2 17.6 30.3 35 30.3 11.2 0 24.6-5.5 32-19.9l-19.6-9c-4.8 12.3-24.9 9.3-24.9-1.4zM417.3 113c-6.9-1.5-11.5-4-11.8-8.3.4-10.3 16.3-10.7 25.6-.8l14.7-11.3c-9.2-11.2-19.6-14.2-30.3-14.2-16.3 0-32.1 9.2-32.1 26.6 0 16.9 13 26 27.3 28.2 7.3 1 15.4 3.9 15.2 8.9-.6 9.5-20.2 9-29.1-1.8l-14.2 13.3c8.3 10.7 19.6 16.1 30.2 16.1 16.3 0 34.4-9.4 35.1-26.6 1-21.7-14.8-27.2-30.6-30.1zm-67 55.5h22.4V79.7h-22.4v88.8zM728 79.7h-33.2V117l22.1 19.9v-36.2h11.8c7.5 0 11.2 3.6 11.2 9.4v27.7c0 5.8-3.5 9.7-11.2 9.7h-34v21.1H728c17.8.1 34.5-8.8 34.5-29.2v-29.8c0-20.8-16.7-29.9-34.5-29.9zm-162.9-1.2c-18.4 0-36.7 10-36.7 30.5v30.3c0 20.3 18.4 30.5 36.9 30.5 18.4 0 36.7-10.2 36.7-30.5V109c0-20.4-18.5-30.5-36.9-30.5zm14.4 60.8c0 6.4-7.2 9.7-14.3 9.7-7.2 0-14.4-3.1-14.4-9.7V109c0-6.5 7-10 14-10 7.3 0 14.7 3.1 14.7 10v30.3zM682.4 109c-.5-20.8-14.7-29.2-33-29.2h-35.5v88.8h22.7v-28.2h4l20.6 28.2h28L665 138.1c10.7-3.4 17.4-12.7 17.4-29.1zm-32.6 12h-13.2v-20.3h13.2c14.1 0 14.1 20.3 0 20.3z"
             />
         </svg>
-        <p class="mt-1 text-base leading-6 text-gray-900">
-            <strong class="block">Laravel Cameroun Discord</strong>
-            <span class="mt-2 block text-sm text-gray-500 dark:text-gray-400">
-                Rejoignez le serveur Discord de la communauté et connectez-vous avec d'autres développeurs partageant
-                les mêmes objectifs !
-            </span>
-        </p>
+        <div class="mt-2 leading-6">
+            <h5 class="text-white font-heading font-medium">{{ __('global.discord.title') }}</h5>
+            <p class="mt-3 block text-sm text-indigo-100">
+                {{ __('global.discord.description') }}
+            </p>
+        </div>
     </a>
 </div>
diff --git a/resources/views/components/dropdown-profile.blade.php b/resources/views/components/dropdown-profile.blade.php
index 430649fb..643a5756 100644
--- a/resources/views/components/dropdown-profile.blade.php
+++ b/resources/views/components/dropdown-profile.blade.php
@@ -1,8 +1,17 @@
-<div @keydown.escape.stop="open = false;" @click.outside="open = false;" class="relative">
+@php
+    $user = \Illuminate\Support\Facades\Auth::user();
+@endphp
+
+<div x-data="{ open: false }"
+     @keydown.window.escape="open = false"
+     @keydown.escape.stop="open = false;"
+     @click.outside="open = false;"
+     class="relative"
+>
     <div>
         <button
             type="button"
-            class="flex rounded-full bg-skin-menu text-sm focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2"
+            class="flex rounded-full bg-white text-sm dark:bg-gray-800 focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2 dark:focus:ring-offset-gray-900"
             id="user-menu-button"
             x-ref="button"
             @click="open =! open"
@@ -11,7 +20,7 @@ class="flex rounded-full bg-skin-menu text-sm focus:outline-none focus:ring-2 fo
             x-bind:aria-expanded="open.toString()"
         >
             <span class="sr-only">{{ __('global.open_navigation') }}</span>
-            <x-user.avatar :user="Auth::user()" class="size-8" />
+            <x-user.avatar :user="$user" class="size-8" />
         </button>
     </div>
 
@@ -23,7 +32,7 @@ class="flex rounded-full bg-skin-menu text-sm focus:outline-none focus:ring-2 fo
         x-transition:leave="transition duration-75 ease-in"
         x-transition:leave-start="scale-100 transform opacity-100"
         x-transition:leave-end="scale-95 transform opacity-0"
-        class="absolute right-0 mt-2 w-60 origin-top-right divide-y divide-skin-light rounded-md bg-skin-menu py-1 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"
+        class="absolute -right-4 mt-2 w-60 origin-top-right divide-y divide-gray-200 dark:divide-white/20 rounded-lg bg-white py-1 shadow ring-1 ring-black ring-opacity-5 dark:bg-gray-800 dark:ring-white/20 focus:outline-none"
         x-ref="menu"
         role="menu"
         aria-orientation="vertical"
@@ -34,27 +43,30 @@ class="absolute right-0 mt-2 w-60 origin-top-right divide-y divide-skin-light ro
         @keyup.space.prevent="open = false;"
         style="display: none"
     >
-        <div class="px-3.5 py-3" role="none">
-            <p class="text-xs font-normal text-gray-500 dark:text-gray-400" role="none">Connecté en tant que</p>
-            <p class="truncate text-sm font-medium text-gray-900" role="none">
-                {{ Auth::user()->email }}
+        <div class="px-3.5 py-3">
+            <p class="text-xs text-gray-500 dark:text-gray-400">
+                {{ __('global.signed_as') }}
+            </p>
+            <p class="truncate text-sm font-medium text-gray-900 dark:text-white">
+                {{ $user->email }}
             </p>
         </div>
 
-        @if (Auth::user()->hasRole(['admin', 'moderator']))
-            <div class="px-3.5 py-1.5" role="none">
-                <a
-                    href="{{ route('filament.admin.pages.dashboard') }}"
-                    class="group flex items-center py-1.5 text-sm font-normal text-gray-500 dark:text-gray-400 hover:text-primary-600"
+        @if ($user->hasRole(['admin', 'moderator']))
+            <div class="px-3.5 py-1.5" role="menu">
+                <x-link
+                    :href="route('filament.admin.pages.dashboard')"
+                    class="group flex items-center gap-2 py-1.5 text-sm text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-white"
                     role="menuitem"
                     tabindex="-1"
-                    id="user-menu-item-0"
                 >
                     <x-untitledui-monitor
-                        class="mr-3 size-5 flex-none text-skin-muted group-hover:text-primary-600"
+                        class="size-5 text-gray-400 dark:gray-500 group-hover:text-gray-500 dark:group-hover:text-gray-300"
+                        stroke-width="1.5"
+                        aria-hidden="true"
                     />
                     Administration
-                </a>
+                </x-link>
             </div>
         @endif
 
@@ -80,7 +92,8 @@ class="group flex items-center py-1.5 text-sm font-normal text-gray-500 dark:tex
                         id="user-menu-item-0"
                     >
                         <x-icon.user-edit
-                            class="mr-3 size-5 flex-none text-skin-muted group-hover:text-primary-600"
+                            class="mr-3 size-5 flex-none text-gray-400 dark:gray-500 group-hover:text-primary-600"
+                            aria-hidden="true"
                         />
                         Mon compte
                     </a>
@@ -92,7 +105,8 @@ class="group flex items-center py-1.5 text-sm font-normal text-gray-500 dark:tex
                         id="user-menu-item-0"
                     >
                         <x-icon.file-attachment
-                            class="mr-3 size-5 flex-none text-skin-muted group-hover:text-primary-600"
+                            class="mr-3 size-5 flex-none text-gray-400 dark:gray-500 group-hover:text-primary-600"
+                            aria-hidden="true"
                         />
                         Mes candidatures
                     </a>
@@ -104,7 +118,8 @@ class="group flex items-center py-1.5 text-sm font-normal text-gray-500 dark:tex
                         id="user-menu-item-0"
                     >
                         <x-icon.clipboard-document
-                            class="mr-3 size-5 flex-none text-skin-muted group-hover:text-primary-600"
+                            class="mr-3 size-5 flex-none text-gray-400 dark:gray-500 group-hover:text-primary-600"
+                            aria-hidden="true"
                         />
                         Mes compétences
                     </a>
@@ -116,7 +131,8 @@ class="group flex items-center py-1.5 text-sm font-normal text-gray-500 dark:tex
                         id="user-menu-item-0"
                     >
                         <x-icon.adjustments
-                            class="mr-3 size-5 flex-none text-skin-muted group-hover:text-primary-600"
+                            class="mr-3 size-5 flex-none text-gray-400 dark:gray-500 group-hover:text-primary-600"
+                            aria-hidden="true"
                         />
                         Préférences
                     </a>
@@ -150,50 +166,59 @@ class="mt-3 inline-block w-full rounded-md border border-skin-base px-1.5 py-2 t
             </div>
         @endfeature--}}
 
-        <div class="px-3.5 py-1.5" role="none">
-            <a
-                href="{{ route('dashboard') }}"
-                class="group flex items-center py-1.5 text-sm font-normal text-gray-500 dark:text-gray-400 hover:text-primary-600"
+        <div class="px-3.5 space-y-1.5 py-1.5" role="menu">
+            <x-link
+                :href="route('dashboard')"
+                class="group flex items-center gap-2 py-1.5 text-sm text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-white"
                 role="menuitem"
                 tabindex="-1"
-                id="user-menu-item-0"
             >
-                <x-untitledui-grid class="mr-3 size-5 flex-none text-skin-muted group-hover:text-primary-600" />
-                Tableau de bord
-            </a>
-            <a
-                href="{{ route('profile') }}"
-                class="group flex items-center py-1.5 text-sm font-normal text-gray-500 dark:text-gray-400 hover:text-primary-600"
+                <x-untitledui-grid
+                    class="size-5 text-gray-400 dark:gray-500 group-hover:text-gray-500 dark:group-hover:text-gray-300"
+                    stroke-width="1.5"
+                    aria-hidden="true"
+                />
+                {{ __('global.navigation.dashboard') }}
+            </x-link>
+            <x-link
+                :href="route('profile')"
+                class="group flex items-center gap-2 py-1.5 text-sm text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-white"
                 role="menuitem"
                 tabindex="-1"
-                id="user-menu-item-1"
             >
                 <x-untitledui-user-circle
-                    class="mr-3 size-5 flex-none text-skin-muted group-hover:text-primary-600"
+                    class="size-5 text-gray-400 dark:gray-500 group-hover:text-gray-500 dark:group-hover:text-gray-300"
+                    stroke-width="1.5"
+                    aria-hidden="true"
                 />
-                Mon profil
-            </a>
-            <a
-                href="{{ route('user.settings') }}"
-                class="group flex items-center py-1.5 text-sm font-normal text-gray-500 dark:text-gray-400 hover:text-primary-600"
-                role="menuitem"
+                {{ __('global.navigation.profile') }}
+            </x-link>
+            <x-link
+                :href="route('user.settings')"
+                class="group flex items-center gap-2 py-1.5 text-sm text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-white"
                 tabindex="-1"
-                id="user-menu-item-2"
             >
-                <x-untitledui-sliders class="mr-3 size-5 flex-none text-skin-muted group-hover:text-primary-600" />
-                Paramètres
-            </a>
-            <form method="POST" action="{{ route('logout') }}" role="form">
+                <x-untitledui-sliders
+                    class="size-5 text-gray-400 dark:gray-500 group-hover:text-gray-500 dark:group-hover:text-gray-300"
+                    stroke-width="1.5"
+                    aria-hidden="true"
+                />
+                {{ __('global.navigation.settings') }}
+            </x-link>
+            <form method="POST" action="{{ route('logout') }}">
                 @csrf
                 <button
                     type="submit"
-                    class="group flex w-full items-center py-1.5 text-left text-sm font-normal text-gray-500 dark:text-gray-400 hover:text-primary-600"
-                    role="menuitem"
+                    class="group flex w-full items-center gap-2 py-1.5 text-sm text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-white"
                     tabindex="-1"
                     id="logout"
                 >
-                    <x-icon.logout class="mr-3 size-5 flex-none text-skin-muted group-hover:text-primary-600" />
-                    Se déconnecter
+                    <x-icon.logout
+                        class="size-5 text-gray-400 dark:gray-500 group-hover:text-gray-500 dark:group-hover:text-gray-300"
+                        stroke-width="1.5"
+                        aria-hidden="true"
+                    />
+                    {{ __('global.logout') }}
                 </button>
             </form>
         </div>
diff --git a/resources/views/components/forum/channel.blade.php b/resources/views/components/forum/channel.blade.php
index 22259777..6323b43d 100644
--- a/resources/views/components/forum/channel.blade.php
+++ b/resources/views/components/forum/channel.blade.php
@@ -3,10 +3,10 @@
 ])
 
 <span
-    {{ $attributes->twMerge(['class' => 'inline-flex items-center gap-2 rounded-full text-gray-900 border border-gray-200 px-2.5 py-1 text-sm font-medium leading-none dark:text-white dark:bg-gray-900 dark:border-white/20']) }}
+    {{ $attributes->twMerge(['class' => 'inline-flex items-center gap-2 rounded-full text-gray-900 border border-gray-200 px-2.5 py-1 text-sm font-medium leading-none transition duration-200 ease-in-out dark:text-white']) }}
 >
     <svg
-        class="size-2"
+        class="size-2 transition-colors duration-200"
         fill="{{ $channel->parent_id ? $channel->parent->color : $channel->color }}"
         viewBox="0 0 8 8"
     >
diff --git a/resources/views/components/forum/thread-author.blade.php b/resources/views/components/forum/thread-author.blade.php
index 30944f45..eda332b4 100644
--- a/resources/views/components/forum/thread-author.blade.php
+++ b/resources/views/components/forum/thread-author.blade.php
@@ -1,3 +1,5 @@
+{{-- @deprecated: A supprimer --}}
+
 @props([
     'author',
 ])
diff --git a/resources/views/components/forum/thread-metadata.blade.php b/resources/views/components/forum/thread-metadata.blade.php
new file mode 100644
index 00000000..32a483b6
--- /dev/null
+++ b/resources/views/components/forum/thread-metadata.blade.php
@@ -0,0 +1,17 @@
+@props([
+    'thread',
+])
+
+<div {{ $attributes->twMerge(['class' => 'flex items-center gap-2']) }}>
+    <p class="inline-flex items-center gap-1 text-sm">
+        <x-untitledui-message-text-square-02 class="size-5 text-gray-400 dark:text-gray-500" stroke-width="1.5" aria-hidden="true" />
+        <span class="text-gray-500 dark:text-gray-400">{{ count($thread->replies) }}</span>
+        <span class="sr-only">{{ __('global.answers') }}</span>
+    </p>
+
+    <p class="inline-flex items-center gap-1 text-sm">
+        <x-untitledui-eye class="size-5 text-gray-400 dark:text-gray-500" stroke-width="1.5" aria-hidden="true" />
+        <span class="text-gray-500 dark:text-gray-400">{{ $thread->views_count }}</span>
+        <span class="sr-only">{{ __('global.views') }}</span>
+    </p>
+</div>
diff --git a/resources/views/components/forum/thread-overview.blade.php b/resources/views/components/forum/thread-overview.blade.php
index fbc8765a..bb3cd36d 100644
--- a/resources/views/components/forum/thread-overview.blade.php
+++ b/resources/views/components/forum/thread-overview.blade.php
@@ -2,12 +2,19 @@
     'thread',
 ])
 
-<article class="rounded-xl cursor-pointer bg-white p-4 ring-1 ring-inset ring-gray-200/60 dark:bg-gray-800 dark:ring-white/10 lg:py-5 lg:px-6" aria-labelledby="{{ $thread->slug }}">
+<article class="rounded-xl cursor-pointer bg-white p-4 ring-1 ring-inset ring-gray-200/60 transition duration-200 ease-in-out dark:bg-gray-800 dark:ring-white/10 dark:hover:bg-white/10 lg:py-5 lg:px-6" aria-labelledby="{{ $thread->slug }}">
     @if (count($channels = $thread->channels->load('parent')))
-        <div class="hidden mb-2 lg:flex flex-wrap lg:gap-1.5">
+        <div class="flex mb-2 flex-wrap lg:gap-1.5">
             @foreach ($channels as $channel)
-                <x-link href="{{ route('forum.channels', $channel) }}" class="flex gap-2">
-                    <x-forum.channel :channel="$channel" class="text-xs" />
+                @php
+                    $color = $channel->parent_id ? $channel->parent->color : $channel->color;
+                @endphp
+                <x-link :href="route('forum.channels', $channel)" class="flex gap-2">
+                    <x-forum.channel
+                        :channel="$channel"
+                        class="text-xs is-channel is-{{ $channel->slug }}"
+                        style="--channel-color: {{ $color }}"
+                    />
                 </x-link>
             @endforeach
         </div>
@@ -22,9 +29,9 @@
         @if ($thread->isSolved())
             <x-link
                 :href="route('forum.show', $thread->slug). '#' .$thread->solution_reply_id"
-                class="inline-flex items-center rounded-xl gap-2 font-medium bg-green-50 ring-1 ring-green-200 text-green-700"
+                class="inline-flex items-center rounded-xl gap-1 px-2 py-0.5 font-medium bg-primary-50 ring-1 ring-primary-200 text-primary-700 dark:bg-primary-800/20 dark:text-primary-500 dark:ring-primary-800"
             >
-                <x-untitledui-check-verified class="size-5" stroke-width="1.5" aria-hidden="true" />
+                <x-untitledui-check-verified class="size-3.5 text-primary-600" stroke-width="1.5" aria-hidden="true" />
                 <span class="text-xs">{{ __('pages/forum.navigation.solve') }}</span>
             </x-link>
         @endif
@@ -42,24 +49,14 @@ class="inline-flex items-center rounded-xl gap-2 font-medium bg-green-50 ring-1
                     {{ '@' . $thread->user->username }}
                 </span>
             </x-link>
-            <span aria-hidden="true">·</span>
-            <span class="text-sm text-gray-500 dark:text-gray-400">
-                <time-ago time="{{ $thread->created_at->getTimestamp() }}" />
+            <span class="flex items-center text-xs text-gray-500 flex-wrap gap-x-1 dark:text-gray-400">
+                <span>{{ __('global.ask') }}</span>
+                <time datetime="{{ $thread->created_at }}">
+                    {{ $thread->created_at->diffForHumans() }}
+                </time>
             </span>
         </div>
 
-        <div class="flex items-center gap-2">
-            <p class="inline-flex items-center gap-1 text-sm">
-                <x-untitledui-message-text-square-02 class="size-5 text-gray-400 dark:text-gray-500" stroke-width="1.5" aria-hidden="true" />
-                <span class="text-gray-500 dark:text-gray-400">{{ count($thread->replies) }}</span>
-                <span class="sr-only">{{ __('global.answers') }}</span>
-            </p>
-
-            <p class="inline-flex items-center gap-1 text-sm">
-                <x-untitledui-eye class="size-5 text-gray-400 dark:text-gray-500" stroke-width="1.5" aria-hidden="true" />
-                <span class="text-gray-500 dark:text-gray-400">{{ $thread->views_count }}</span>
-                <span class="sr-only">{{ __('global.views') }}</span>
-            </p>
-        </div>
+        <x-forum.thread-metadata :thread="$thread" />
     </div>
 </article>
diff --git a/resources/views/components/forum/thread.blade.php b/resources/views/components/forum/thread.blade.php
index 381a1a75..d2d2aa1f 100644
--- a/resources/views/components/forum/thread.blade.php
+++ b/resources/views/components/forum/thread.blade.php
@@ -2,7 +2,7 @@
     'thread',
 ])
 
-<div class="thread mt-5 rounded-md bg-skin-card p-3 shadow sm:p-4">
+{{--<div class="thread mt-5 rounded-md bg-skin-card p-3 shadow sm:p-4">
     @canany([App\Policies\ThreadPolicy::UPDATE, App\Policies\ThreadPolicy::DELETE], $thread)
         <div class="mb-4 flex items-center justify-end">
             <div class="flex shrink-0 self-center">
@@ -115,16 +115,4 @@ class="group flex px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:text-
             </div>
         </div>
     @endcanany
-
-    <div class="prose prose-base prose-green max-w-none text-gray-500 dark:text-gray-400">
-        <x-markdown-content :content="$thread->body" />
-    </div>
-    <div class="mt-6">
-        <livewire:reactions
-            wire:key="$thread->id"
-            :model="$thread"
-            :with-place-holder="false"
-            :with-background="false"
-        />
-    </div>
-</div>
+</div>--}}
diff --git a/resources/views/components/info-panel.blade.php b/resources/views/components/info-panel.blade.php
index bd4ec476..63dc10e0 100644
--- a/resources/views/components/info-panel.blade.php
+++ b/resources/views/components/info-panel.blade.php
@@ -1,7 +1,7 @@
-<div {{ $attributes->merge(['class' => 'rounded-md bg-blue-50 p-4']) }}>
+<div {{ $attributes->merge(['class' => 'rounded-lg bg-blue-50 p-4 dark:bg-blue-800/20']) }}>
     <div class="flex">
         <div class="shrink-0">
-            <x-heroicon-s-information-circle class="size-5 text-blue-400" />
+            <x-heroicon-s-information-circle class="size-5 text-blue-400" aria-hidden="true" />
         </div>
         <div class="ml-3 flex-1">
             {{ $slot }}
diff --git a/resources/views/components/layouts/header.blade.php b/resources/views/components/layouts/header.blade.php
index 3d209f8a..692733b4 100644
--- a/resources/views/components/layouts/header.blade.php
+++ b/resources/views/components/layouts/header.blade.php
@@ -12,11 +12,7 @@
                 </div>
             </div>
 
-            <div
-                x-data="{ open: false }"
-                @keydown.window.escape="open = false"
-                class="flex items-center gap-6"
-            >
+            <div x-data class="flex items-center gap-6">
                 @include('partials._search')
 
                 <!-- Large screen authenticate links -->
diff --git a/resources/views/components/sticky-content.blade.php b/resources/views/components/sticky-content.blade.php
index 53e6e535..365d8692 100644
--- a/resources/views/components/sticky-content.blade.php
+++ b/resources/views/components/sticky-content.blade.php
@@ -1,3 +1,3 @@
-<aside {{ $attributes->merge(['class' => 'sticky top-16']) }}>
+<aside {{ $attributes->merge(['class' => 'sticky top-10']) }}>
     {{ $slot }}
 </aside>
diff --git a/resources/views/components/user/avatar.blade.php b/resources/views/components/user/avatar.blade.php
index 985239e6..68c89804 100644
--- a/resources/views/components/user/avatar.blade.php
+++ b/resources/views/components/user/avatar.blade.php
@@ -7,11 +7,11 @@
 @if ($user->is_sponsor)
     <span @class(['relative inline-block', $container])>
         <img
-            {{ $attributes->twMerge(['class' => 'object-cover rounded-full ring-2 ring-yellow-500']) }}
+            {{ $attributes->twMerge(['class' => 'object-cover bg-gray-100 dark:bg-gray-900 rounded-full ring-2 !ring-flag-yellow']) }}
             src="{{ $user->profile_photo_url }}"
             alt="{{ $user->username() }}"
         />
-        <span @class(['absolute flex items-center justify-center rounded-full bg-white p-1 ring-yellow-500', $span])>
+        <span @class(['absolute flex items-center justify-center rounded-full bg-white p-1 ring-flag-yellow', $span])>
             <svg
                 class="size-full text-yellow-500"
                 xmlns="http://www.w3.org/2000/svg"
@@ -28,7 +28,7 @@ class="size-full text-yellow-500"
     </span>
 @else
     <img
-        {{ $attributes->merge(['class' => 'object-cover rounded-full ']) }}
+        {{ $attributes->merge(['class' => 'object-cover rounded-full bg-gray-100 dark:bg-gray-900']) }}
         src="{{ $user->profile_photo_url }}"
         alt="{{ $user->username() }}"
     />
diff --git a/resources/views/components/user/points.blade.php b/resources/views/components/user/points.blade.php
index e9d1f079..00528bee 100644
--- a/resources/views/components/user/points.blade.php
+++ b/resources/views/components/user/points.blade.php
@@ -3,7 +3,7 @@
 ])
 
 <span
-    class="mx-1.5 inline-flex items-center rounded-md bg-skin-card-gray px-2.5 py-0.5 text-xs font-medium text-gray-700 dark:text-gray-300"
+    {{ $attributes->twMerge(['class' => 'inline-flex items-center rounded-lg bg-white dark:bg-gray-800 px-2.5 py-0.5 text-xs font-medium text-gray-700 dark:text-gray-300']) }}
 >
     {{ $author->getPoints() }} XP
 </span>
diff --git a/resources/views/forum/thread.blade.php b/resources/views/forum/thread.blade.php
index 59f5cc96..ebfb41fe 100644
--- a/resources/views/forum/thread.blade.php
+++ b/resources/views/forum/thread.blade.php
@@ -1,90 +1,7 @@
 <x-app-layout :title="$thread->subject()" :canonical="route('forum.show', $thread)">
     <x-container class="py-12">
         <div class="relative lg:grid lg:grid-cols-9 lg:gap-10">
-            <div class="relative hidden lg:col-span-2 lg:block">
-                <x-sticky-content class="space-y-6">
-                    <x-button :href="route('forum.new')" class="flex w-full justify-center">
-                        Nouveau Sujet
-                        <x-heroicon-o-plus-circle class="ml-2.5 size-4" />
-                    </x-button>
-                    <nav>
-                        <a
-                            href="{{ route('forum.index') }}"
-                            class="inline-flex w-full items-center py-3 text-sm font-medium text-gray-500 dark:text-gray-400 hover:text-gray-900"
-                        >
-                            <x-untitledui-menu class="mr-2 size-5" />
-                            <span>Tous les sujets</span>
-                        </a>
-                    </nav>
-
-                    @auth
-                        <livewire:forum.subscribe :thread="$thread" />
-                    @endauth
-
-                    <x-forum.thread-author :author="$thread->user" />
-                </x-sticky-content>
-            </div>
             <div class="lg:col-span-7 lg:border-l lg:border-skin-base lg:pl-8">
-                <h1 class="font-heading text-xl font-medium tracking-tight text-gray-900 sm:text-3xl">
-                    {{ $thread->subject() }}
-                </h1>
-
-                <div class="border-b border-skin-base pb-4 pt-2">
-                    <div class="text-sm text-gray-700 dark:text-gray-300 sm:inline-flex sm:items-center">
-                        <div class="flex items-center">
-                            <a
-                                href="{{ route('profile', $thread->user->username) }}"
-                                class="inline-flex items-center hover:underline"
-                            >
-                                <x-user.avatar
-                                    :user="$thread->user"
-                                    class="size-5"
-                                    span="-right-1 h-3.5 w-3.5 -top-1 ring-1"
-                                    container="mr-1"
-                                />
-                                <span class="font-sans">{{ '@' . $thread->user->username }}</span>
-                            </a>
-                            <x-user.points :author="$thread->user" />
-                            <span class="mx-1.5 inline-flex space-x-1">
-                                <span>a posé</span>
-                                <time-ago time="{{ $thread->created_at->getTimestamp() }}" />
-                                <time
-                                    class="sr-only"
-                                    datetime="{{ $thread->created_at }}"
-                                    title="{{ $thread->last_posted_at->format('j M, Y \à H:i') }}"
-                                >
-                                    {{ $thread->last_posted_at->format('j M, Y \à H:i') }}
-                                </time>
-                            </span>
-                            <span>dans</span>
-                        </div>
-                        <div class="mt-2 flex items-center space-x-2 self-center sm:ml-2 sm:mt-0">
-                            <div class="shrink-0">
-                                @if (count($channels = $thread->channels->load('parent')))
-                                    <div class="mt-2 flex flex-wrap gap-2 lg:mt-0 lg:gap-x-2">
-                                        @foreach ($channels as $channel)
-                                            <a href="{{ route('forum.channels', $channel) }}" class="flex gap-2">
-                                                <x-forum.channel :channel="$channel" />
-                                            </a>
-                                        @endforeach
-                                    </div>
-                                @endif
-                            </div>
-                            @if ($thread->isSolved())
-                                <div class="flex items-center">
-                                    <span class="mx-2 text-skin-muted">•</span>
-                                    <span class="inline-flex items-center gap-x-2 font-medium text-green-500">
-                                        <x-untitledui-check-verified-03 class="size-5" />
-                                        <span>Résolu</span>
-                                    </span>
-                                </div>
-                            @endif
-                        </div>
-                    </div>
-                </div>
-
-                <x-status-message class="mt-5" />
-
                 <x-forum.thread :thread="$thread" />
 
                 @if ($thread->replies->isNotEmpty())
@@ -96,62 +13,6 @@ class="sr-only"
                         </ul>
                     </div>
                 @endif
-
-                @can(App\Policies\ReplyPolicy::CREATE, App\Models\Reply::class)
-                    @if ($thread->isConversationOld())
-                        <x-info-panel class="font-sans">
-                            <p class="text-sm text-blue-700">
-                                La dernière réponse à ce sujet remonte à plus de six mois. Pensez à ouvrir un nouveau
-                                sujet si vous avez une question similaire.
-                            </p>
-                            <p class="mt-4 text-sm">
-                                <a
-                                    href="{{ route('forum.new') }}"
-                                    class="whitespace-nowrap rounded-md border border-transparent bg-blue-100 px-3 py-2 font-medium text-blue-700 hover:text-blue-600 focus:ring-2 focus:ring-blue-600 focus:ring-offset-2 focus:ring-offset-blue-50"
-                                >
-                                    Créer un nouveau sujet
-                                    <span aria-hidden="true">&rarr;</span>
-                                </a>
-                            </p>
-                        </x-info-panel>
-                    @else
-                        <div class="my-8">
-                            <livewire:forum.create-reply :thread="$thread" />
-                        </div>
-                    @endif
-                @else
-                    @guest
-                        <p class="py-8 text-center font-sans text-gray-500 dark:text-gray-400">
-                            Veuillez vous
-                            <a
-                                href="{{ route('login') }}"
-                                class="text-primary-600 hover:text-primary-600-hover hover:underline"
-                            >
-                                connecter
-                            </a>
-                            ou
-                            <a
-                                href="{{ route('register') }}"
-                                class="text-primary-600 hover:text-primary-600-hover hover:underline"
-                            >
-                                créer un compte
-                            </a>
-                            pour participer à cette conversation.
-                        </p>
-                    @else
-                        <div class="mt-10 flex items-center justify-between gap-x-12 text-gray-500 dark:text-gray-400">
-                            <p>Vous devrez vérifier votre compte avant de participer à cette conversation.</p>
-
-                            <form action="{{ route('verification.send') }}" method="POST" class="block">
-                                @csrf
-                                <x-button type="submit" class="px-3 py-2 text-sm leading-4">
-                                    Recevoir un lien
-                                    <x-heroicon-o-arrow-long-right class="ml-1.5 size-5" />
-                                </x-button>
-                            </form>
-                        </div>
-                    @endguest
-                @endcan
             </div>
         </div>
     </x-container>
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 975e738f..13368147 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -27,7 +27,7 @@ class="inline-flex items-center rounded-full bg-green-700 p-1 pr-2 text-white sm
                 </p>
                 <div class="mt-10 gap-4 sm:flex sm:items-center sm:justify-center">
                     @auth
-                        <x-buttons.primary :href="route('forum.new')" class="w-full sm:w-auto">
+                        <x-buttons.primary :href="route('forum.index')" class="w-full sm:w-auto">
                             {{ __('actions.new_thread') }}
                         </x-buttons.primary>
                     @else
diff --git a/resources/views/layouts/forum.blade.php b/resources/views/layouts/forum.blade.php
index 66dd0264..b654d8e5 100644
--- a/resources/views/layouts/forum.blade.php
+++ b/resources/views/layouts/forum.blade.php
@@ -1,14 +1,18 @@
 <x-app-layout :title="$title ?? null">
+    @php
+        $isLogged = \Illuminate\Support\Facades\Auth::check();
+    @endphp
+
     <x-container class="py-12">
-        <div class="relative lg:grid lg:grid-cols-9 lg:gap-12">
-            <div class="lg:col-span-2 lg:block">
+        <div class="relative lg:grid lg:grid-cols-10 lg:gap-12">
+            <div class="hidden lg:col-span-2 lg:block">
                 <nav class="sticky top-10 space-y-6">
                     @isset($buttons)
                         {{ $buttons }}
                     @endisset
 
                     <div class="space-y-2">
-                        <x-nav.forum-link icon="untitledui-file-02">
+                        <x-nav.forum-link :href="route('forum.index')" icon="untitledui-file-02">
                             {{ __('pages/forum.navigation.threads') }}
                         </x-nav.forum-link>
                         <x-nav.forum-link icon="untitledui-git-branch">
@@ -39,9 +43,22 @@
                 </nav>
             </div>
 
-            <div class="mt-6 sm:mt-0 lg:col-span-7">
+            <div @class([
+                'mt-6 sm:mt-0',
+                'lg:col-span-8' => $isLogged,
+                'lg:col-span-6' => ! $isLogged,
+            ])>
                 {{ $slot }}
             </div>
+
+            @guest
+                <aside class="hidden lg:block lg:col-span-2">
+                    <x-sticky-content class="space-y-10">
+                        <x-ads />
+                        <x-discord />
+                    </x-sticky-content>
+                </aside>
+            @endguest
         </div>
     </x-container>
 </x-app-layout>
diff --git a/resources/views/livewire/editor.blade.php b/resources/views/livewire/editor.blade.php
index 2567702b..cc1f8540 100644
--- a/resources/views/livewire/editor.blade.php
+++ b/resources/views/livewire/editor.blade.php
@@ -52,13 +52,13 @@ class="hide-scroll h-full min-h-[250px] w-full resize-none border-none bg-skin-i
 
             <div class="flex items-center justify-end gap-x-5 gap-y-4">
                 @if ($hasCancelButton)
-                    <x-default-button type="button" class="inline-flex">Annuler</x-default-button>
+                    <x-buttons.default type="button" class="inline-flex">Annuler</x-buttons.default>
                 @endif
 
                 @if ($hasButton)
-                    <x-button type="{{ $buttonType }}">
+                    <x-buttons.primary type="{{ $buttonType }}">
                         {{ $buttonLabel }}
-                    </x-button>
+                    </x-buttons.primary>
                 @endif
             </div>
         </div>
diff --git a/resources/views/livewire/forum/_form.blade.php b/resources/views/livewire/forum/_form.blade.php
deleted file mode 100644
index 964ec643..00000000
--- a/resources/views/livewire/forum/_form.blade.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class="space-y-6 pt-6 sm:space-y-5 sm:pt-5">
-    <x-validation-errors />
-
-    <div class="block">
-        <x-label for="title">Titre</x-label>
-        <x-input id="title" class="mt-1 block w-full" wire:model="title" name="title" required />
-        <p class="mt-2 text-sm text-gray-500 dark:text-gray-400">Maximum de 75 caractères.</p>
-    </div>
-
-    <div class="standard relative z-50 block" wire:ignore>
-        <x-label for="channels_selected">Channels</x-label>
-        <x-forms.select
-            wire:model="channels_selected"
-            id="channels_selected"
-            class="mt-2"
-            x-data="{}"
-            x-init="function () { choices($el) }"
-            multiple
-        >
-            @foreach ($channels as $channel)
-                <option value="{{ $channel->id }}" @selected(in_array($channel->id, $channels_selected))>
-                    {{ $channel->name }}
-                </option>
-            @endforeach
-        </x-forms.select>
-    </div>
-
-    <div class="block space-y-2">
-        <x-label for="body">Votre contenu</x-label>
-        <livewire:markdown-x
-            :content="$body"
-            :style="[
-            'textarea' => 'w-full h-full border border-skin-input focus:border-skin-base focus:outline-none p-4 rounded-b-lg',
-            'height' => 'h-[350px]',
-        ]"
-        />
-        <p class="text-sm leading-5 text-gray-500 dark:text-gray-400">
-            Pour le formatage du code (couleur syntaxique, langage, etc) nous utilisons
-            <a
-                href="https://torchlight.dev/docs/overview"
-                target="_blank"
-                class="font-medium text-primary-600 underline hover:text-primary-600-hover"
-            >
-                Torchlight
-            </a>
-            .
-        </p>
-    </div>
-
-    <div class="border-t border-skin-base pt-5">
-        <div class="flex justify-end">
-            <x-buttons.primary type="button" class="inline-flex" wire:click="store">
-                <x-loader class="text-white" wire:loading wire:target="store" />
-                Enregistrer
-            </x-buttons.primary>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/livewire/forum/create-reply.blade.php b/resources/views/livewire/forum/create-reply.blade.php
index b255262d..24f2ba4b 100644
--- a/resources/views/livewire/forum/create-reply.blade.php
+++ b/resources/views/livewire/forum/create-reply.blade.php
@@ -1,36 +1,25 @@
-<div class="mt-8 border-t border-skin-base pt-5">
-    <h3 class="mb-6 font-sans text-lg font-medium text-gray-900 sm:text-xl">Laissez votre réponse</h3>
-
-    <livewire:markdown-x
-        :content="$body"
-        :autofocus="false"
-        key="create-reply"
-        :style="[
-        'textarea' => 'w-full h-full border border-skin-input focus:border-skin-base focus:outline-none p-4 rounded-b-lg',
-        'height' => 'h-[250px]',
-    ]"
-    />
-
-    @error('body')
-        <p class="mt-2 text-sm font-normal leading-5 text-red-500">{{ $message }}</p>
-    @enderror
-
-    <div class="mt-4 flex items-start justify-between gap-x-8 lg:items-center">
-        <p class="font-normal text-gray-500 dark:text-gray-400">
-            Assurez-vous d'avoir lu nos
-            <a href="{{ route('rules') }}" class="font-medium text-primary-600 hover:text-primary-600-hover">
-                règles de conduite
-            </a>
-            avant de répondre à ce thread.
-        </p>
-    </div>
-
-    <div class="mt-5">
-        <div class="flex justify-end">
-            <x-button type="button" class="inline-flex" wire:click="save">
-                <x-loader class="text-white" wire:loading wire:target="save" />
-                Enregistrer
-            </x-button>
+<div x-data="{ open: false }" class="mt-10 flex items-center justify-center lg:mt-16">
+    <div class="w-full max-w-3xl mx-auto">
+        <button type="button" class="relative bg-white rounded-xl px-6 py-5 ring-1 ring-gray-200/60 flex items-center w-full gap-5 hover:ring-gray-300 dark:bg-white/20 dark:bg-gray-800 dark:hover:bg-white/10 focus:outline transition duration-200 ease-in-out">
+            <x-user.avatar
+                :user="\Illuminate\Support\Facades\Auth::user()"
+                class="size-10 ring-4 ring-white dark:ring-white/20"
+                span="-right-1 size-3.5 -top-1"
+            />
+            <span class="text-sm leading-6 text-gray-500 dark:text-gray-400">
+                {{ __('Laissez votre réponse') }}
+            </span>
+        </button>
+        <div class="mt-5 text-center">
+            <p class="text-sm leading-5 text-gray-500 dark:text-gray-400">
+                Assurez-vous d'avoir lu nos
+                <x-link :href="route('rules')" class="font-medium text-primary-600 hover:text-primary-500">
+                    règles de conduite
+                </x-link>
+                avant de répondre à ce thread.
+            </p>
         </div>
     </div>
+
+    <div></div>
 </div>
diff --git a/resources/views/livewire/forum/edit-thread.blade.php b/resources/views/livewire/forum/edit-thread.blade.php
deleted file mode 100644
index 7175b11a..00000000
--- a/resources/views/livewire/forum/edit-thread.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-    @include('livewire.forum._form')
-</div>
diff --git a/resources/views/livewire/forum/reply.blade.php b/resources/views/livewire/forum/reply.blade.php
index 180266d7..892ccbf2 100644
--- a/resources/views/livewire/forum/reply.blade.php
+++ b/resources/views/livewire/forum/reply.blade.php
@@ -2,49 +2,89 @@
     $isSolution = $thread->isSolutionReply($reply);
 @endphp
 
-<li
-    x-data="{ open: @entangle('isUpdating') }"
-    @class(['relative z-10 rounded-md border border-green-500 p-4 sm:-mx-4' => $isSolution])
->
-    <div class="sm:flex sm:space-x-3" id="reply-{{ $reply->id }}">
-        <div class="flex items-center font-sans sm:items-start">
-            <div class="shrink-0">
-                <x-user.avatar :user="$reply->user" class="size-10" />
+<div class="relative pb-8" id="reply-{{ $reply->id }}">
+    <span class="hidden absolute left-5 top-5 -ml-px h-full w-0.5 bg-gray-100 dark:bg-white/20 lg:block" aria-hidden="true"></span>
+    <div class="relative flex items-start gap-6">
+        <div class="hidden sticky top-10 lg:block">
+            <x-user.avatar
+                :user="$reply->user"
+                class="size-10 ring-4 ring-white dark:ring-white/20"
+                span="-right-1 size-3.5 -top-1"
+            />
+        </div>
+        <div
+            @class([
+                'group min-w-0 flex-1 rounded-xl p-5 ring-1 ring-inset lg:py-6 lg:px-8',
+                'ring-green-500 bg-green-50 ring-2 dark:bg-green-800/20 dark:ring-primary-600' => $isSolution,
+                'ring-gray-200/60 bg-white dark:bg-gray-800 dark:ring-white/10' => ! $isSolution,
+           ])
+        >
+            <div class="flex items-start justify-between">
+                <div class="flex items-center gap-2">
+                    <x-user.avatar
+                        :user="$reply->user"
+                        class="size-8 lg:hidden"
+                        span="-right-1 size-3.5 -top-1"
+                    />
+                    <div>
+                        <div class="text-sm flex items-center gap-2">
+                            <x-link :href="route('profile', $reply->user->username)" class="font-medium text-gray-900 dark:text-white">
+                                {{ $reply->user->username }}
+                            </x-link>
+                            <x-user.points class="ring-1 ring-inset ring-gray-200 dark:ring-white/10" :author="$reply->user" />
+                        </div>
+                        <div class="flex items-center text-xs text-gray-500 flex-wrap gap-x-1 dark:text-gray-400 lg:mt-1">
+                            <span>{{ __('global.posted') }}</span>
+                            <time datetime="{{ $reply->created_at }}">
+                                {{ $reply->created_at->diffForHumans() }}
+                            </time>
+                        </div>
+                    </div>
+                </div>
+                @if($isSolution)
+                    <div class="inline-flex items-center rounded-full px-4 py-1.5 text-xs font-medium text-white bg-flag-green">
+                        {{ __('pages/forum.best_answer') }}
+                    </div>
+                @endif
             </div>
-            <div class="ml-4 space-y-1 text-sm sm:hidden">
-                <a href="{{ route('profile', $reply->user->username) }}" class="block font-medium text-gray-900">
-                    {{ $reply->user->name }}
-                    <span class="inline-flex text-skin-muted">{{ '@' . $reply->user->username }}</span>
-                </a>
-                <time
-                    datetime="{{ $reply->created_at }}"
-                    title="{{ $thread->created_at->format('j M, Y \à h:i') }}"
-                    class="text-skin-muted"
-                >
-                    {{ $reply->created_at->diffForHumans() }}
-                </time>
+            <div class="mt-5 prose prose-green max-w-none text-gray-500 dark:text-gray-400 dark:prose-invert">
+                <x-markdown-content :content="$reply->body" />
+            </div>
+            <div class="mt-10">
+                @can('manage', $reply)
+                    <x-filament::dropdown placement="top-start">
+                        <x-slot name="trigger">
+                            <button type="button" class="inline-flex items-center rounded-lg px-2 py-1.5 text-gray-400 dark:text-gray-500 hover:bg-gray-50 dark:hover:bg-gray-900 focus:outline-none">
+                                <x-untitledui-dots-horizontal class="size-5" aria-hidden="true" />
+                            </button>
+                        </x-slot>
+
+                        <x-filament::dropdown.list>
+                            <x-filament::dropdown.list.item wire:click="openEditModal">
+                                {{ __('actions.edit') }}
+                            </x-filament::dropdown.list.item>
+
+                            <x-filament::dropdown.list.item color="danger" wire:click="openDeleteModal">
+                                {{ __('actions.delete') }}
+                            </x-filament::dropdown.list.item>
+                        </x-filament::dropdown.list>
+                    </x-filament::dropdown>
+                @endcan
+                <div class="hidden group-hover:flex"></div>
             </div>
         </div>
+    </div>
+</div>
+
+{{--<li
+    x-data="{ open: @entangle('isUpdating') }"
+    @class(['relative z-10 rounded-md border border-green-500 p-4 sm:-mx-4' => $isSolution])
+>
+    <div class="sm:flex sm:space-x-3">
         <div x-show="!open" class="flex-1 overflow-hidden">
             <div class="flex items-start">
                 <div class="hidden flex-1 space-x-2 font-sans text-sm sm:flex sm:items-center">
-                    <a href="{{ route('profile', $reply->user->username) }}" class="font-medium text-gray-900">
-                        {{ $reply->user->name }}
-                        <span class="inline-flex text-skin-muted">{{ '@' . $reply->user->username }}</span>
-                    </a>
-
-                    <x-user.points :author="$reply->user" />
-
-                    <span class="font-medium text-gray-500 dark:text-gray-400">·</span>
-                    <time
-                        datetime="{{ $reply->created_at }}"
-                        title="{{ $thread->created_at->format('j M, Y \à h:i') }}"
-                        class="text-skin-muted"
-                    >
-                        {{ $reply->created_at->diffForHumans() }}
-                    </time>
-
-                    @can(App\Policies\ReplyPolicy::UPDATE, $reply)
+                    @can('update', $reply)
                         <span class="font-medium text-gray-500 dark:text-gray-400">·</span>
                         <div class="flex items-center divide-x divide-skin-base">
                             <button
@@ -66,7 +106,7 @@ class="pl-2 font-sans text-sm leading-5 text-red-500 hover:underline focus:outli
                         </div>
                     @endcan
                 </div>
-                @can(App\Policies\ThreadPolicy::UPDATE, $thread)
+                @can('update', $thread)
                     @if ($isSolution)
                         <div class="mt-2 flex items-center sm:ml-4 sm:mt-0">
                             <button
@@ -116,15 +156,15 @@ class="absolute -top-3 right-3 z-20 ml-4 inline-flex items-center rounded-full b
 
             <div class="mt-5">
                 <div class="flex justify-end space-x-3">
-                    <x-default-button type="button" class="inline-flex" x-on:click="open = false">
+                    <x-buttons.default type="button" class="inline-flex" x-on:click="open = false">
                         Annuler
-                    </x-default-button>
-                    <x-button type="button" class="inline-flex" wire:click="edit">
+                    </x-buttons.default>
+                    <x-buttons.primary type="button" class="inline-flex" wire:click="edit">
                         <x-loader class="text-white" wire:loading wire:target="edit" />
                         Enregistrer
-                    </x-button>
+                    </x-buttons.primary>
                 </div>
             </div>
         </div>
     </div>
-</li>
+</li>--}}
diff --git a/resources/views/livewire/forum/subscribe.blade.php b/resources/views/livewire/forum/subscribe.blade.php
index 200922be..a2c7b37b 100644
--- a/resources/views/livewire/forum/subscribe.blade.php
+++ b/resources/views/livewire/forum/subscribe.blade.php
@@ -1,29 +1,19 @@
 <div>
-    <div class="rounded-lg bg-skin-card-gray px-4 py-5 sm:p-6">
-        <h3 class="text-lg font-medium leading-6 text-gray-900">Notifications</h3>
-        <div class="mt-2 max-w-xl text-sm leading-5 text-gray-500 dark:text-gray-400">
-            @can(App\Policies\ThreadPolicy::UNSUBSCRIBE, $thread)
-                <p>Vous recevez actuellement des notifications de mises à jour de ce sujet.</p>
-            @elsecan(App\Policies\ThreadPolicy::SUBSCRIBE, $thread)
-                <p>Vous ne recevez pas de notifications de ce sujet.</p>
-            @endcan
-        </div>
-        <div class="mt-5">
-            <span class="inline-flex rounded-md shadow-sm">
-                @can(App\Policies\ThreadPolicy::UNSUBSCRIBE, $thread)
-                    <x-button type="button" wire:click="unsubscribe" wire:loading.attr="disabled">
-                        <x-heroicon-s-bell class="size-5" />
-                        <span class="mx-2">Se désabonner</span>
-                        <x-loader class="mx-0 text-white" wire:loading wire:target="unsubscribe" />
-                    </x-button>
-                @elsecan(App\Policies\ThreadPolicy::SUBSCRIBE, $thread)
-                    <x-default-button type="button" wire:click="subscribe" wire:loading.attr="disabled">
-                        <x-heroicon-s-bell class="size-5" />
-                        <span class="mx-2">S'abonner</span>
-                        <x-loader class="mx-0 text-white" wire:loading wire:target="subscribe" />
-                    </x-default-button>
-                @endcan
+    @can('unsubscribe', $thread)
+        <x-buttons.default type="button" class="w-full relative gap-2" wire:click="unsubscribe" wire:loading.attr="disabled">
+            <x-untitledui-bell-off class="size-5 text-gray-400 dark:text-gray-500" aria-hidden="true" />
+            <span>{{ __('pages/forum.unsubscribe_thread') }}</span>
+            <span class="absolute pointer-events-none inset-y-0 right-0 flex items-center pr-2" wire:loading wire:target="unsubscribe">
+                <x-loader class="text-white" aria-hidden="true" />
             </span>
-        </div>
-    </div>
+        </x-buttons.default>
+    @elsecan('subscribe', $thread)
+        <x-buttons.default type="button" class="w-full relative gap-2" wire:click="subscribe" wire:loading.attr="disabled">
+            <x-untitledui-bell-ringing class="size-5 text-gray-400 dark:text-gray-500" aria-hidden="true" />
+            <span>{{ __('pages/forum.subscribe_thread') }}</span>
+            <span class="absolute pointer-events-none inset-y-0 right-0 flex items-center pr-2" wire:loading wire:target="subscribe">
+                <x-loader class="text-white" aria-hidden="true" />
+            </span>
+        </x-buttons.default>
+    @endcan
 </div>
diff --git a/resources/views/livewire/pages/forum/detail-thread.blade.php b/resources/views/livewire/pages/forum/detail-thread.blade.php
new file mode 100644
index 00000000..5d4f7c29
--- /dev/null
+++ b/resources/views/livewire/pages/forum/detail-thread.blade.php
@@ -0,0 +1,127 @@
+<div class="relative">
+    <x-slot:buttons>
+        <div class="space-y-3">
+            <x-buttons.primary type="button" class="gap-2 w-full justify-center py-2.5">
+                {{ __('pages/forum.reply_thread') }}
+            </x-buttons.primary>
+
+            @auth
+                <livewire:forum.subscribe :thread="$thread" />
+            @endauth
+        </div>
+    </x-slot:buttons>
+
+    <div>
+        <div class="flow-root">
+            <div role="listbox" class="-mb-8">
+                <div class="relative pb-8">
+                    <span class="hidden absolute left-5 top-5 -ml-px h-full w-0.5 bg-gray-100 dark:bg-white/20 lg:block" aria-hidden="true"></span>
+                    <div class="relative flex items-start gap-6">
+                        <div class="hidden sticky top-10 lg:block">
+                            <x-user.avatar
+                                :user="$thread->user"
+                                class="size-10 ring-4 ring-white dark:ring-white/20"
+                                span="-right-1 size-3.5 -top-1"
+                            />
+                        </div>
+                        <div class="min-w-0 flex-1 rounded-xl bg-white p-5 ring-1 ring-inset ring-gray-200/60 dark:bg-gray-800 dark:ring-white/10 lg:py-6 lg:px-8">
+                            <div class="flex items-center gap-2">
+                                <x-user.avatar
+                                    :user="$thread->user"
+                                    class="size-8 lg:hidden"
+                                    span="-right-1 size-3.5 -top-1"
+                                />
+                                <div>
+                                    <div class="text-sm flex items-center gap-2">
+                                        <x-link :href="route('profile', $thread->user->username)" class="font-medium text-gray-900 dark:text-white">
+                                            {{ $thread->user->username }}
+                                        </x-link>
+                                        <x-user.points class="ring-1 ring-inset ring-gray-200 dark:ring-white/10" :author="$thread->user" />
+                                    </div>
+                                    <div class="flex items-center text-xs text-gray-500 flex-wrap gap-x-1 dark:text-gray-400 lg:mt-1">
+                                        <span>{{ __('global.ask') }}</span>
+                                        <time datetime="{{ $thread->created_at }}">
+                                            {{ $thread->created_at->diffForHumans() }}
+                                        </time>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="mt-4 rounded-lg bg-gray-50 dark:bg-gray-900 py-2 px-4">
+                                <h1 class="text-xl font-heading font-bold text-gray-900 dark:text-white leading-7">
+                                    {{ $thread->title }}
+                                </h1>
+                            </div>
+                            <div class="mt-5 prose prose-primary max-w-none text-gray-500 dark:text-gray-400 dark:prose-invert">
+                                <x-markdown-content :content="$thread->body" />
+                            </div>
+                            <div class="flex items-center gap-3">
+                                <livewire:reactions
+                                    wire:key="$thread->id"
+                                    :model="$thread"
+                                    :with-place-holder="false"
+                                    :with-background="false"
+                                />
+                                <x-forum.thread-metadata :thread="$thread" class="gap-3" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                @if ($thread->replies->isNotEmpty())
+                    @foreach ($thread->replies as $reply)
+                        <livewire:forum.reply wire:key="$reply->id" :thread="$thread" :reply="$reply" />
+                    @endforeach
+                @endif
+            </div>
+        </div>
+
+        @can('create', App\Models\Reply::class)
+            @if ($thread->isConversationOld())
+                <x-info-panel>
+                    <p class="text-sm text-blue-700">
+                        {{ __('pages/forum.old_thread') }}
+                    </p>
+                    <p class="mt-4 text-sm">
+                        <x-buttons.default
+                            type="button"
+                            onclick="Livewire.dispatch('openPanel', { component: 'components.slideovers.thread-form' })"
+                        >
+                            {{ __('pages/forum.new_thread') }}
+                            <span aria-hidden="true">&rarr;</span>
+                        </x-buttons.default>
+                    </p>
+                </x-info-panel>
+            @else
+                <livewire:forum.create-reply :thread="$thread" />
+            @endif
+        @else
+            @guest
+                <p class="py-8 text-center text-gray-500 dark:text-gray-400 lg:py-12">
+                    {{ __('global.need') }}
+                    <x-link :href="route('login')" class="text-primary-600 hover:text-primary-600-hover hover:underline">
+                        {{ __('pages/auth.login.page_title') }}
+                    </x-link>
+                    {{ __('global.or') }}
+                    <x-link :href="route('register')" class="text-primary-600 hover:text-primary-600-hover hover:underline">
+                        {{ __('pages/auth.register.page_title') }}
+                    </x-link>
+                    {{ __('pages/forum.collaborate_thread') }}
+                </p>
+            @else
+                <div class="mt-10 flex items-center justify-between gap-x-12 text-gray-500 dark:text-gray-400">
+                    <p class="text-sm text-gray-500 dark:text-gray-400">
+                        {{ __('pages/forum.verify_account') }}
+                    </p>
+
+                    <form action="{{ route('verification.send') }}" method="POST" class="block">
+                        @csrf
+                        <x-buttons.primary type="submit" class="px-3 py-2 gap-2">
+                            {{ __('pages/forum.received_link') }}
+                            <x-heroicon-o-arrow-long-right class="size-5" aria-hidden="true" />
+                        </x-buttons.primary>
+                    </form>
+                </div>
+            @endguest
+        @endcan
+    </div>
+</div>
diff --git a/resources/views/livewire/pages/forum/index.blade.php b/resources/views/livewire/pages/forum/index.blade.php
index abea9fcd..ed227f5e 100644
--- a/resources/views/livewire/pages/forum/index.blade.php
+++ b/resources/views/livewire/pages/forum/index.blade.php
@@ -1,6 +1,10 @@
 <div>
     <x-slot:buttons>
-        <x-buttons.primary type="button" onclick="Livewire.dispatch('openPanel', { component: 'components.slideovers.thread-form' })" class="gap-2 w-full justify-center py-2.5">
+        <x-buttons.primary
+            type="button"
+            onclick="Livewire.dispatch('openPanel', { component: 'components.slideovers.thread-form' })"
+            class="gap-2 w-full justify-center py-2.5"
+        >
             {{ __('pages/forum.new_thread') }}
             <span class="absolute pointer-events-none right-0 pr-3">
                 <x-untitledui-plus class="size-5" aria-hidden="true" />
@@ -10,22 +14,20 @@
 
     <div class="flex items-center justify-between gap-6">
         <livewire:components.channels-selector />
-        <form wire:submit="launchSearch">
-            <x-filament::input.wrapper class="relative max-w-60 w-full">
-                <span class="pointer-events-none absolute top-2.5 left-0 pl-2.5">
-                    <x-untitledui-search-md class="size-4 text-gray-400 dark:text-gray-500" aria-hidden="true" />
-                </span>
-                <x-filament::input
-                    type="search"
-                    id="thread-search"
-                    name="search"
-                    class="!pl-8"
-                    wire:model="search"
-                    aria-label="{{ __('global.search') }}"
-                    :placeholder="__('pages/forum.thread_search')"
-                />
-            </x-filament::input.wrapper>
-        </form>
+        <x-filament::input.wrapper class="relative max-w-60 w-full">
+            <span class="pointer-events-none absolute top-2.5 left-0 pl-2.5">
+                <x-untitledui-search-md class="size-4 text-gray-400 dark:text-gray-500" aria-hidden="true" />
+            </span>
+            <x-filament::input
+                type="search"
+                id="thread-search"
+                name="search"
+                class="!pl-8"
+                wire:model.live.debounce.550ms="search"
+                aria-label="{{ __('global.search') }}"
+                :placeholder="__('pages/forum.thread_search')"
+            />
+        </x-filament::input.wrapper>
     </div>
 
     <div class="mt-6 lg:mb-12">
diff --git a/routes/forum.php b/routes/forum.php
index 3b805d31..450b2b50 100644
--- a/routes/forum.php
+++ b/routes/forum.php
@@ -7,8 +7,7 @@
 use Illuminate\Support\Facades\Route;
 
 Route::get('/', Forum\Index::class)->name('index');
-Route::get('/new-thread', [ThreadController::class, 'create'])->name('new');
-
 Route::get('/channels/{channel}', [ThreadController::class, 'channel'])->name('channels');
-Route::get('/{thread}', [ThreadController::class, 'show'])->name('show');
+Route::get('/{thread}', Forum\DetailThread::class)->name('show');
+
 Route::get('/{thread}/edit', [ThreadController::class, 'edit'])->name('edit');
diff --git a/tests/Feature/Livewire/Pages/Forum/DetailThreadTest.php b/tests/Feature/Livewire/Pages/Forum/DetailThreadTest.php
new file mode 100644
index 00000000..031880aa
--- /dev/null
+++ b/tests/Feature/Livewire/Pages/Forum/DetailThreadTest.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Livewire\Pages\Forum\DetailThread;
+use Livewire\Livewire;
+
+it('renders successfully', function () {
+    Livewire::test(DetailThread::class)
+        ->assertStatus(200);
+});

From e2e14c84ad1db3bf626af8a4833c4a224bf3c0a7 Mon Sep 17 00:00:00 2001
From: Arthur Monney <monneylobe@gmail.com>
Date: Sat, 2 Nov 2024 14:43:16 +0100
Subject: [PATCH 6/8] feat: [LAR-28] add new tests for create and update thread

---
 app/Gamify/Points/PostCreated.php             |   4 +-
 app/Gamify/Points/ThreadCreated.php           |   4 +-
 app/Http/Controllers/ThreadController.php     |  12 --
 app/Listeners/SendNewCommentNotification.php  |   2 -
 app/Listeners/SendNewReplyNotification.php    |   3 +-
 app/Listeners/SendNewThreadNotification.php   |   2 +-
 .../Components/Slideovers/ThreadForm.php      |  21 +--
 app/Livewire/Forum/Reply.php                  |  74 ++-------
 app/Livewire/Modals/DeleteReply.php           |   7 +-
 app/Livewire/Modals/DeleteThread.php          |   7 +-
 app/Livewire/Pages/Forum/DetailThread.php     |  47 +++++-
 app/Livewire/Pages/Forum/Index.php            |  10 +-
 app/Livewire/Reactions.php                    |   2 +-
 app/Mail/NewReplyEmail.php                    |   1 +
 app/Models/Article.php                        |  11 +-
 app/Models/Discussion.php                     |  13 ++
 app/Models/Reply.php                          |   4 +
 app/Models/Thread.php                         |   7 +-
 app/Policies/NotificationPolicy.php           |   2 +-
 app/Policies/ReplyPolicy.php                  |   8 +-
 app/Policies/ThreadPolicy.php                 |  11 +-
 app/Providers/AuthServiceProvider.php         |   3 -
 app/Spotlight/Article.php                     |   6 +-
 app/Spotlight/Discussion.php                  |   2 +-
 app/Spotlight/Sujet.php                       |   2 +-
 app/Traits/HasAuthor.php                      |   2 +-
 app/Traits/RecordsActivity.php                |   2 +-
 config/livewire.php                           |   2 +-
 lang/en/actions.php                           |   2 +-
 lang/en/notifications.php                     |   3 +-
 lang/en/pages/forum.php                       |   3 +
 lang/en/pages/home.php                        |  46 +++---
 lang/fr/notifications.php                     |   1 +
 lang/fr/pages/forum.php                       |   3 +
 resources/views/components/ads.blade.php      |   5 +-
 .../views/components/buttons/submit.blade.php |   6 +-
 .../forum/thread-channels.blade.php           |  20 +++
 .../forum/thread-metadata.blade.php           |  16 +-
 .../forum/thread-overview.blade.php           |  62 --------
 .../views/components/forum/thread.blade.php   | 149 +++++------------
 .../views/components/info-panel.blade.php     |   6 +-
 .../views/components/layouts/header.blade.php |   4 +-
 .../livewire/forum/create-reply.blade.php     |   4 +-
 .../views/livewire/forum/reply.blade.php      | 150 +++++-------------
 .../pages/forum/detail-thread.blade.php       |  92 ++++++-----
 .../livewire/pages/forum/index.blade.php      |   3 +-
 resources/views/livewire/reactions.blade.php  |  52 ++++--
 tailwind.config.js                            |   8 +
 .../Livewire/Pages/Forum/DetailThreadTest.php |  29 +++-
 .../Livewire/Pages/Forum/IndexTest.php        |  27 ++--
 50 files changed, 430 insertions(+), 532 deletions(-)
 create mode 100644 resources/views/components/forum/thread-channels.blade.php
 delete mode 100644 resources/views/components/forum/thread-overview.blade.php

diff --git a/app/Gamify/Points/PostCreated.php b/app/Gamify/Points/PostCreated.php
index 950a7180..f28c5975 100644
--- a/app/Gamify/Points/PostCreated.php
+++ b/app/Gamify/Points/PostCreated.php
@@ -8,6 +8,9 @@
 use App\Models\User;
 use QCod\Gamify\PointType;
 
+/**
+ * @method Article getSubject()
+ */
 final class PostCreated extends PointType
 {
     public int $points = 50;
@@ -19,7 +22,6 @@ public function __construct(Article $subject)
 
     public function payee(): User
     {
-        // @phpstan-ignore-next-line
         return $this->getSubject()->user;
     }
 }
diff --git a/app/Gamify/Points/ThreadCreated.php b/app/Gamify/Points/ThreadCreated.php
index 9cbf930b..70cf2809 100644
--- a/app/Gamify/Points/ThreadCreated.php
+++ b/app/Gamify/Points/ThreadCreated.php
@@ -8,6 +8,9 @@
 use App\Models\User;
 use QCod\Gamify\PointType;
 
+/**
+ * @method Thread getSubject()
+ */
 final class ThreadCreated extends PointType
 {
     public int $points = 55;
@@ -19,7 +22,6 @@ public function __construct(Thread $subject)
 
     public function payee(): User
     {
-        // @phpstan-ignore-next-line
         return $this->getSubject()->user;
     }
 }
diff --git a/app/Http/Controllers/ThreadController.php b/app/Http/Controllers/ThreadController.php
index 9b3cc36e..c99cc495 100644
--- a/app/Http/Controllers/ThreadController.php
+++ b/app/Http/Controllers/ThreadController.php
@@ -27,16 +27,4 @@ public function channel(Request $request, Channel $channel): View
 
         return view('forum.index', compact('channel', 'threads', 'filter'));
     }
-
-    public function show(Thread $thread): View
-    {
-        views($thread)->record();
-
-        return view('forum.thread', compact('thread'));
-    }
-
-    public function edit(Thread $thread): View
-    {
-        return view('forum.edit', compact('thread'));
-    }
 }
diff --git a/app/Listeners/SendNewCommentNotification.php b/app/Listeners/SendNewCommentNotification.php
index d125e08b..48d6a636 100644
--- a/app/Listeners/SendNewCommentNotification.php
+++ b/app/Listeners/SendNewCommentNotification.php
@@ -17,9 +17,7 @@ public function handle(CommentWasAdded $event): void
 
         foreach ($discussion->subscribes as $subscription) {
             /** @var Subscribe $subscription */
-            // @phpstan-ignore-next-line
             if ($this->replyAuthorDoesNotMatchSubscriber(author: $event->reply->user, subscription: $subscription)) {
-                // @phpstan-ignore-next-line
                 $subscription->user->notify(new NewCommentNotification(
                     reply: $event->reply,
                     subscription: $subscription,
diff --git a/app/Listeners/SendNewReplyNotification.php b/app/Listeners/SendNewReplyNotification.php
index be55d1de..bf627b2f 100644
--- a/app/Listeners/SendNewReplyNotification.php
+++ b/app/Listeners/SendNewReplyNotification.php
@@ -22,9 +22,8 @@ public function handle(ReplyWasCreated $event): void
 
         foreach ($thread->subscribes as $subscription) {
             /** @var Subscribe $subscription */
-            // @phpstan-ignore-next-line
             if ($this->replyAuthorDoesNotMatchSubscriber(author: $event->reply->user, subscription: $subscription)) {
-                $subscription->user->notify(new NewReplyNotification($event->reply, $subscription)); // @phpstan-ignore-line
+                $subscription->user->notify(new NewReplyNotification($event->reply, $subscription));
             }
         }
     }
diff --git a/app/Listeners/SendNewThreadNotification.php b/app/Listeners/SendNewThreadNotification.php
index 80b02e65..ecc1b9b1 100644
--- a/app/Listeners/SendNewThreadNotification.php
+++ b/app/Listeners/SendNewThreadNotification.php
@@ -13,6 +13,6 @@ public function handle(ThreadWasCreated $event): void
     {
         $thread = $event->thread;
 
-        $thread->user->notify(new PostThreadToSlack($thread)); // @phpstan-ignore-line
+        $thread->user->notify(new PostThreadToSlack($thread));
     }
 }
diff --git a/app/Livewire/Components/Slideovers/ThreadForm.php b/app/Livewire/Components/Slideovers/ThreadForm.php
index 6d2725f7..8bf899b1 100644
--- a/app/Livewire/Components/Slideovers/ThreadForm.php
+++ b/app/Livewire/Components/Slideovers/ThreadForm.php
@@ -40,7 +40,10 @@ public function mount(?int $threadId = null): void
             ? Thread::query()->findOrFail($threadId)
             : new Thread;
 
-        $this->form->fill(array_merge($this->thread->toArray(), ['user_id' => Auth::id()]));
+        $this->form->fill(array_merge(
+            $this->thread->toArray(),
+            ['user_id' => $this->thread->user_id ?? Auth::id()]
+        ));
     }
 
     public static function panelMaxWidth(): string
@@ -55,21 +58,21 @@ public function form(Form $form): Form
                 Forms\Components\Hidden::make('user_id'),
                 Forms\Components\TextInput::make('title')
                     ->label(__('validation.attributes.title'))
-                    ->helperText(__('Maximum de 75 caractères.'))
+                    ->helperText(__('pages/forum.max_thread_length'))
                     ->required()
                     ->live(onBlur: true)
                     ->afterStateUpdated(function (string $operation, $state, Forms\Set $set): void {
                         $set('slug', Str::slug($state));
                     })
-                    ->maxLength(75),
+                    ->maxLength(100),
                 Forms\Components\Hidden::make('slug'),
                 Forms\Components\Select::make('channels')
-                    ->relationship(name: 'channels', titleAttribute: 'name')
+                    ->multiple()
+                    ->relationship(titleAttribute: 'name')
                     ->searchable()
                     ->required()
                     ->minItems(1)
-                    ->maxItems(3)
-                    ->multiple(),
+                    ->maxItems(3),
                 Forms\Components\MarkdownEditor::make('body')
                     ->fileAttachmentsDisk('public')
                     ->toolbarButtons([
@@ -134,11 +137,9 @@ public function save(): void
             ->success()
             ->send();
 
-        $this->dispatch('thread.save');
+        $this->dispatch('thread.save.{$thread->id}');
 
-        $this->closePanel();
-
-        $this->form->fill();
+        $this->redirect(route('forum.show', ['thread' => $thread ?? $this->thread]), navigate: true);
     }
 
     public function render(): View
diff --git a/app/Livewire/Forum/Reply.php b/app/Livewire/Forum/Reply.php
index 8b6866dd..3420bdbb 100644
--- a/app/Livewire/Forum/Reply.php
+++ b/app/Livewire/Forum/Reply.php
@@ -4,14 +4,14 @@
 
 namespace App\Livewire\Forum;
 
+use App\Exceptions\CouldNotMarkReplyAsSolution;
 use App\Gamify\Points\BestReply;
 use App\Models\Reply as ReplyModel;
 use App\Models\Thread;
-use App\Policies\ReplyPolicy;
-use App\Policies\ThreadPolicy;
 use Filament\Notifications\Notification;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Auth;
+use Livewire\Attributes\On;
 use Livewire\Component;
 
 final class Reply extends Component
@@ -20,44 +20,13 @@ final class Reply extends Component
 
     public Thread $thread;
 
-    public string $body = '';
-
-    public bool $isUpdating = false;
-
-    /**
-     * @var string[]
-     */
-    protected $listeners = [
-        'refresh' => '$refresh',
-        'editor:update' => 'onEditorUpdate',
-    ];
-
-    /**
-     * @var string[]
-     */
-    protected $rules = [
-        'body' => 'required',
-    ];
-
-    public function mount(ReplyModel $reply, Thread $thread): void
-    {
-        $this->thread = $thread;
-        $this->reply = $reply;
-        $this->body = $reply->body;
-    }
-
-    public function onEditorUpdate(string $body): void
-    {
-        $this->body = $body;
-    }
-
     public function edit(): void
     {
-        $this->authorize(ReplyPolicy::UPDATE, $this->reply);
+        $this->authorize('update', $this->reply);
 
         $this->validate();
 
-        $this->reply->update(['body' => $this->body]);
+        // $this->reply->update(['body' => $this->body]);
 
         Notification::make()
             ->title(__('Réponse modifiée'))
@@ -66,32 +35,15 @@ public function edit(): void
             ->duration(5000)
             ->send();
 
-        $this->isUpdating = false;
-
-        $this->dispatch('refresh')->self();
-    }
-
-    public function UnMarkAsSolution(): void
-    {
-        $this->authorize(ThreadPolicy::UPDATE, $this->thread);
-
-        undoPoint(new BestReply($this->reply));
-
-        $this->thread->unmarkSolution();
-
-        $this->dispatch('refresh')->self();
-
-        Notification::make()
-            ->title(__('Réponse rejetée'))
-            ->body(__('Vous avez retiré cette réponse comme solution pour ce sujet.'))
-            ->success()
-            ->duration(5000)
-            ->send();
+        $this->dispatch('reply.updated');
     }
 
+    /**
+     * @throws CouldNotMarkReplyAsSolution
+     */
     public function markAsSolution(): void
     {
-        $this->authorize(ThreadPolicy::UPDATE, $this->thread);
+        $this->authorize('manage', $this->thread);
 
         if ($this->thread->isSolved()) {
             undoPoint(new BestReply($this->thread->solutionReply));
@@ -101,16 +53,16 @@ public function markAsSolution(): void
 
         givePoint(new BestReply($this->reply));
 
-        $this->dispatch('refresh')->self();
-
         Notification::make()
-            ->title(__('Réponse acceptée'))
-            ->body(__('Vous avez accepté cette solution pour ce sujet.'))
+            ->title(__('notifications.thread.best_reply'))
             ->success()
             ->duration(5000)
             ->send();
+
+        $this->dispatch('thread.save.{$thread->id}');
     }
 
+    #[On('reply.updated')]
     public function render(): View
     {
         return view('livewire.forum.reply');
diff --git a/app/Livewire/Modals/DeleteReply.php b/app/Livewire/Modals/DeleteReply.php
index a7565d44..b7ed9568 100644
--- a/app/Livewire/Modals/DeleteReply.php
+++ b/app/Livewire/Modals/DeleteReply.php
@@ -5,7 +5,6 @@
 namespace App\Livewire\Modals;
 
 use App\Models\Reply;
-use App\Policies\ReplyPolicy;
 use Illuminate\Contracts\View\View;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use LivewireUI\Modal\ModalComponent;
@@ -20,15 +19,15 @@ final class DeleteReply extends ModalComponent
 
     public function mount(int $id, string $slug): void
     {
-        $this->reply = Reply::find($id);
+        $this->reply = Reply::query()->find($id);
         $this->slug = $slug;
     }
 
     public function delete(): void
     {
-        $this->authorize(ReplyPolicy::DELETE, $this->reply);
+        $this->authorize('delete', $this->reply);
 
-        $this->reply->delete(); // @phpstan-ignore-line
+        $this->reply?->delete();
 
         session()->flash('status', __('La réponse a ete supprimée avec succès.'));
 
diff --git a/app/Livewire/Modals/DeleteThread.php b/app/Livewire/Modals/DeleteThread.php
index cb71a6db..38b2e390 100644
--- a/app/Livewire/Modals/DeleteThread.php
+++ b/app/Livewire/Modals/DeleteThread.php
@@ -5,7 +5,6 @@
 namespace App\Livewire\Modals;
 
 use App\Models\Thread;
-use App\Policies\ThreadPolicy;
 use Illuminate\Contracts\View\View;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use LivewireUI\Modal\ModalComponent;
@@ -18,7 +17,7 @@ final class DeleteThread extends ModalComponent
 
     public function mount(int $id): void
     {
-        $this->thread = Thread::find($id);
+        $this->thread = Thread::query()->find($id);
     }
 
     public static function modalMaxWidth(): string
@@ -28,9 +27,9 @@ public static function modalMaxWidth(): string
 
     public function delete(): void
     {
-        $this->authorize(ThreadPolicy::DELETE, $this->thread);
+        $this->authorize('delete', $this->thread);
 
-        $this->thread->delete(); // @phpstan-ignore-line
+        $this->thread?->delete();
 
         session()->flash('status', __('Le sujet a été supprimé avec toutes ses réponses.'));
 
diff --git a/app/Livewire/Pages/Forum/DetailThread.php b/app/Livewire/Pages/Forum/DetailThread.php
index 4b0a9c82..d91bb2ed 100644
--- a/app/Livewire/Pages/Forum/DetailThread.php
+++ b/app/Livewire/Pages/Forum/DetailThread.php
@@ -5,21 +5,62 @@
 namespace App\Livewire\Pages\Forum;
 
 use App\Models\Thread;
+use Filament\Actions\Action;
+use Filament\Actions\Concerns\InteractsWithActions;
+use Filament\Actions\Contracts\HasActions;
+use Filament\Forms\Concerns\InteractsWithForms;
+use Filament\Forms\Contracts\HasForms;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Auth;
 use Livewire\Attributes\Layout;
+use Livewire\Attributes\On;
 use Livewire\Component;
 
 #[Layout('layouts.forum')]
-final class DetailThread extends Component
+final class DetailThread extends Component implements HasActions, HasForms
 {
+    use InteractsWithActions;
+    use InteractsWithForms;
+
     public Thread $thread;
 
     public function mount(Thread $thread): void
     {
-        $this->thread = $thread->load('replies.user', 'replies', 'latestReply');
-        views($thread)->record();
+        views($thread)->cooldown(now()->addHour())->record();
+
+        $this->thread = $thread->loadCount('views');
+    }
+
+    public function editAction(): Action
+    {
+        return Action::make('edit')
+            ->label(__('actions.edit'))
+            ->color('gray')
+            ->authorize('update', $this->thread)
+            ->action(
+                fn () => $this->dispatch(
+                    'openPanel',
+                    component: 'components.slideovers.thread-form',
+                    arguments: ['threadId' => $this->thread->id]
+                )
+            );
+    }
+
+    public function deleteAction(): Action
+    {
+        return Action::make('delete')
+            ->label(__('actions.delete'))
+            ->color('danger')
+            ->requiresConfirmation()
+            ->authorize('delete', $this->thread)
+            ->action(function (): void {
+                $this->thread->delete();
+
+                $this->redirectRoute('forum.index', navigate: true);
+            });
     }
 
+    #[On('thread.save.{thread.id}')]
     public function render(): View
     {
         return view('livewire.pages.forum.detail-thread')
diff --git a/app/Livewire/Pages/Forum/Index.php b/app/Livewire/Pages/Forum/Index.php
index 74cad474..91b4a9e5 100644
--- a/app/Livewire/Pages/Forum/Index.php
+++ b/app/Livewire/Pages/Forum/Index.php
@@ -24,12 +24,7 @@ final class Index extends Component
 
     public string $search = '';
 
-    public int $perPage = 20;
-
-    public function launchSearch(): void
-    {
-        //
-    }
+    public int $perPage = 30;
 
     #[On('channelUpdated')]
     public function reloadThreads(?int $channelId): void
@@ -40,12 +35,13 @@ public function reloadThreads(?int $channelId): void
             $this->currentChannel = null;
         }
 
+        $this->resetPage();
         $this->dispatch('render');
     }
 
     public function render(): View
     {
-        $query = Thread::query()
+        $query = Thread::with('channels')
             ->orderByDesc('created_at');
 
         if ($this->currentChannel?->id) {
diff --git a/app/Livewire/Reactions.php b/app/Livewire/Reactions.php
index ac139b74..0dd238a0 100644
--- a/app/Livewire/Reactions.php
+++ b/app/Livewire/Reactions.php
@@ -19,7 +19,7 @@ final class Reactions extends Component
 
     public bool $withBackground = true;
 
-    public string $direction = 'right';
+    public string $direction = 'horizontal';
 
     public function userReacted(string $reaction): void
     {
diff --git a/app/Mail/NewReplyEmail.php b/app/Mail/NewReplyEmail.php
index a71402f6..6f8cde7e 100644
--- a/app/Mail/NewReplyEmail.php
+++ b/app/Mail/NewReplyEmail.php
@@ -21,6 +21,7 @@ public function __construct(
 
     public function build(): self
     {
+        // @phpstan-ignore-next-line
         return $this->subject("Re: {$this->reply->replyAble->subject()}")
             ->markdown('emails.new_reply');
     }
diff --git a/app/Models/Article.php b/app/Models/Article.php
index 1f5e9241..118d270e 100644
--- a/app/Models/Article.php
+++ b/app/Models/Article.php
@@ -20,6 +20,14 @@
 use Spatie\MediaLibrary\HasMedia;
 use Spatie\MediaLibrary\InteractsWithMedia;
 
+/**
+ * @property-read int $id
+ * @property string $title
+ * @property string $slug
+ * @property string $body
+ * @property int $user_id
+ * @property User $user
+ */
 final class Article extends Model implements HasMedia, ReactableInterface, Viewable
 {
     use HasAuthor;
@@ -36,7 +44,6 @@ final class Article extends Model implements HasMedia, ReactableInterface, Viewa
         'body',
         'slug',
         'canonical_url',
-        'cover_image',
         'show_toc',
         'is_pinned',
         'user_id',
@@ -428,7 +435,7 @@ public static function nexForSharingToTelegram(): ?self
 
     public function markAsPublish(): void
     {
-        $this->update(['tweet_id' => $this->user->id]); // @phpstan-ignore-line
+        $this->update(['tweet_id' => $this->user->id]);
     }
 
     public function delete(): ?bool
diff --git a/app/Models/Discussion.php b/app/Models/Discussion.php
index bf109a53..47243227 100644
--- a/app/Models/Discussion.php
+++ b/app/Models/Discussion.php
@@ -14,6 +14,7 @@
 use App\Traits\HasTags;
 use App\Traits\Reactable;
 use App\Traits\RecordsActivity;
+use Carbon\Carbon;
 use CyrildeWit\EloquentViewable\Contracts\Viewable;
 use CyrildeWit\EloquentViewable\InteractsWithViews;
 use Illuminate\Database\Eloquent\Builder;
@@ -21,6 +22,18 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 
+/**
+ * @property-read int $id
+ * @property string $title
+ * @property string $slug
+ * @property string $body
+ * @property bool $locked
+ * @property bool $is_pinned
+ * @property int $user_id
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ * @property User $user
+ */
 final class Discussion extends Model implements ReactableInterface, ReplyInterface, SubscribeInterface, Viewable
 {
     use HasAuthor;
diff --git a/app/Models/Reply.php b/app/Models/Reply.php
index 878a2b82..b219bff0 100644
--- a/app/Models/Reply.php
+++ b/app/Models/Reply.php
@@ -22,8 +22,12 @@
 /**
  * @property-read int $id
  * @property string $body
+ * @property int $user_id
  * @property Carbon $created_at
  * @property Carbon $updated_at
+ * @property User $user
+ * @property int $replyable_id
+ * @property string $replyable_type
  */
 final class Reply extends Model implements ReactableInterface, ReplyInterface
 {
diff --git a/app/Models/Thread.php b/app/Models/Thread.php
index a5a1bb4f..6b0e91f2 100644
--- a/app/Models/Thread.php
+++ b/app/Models/Thread.php
@@ -38,8 +38,11 @@
  * @property string $slug
  * @property string $body
  * @property int $user_id
+ * @property int $solution_reply_id
  * @property bool $locked
  * @property Carbon | null $last_posted_at
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
  * @property int | null $resolved_by
  * @property User | null $resolvedBy
  * @property User $user
@@ -71,10 +74,6 @@ final class Thread extends Model implements Feedable, ReactableInterface, ReplyI
         'last_posted_at' => 'datetime',
     ];
 
-    protected $with = [
-        'channels',
-    ];
-
     protected bool $removeViewsOnDelete = true;
 
     public function getRouteKeyName(): string
diff --git a/app/Policies/NotificationPolicy.php b/app/Policies/NotificationPolicy.php
index 1ebaa09a..31c1a071 100644
--- a/app/Policies/NotificationPolicy.php
+++ b/app/Policies/NotificationPolicy.php
@@ -13,6 +13,6 @@ final class NotificationPolicy
 
     public function markAsRead(User $user, DatabaseNotification $notification): bool
     {
-        return $notification->notifiable->is($user);
+        return $notification->notifiable->is($user); // @phpstan-ignore-line
     }
 }
diff --git a/app/Policies/ReplyPolicy.php b/app/Policies/ReplyPolicy.php
index 10201611..b7d02fba 100644
--- a/app/Policies/ReplyPolicy.php
+++ b/app/Policies/ReplyPolicy.php
@@ -9,14 +9,14 @@
 
 final class ReplyPolicy
 {
-    public function create(User $user): bool
+    public function manage(User $user, Reply $reply): bool
     {
-        return $user->hasVerifiedEmail();
+        return $reply->isAuthoredBy($user) || $user->isModerator() || $user->isAdmin();
     }
 
-    public function manage(User $user, Reply $reply): bool
+    public function create(User $user): bool
     {
-        return $reply->isAuthoredBy($user) || $user->isModerator() || $user->isAdmin();
+        return $user->hasVerifiedEmail();
     }
 
     public function update(User $user, Reply $reply): bool
diff --git a/app/Policies/ThreadPolicy.php b/app/Policies/ThreadPolicy.php
index 25640f3f..2e104ca9 100644
--- a/app/Policies/ThreadPolicy.php
+++ b/app/Policies/ThreadPolicy.php
@@ -9,13 +9,10 @@
 
 final class ThreadPolicy
 {
-    public const UPDATE = 'update';
-
-    public const DELETE = 'delete';
-
-    public const SUBSCRIBE = 'subscribe';
-
-    public const UNSUBSCRIBE = 'unsubscribe';
+    public function manage(User $user, Thread $thread): bool
+    {
+        return $thread->isAuthoredBy($user) || $user->isModerator() || $user->isAdmin();
+    }
 
     public function update(User $user, Thread $thread): bool
     {
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 3b23f193..dd644e31 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -15,7 +15,6 @@
 use App\Policies\ThreadPolicy;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Illuminate\Notifications\DatabaseNotification as Notification;
-use Illuminate\Support\Facades\Gate;
 
 final class AuthServiceProvider extends ServiceProvider
 {
@@ -35,7 +34,5 @@ final class AuthServiceProvider extends ServiceProvider
     public function boot(): void
     {
         $this->registerPolicies();
-
-        Gate::before(fn ($user) => $user->hasRole('admin') ? true : null);
     }
 }
diff --git a/app/Spotlight/Article.php b/app/Spotlight/Article.php
index ffa0980e..e679c217 100644
--- a/app/Spotlight/Article.php
+++ b/app/Spotlight/Article.php
@@ -31,14 +31,14 @@ public function dependencies(): ?SpotlightCommandDependencies
 
     public function searchArticle(string $query): Collection
     {
-        return ArticleModel::published()
-            ->with('user')
+        return ArticleModel::with('user')
+            ->scopes('published')
             ->where('title', 'like', "%{$query}%")
             ->get()
             ->map(fn (ArticleModel $article) => new SpotlightSearchResult(
                 $article->slug(),
                 $article->title,
-                sprintf('par @%s', $article->user?->username)
+                sprintf('par @%s', $article->user->username)
             ));
     }
 
diff --git a/app/Spotlight/Discussion.php b/app/Spotlight/Discussion.php
index 04879e59..3e8485de 100644
--- a/app/Spotlight/Discussion.php
+++ b/app/Spotlight/Discussion.php
@@ -37,7 +37,7 @@ public function searchDiscussion(string $query): Collection
             ->map(fn (DiscussionModel $discussion) => new SpotlightSearchResult(
                 $discussion->slug(),
                 $discussion->title,
-                sprintf('par @%s', $discussion->user?->username)
+                sprintf('par @%s', $discussion->user->username)
             ));
     }
 
diff --git a/app/Spotlight/Sujet.php b/app/Spotlight/Sujet.php
index 6f33416f..2cf9aafb 100644
--- a/app/Spotlight/Sujet.php
+++ b/app/Spotlight/Sujet.php
@@ -42,7 +42,7 @@ public function searchThread(string $query): Collection
             ->map(fn (Thread $thread) => new SpotlightSearchResult(
                 $thread->slug(),
                 $thread->title,
-                sprintf('par @%s', $thread->user?->username)
+                sprintf('par @%s', $thread->user->username)
             ));
     }
 
diff --git a/app/Traits/HasAuthor.php b/app/Traits/HasAuthor.php
index b3aa5aeb..a2e5ceb2 100644
--- a/app/Traits/HasAuthor.php
+++ b/app/Traits/HasAuthor.php
@@ -23,6 +23,6 @@ public function user(): BelongsTo
 
     public function isAuthoredBy(User $user): bool
     {
-        return $this->user?->is($user);
+        return $this->user->is($user);
     }
 }
diff --git a/app/Traits/RecordsActivity.php b/app/Traits/RecordsActivity.php
index 4632c238..7ccd0257 100644
--- a/app/Traits/RecordsActivity.php
+++ b/app/Traits/RecordsActivity.php
@@ -24,7 +24,7 @@ protected static function bootRecordsActivity(): void
         }
 
         static::deleting(function ($model): void {
-            $model->activity()->delete();
+            $model->activities()->delete();
         });
     }
 
diff --git a/config/livewire.php b/config/livewire.php
index f2dc751e..6decbb4e 100644
--- a/config/livewire.php
+++ b/config/livewire.php
@@ -131,7 +131,7 @@
 
     'navigate' => [
         'show_progress_bar' => true,
-        'progress_bar_color' => '#2299dd',
+        'progress_bar_color' => '#099170',
     ],
 
     /*
diff --git a/lang/en/actions.php b/lang/en/actions.php
index d0432224..22ff7b6c 100644
--- a/lang/en/actions.php
+++ b/lang/en/actions.php
@@ -4,7 +4,7 @@
 
 return [
 
-    'new_thread' => 'Lancer un thread',
+    'new_thread' => 'Start a thread',
     'edit' => 'Edit',
     'approve' => 'Approve',
     'delete' => 'Delete',
diff --git a/lang/en/notifications.php b/lang/en/notifications.php
index 0ac6e029..2106cddb 100644
--- a/lang/en/notifications.php
+++ b/lang/en/notifications.php
@@ -12,10 +12,11 @@
         'created' => 'Thread was successfully created.',
         'updated' => 'Thread was successfully updated.',
         'deleted' => 'Thread was successfully deleted.',
+        'best_reply' => 'You have accepted this solution as the best answer for this thread.',
     ],
 
     'exceptions' => [
-        'unverified_user' => "Vous n'êtes pas autorisé à effectuer cette. Votre e-mail n'est pas vérifiée",
+        'unverified_user' => 'You are not authorized to do this. Your e-mail is not verified',
     ],
 
 ];
diff --git a/lang/en/pages/forum.php b/lang/en/pages/forum.php
index 8c14ced8..f6fe1e74 100644
--- a/lang/en/pages/forum.php
+++ b/lang/en/pages/forum.php
@@ -35,5 +35,8 @@
     'torchlight' => 'For code formatting (syntax color, language, etc.) we use',
     'old_thread' => 'The last reply to this topic was more than six months ago. Consider opening a new topic if you have a similar question.',
     'best_answer' => 'Best answer',
+    'mark_answer' => 'Mark as solution',
+    'report_spam' => 'Report spam',
+    'max_thread_length' => '100 characters maximum',
 
 ];
diff --git a/lang/en/pages/home.php b/lang/en/pages/home.php
index a8ad6f19..2f0f0eee 100644
--- a/lang/en/pages/home.php
+++ b/lang/en/pages/home.php
@@ -4,42 +4,42 @@
 
 return [
 
-    'title' => 'La plus grande communauté de développeurs Laravel & PHP au Cameroun',
-    'description' => 'Laravel Cameroun est le portail de la communauté de développeurs PHP & Laravel au Cameroun, on partage, on apprend, on découvre et on construit une grande communauté.',
+    'title' => 'The largest community of Laravel & PHP developers in Cameroon',
+    'description' => 'Laravel Cameroun is the portal for the PHP & Laravel developer community in Cameroon, where we share, learn, discover and build a great community.',
     'sponsor' => [
         'title' => 'Sponsor',
-        'description' => 'Soutenez Laravel Cameroun aujourd\'hui en sponsorisant',
-        'description_small' => 'Soutenez Laravel Cameroun',
+        'description' => 'Support Laravel Cameroun today by sponsoring',
+        'description_small' => 'Support Laravel Cameroun',
     ],
     'join_community' => 'Join the community',
     'visit_forum' => 'Visit the forum',
-    'work_associations' => 'Nous travaillons avec d’autres communautés et startups',
-    'view_logo_question' => 'Votre logo ici ?',
+    'work_associations' => 'We work with other communities and startups',
+    'view_logo_question' => 'Your logo here ?',
     'popular_posts' => [
         'title' => 'Popular Posts',
-        'description' => 'Découvrez les articles les plus appréciés et partagés par les membres de la communauté',
+        'description' => 'Discover the most popular articles shared by community members',
     ],
-    'view_posts' => 'Voir tous les articles',
+    'view_posts' => 'See all articles',
     'threads' => [
-        'title' => 'On apprend aussi en aidant les autres',
-        'description' => 'En rejoignant la communauté, vous pouvez consulter les dernières questions non résolues et apporter votre pierre à l’édifice.',
-        'show' => 'Afficher la question',
-        'show_all' => 'Voir tous les sujets',
+        'title' => 'We also learn by helping others',
+        'description' => 'By joining the community, you can consult the latest unresolved questions and make your contribution to the edifice.',
+        'show' => 'Show question',
+        'show_all' => 'View all threads',
     ],
     'discussions' => [
-        'title' => 'Ou venez juste discuter',
-        'description' => 'Dans la communauté on partage aussi des sujets de discussions dans divers domaines, pour nous édifier tous ensemble. Rejoins nous en participant',
-        'read' => 'Lire la discussion',
-        'show_all' => 'Voir toutes les discussions',
+        'title' => 'Or just come and chat',
+        'description' => 'The community also shares topics for discussion in a variety of areas, to edify us all together. Join us by participating',
+        'read' => 'Read the discussion',
+        'show_all' => 'View all discussions',
     ],
     'about' => [
-        'heading' => "Nous construisons une communauté Open Source d'apprenants et d'enseignants",
-        'everybody_learn' => 'Tout le monde enseigne, tout le monde apprend',
-        'community_spirit' => "Tel est l'esprit qui est derrière la communauté. Une communauté qui se veut grandissante et qui donne la possibilité à tout le monde de partager ses connaissances et d'apprendre.",
-        'join_members' => 'qui ont rejoint les différents groupes de la communauté',
-        'developers_location' => 'dans l’ensemble du territoire national.',
-        'young_community' => 'car la communauté est encore très jeune.',
-        'projects' => 'sur les projets réalisés par les développeurs camerounais sur Github.',
+        'heading' => 'We build an Open Source community of learners and teachers',
+        'everybody_learn' => 'Everyone teaches, everyone learns',
+        'community_spirit' => 'This is the spirit behind the community. A community that aims to grow and give everyone the chance to share their knowledge and learn.',
+        'join_members' => 'who joined the various community groups',
+        'developers_location' => 'throughout the country.',
+        'young_community' => 'because the community is still very young.',
+        'projects' => 'on projects created by Cameroonian developers on Github.',
     ],
 
 ];
diff --git a/lang/fr/notifications.php b/lang/fr/notifications.php
index b35c7407..91453e8d 100644
--- a/lang/fr/notifications.php
+++ b/lang/fr/notifications.php
@@ -12,6 +12,7 @@
         'created' => 'Votre sujet à été crée.',
         'updated' => 'Votre sujet à été modifié.',
         'deleted' => 'Le sujet a été supprimé.',
+        'best_reply' => 'Vous avez accepté cette solution comme meilleure réponse pour ce sujet.',
     ],
 
     'exceptions' => [
diff --git a/lang/fr/pages/forum.php b/lang/fr/pages/forum.php
index 40634e21..73c41ce5 100644
--- a/lang/fr/pages/forum.php
+++ b/lang/fr/pages/forum.php
@@ -35,5 +35,8 @@
     'torchlight' => 'Pour le formatage du code (couleur syntaxique, langage, etc) nous utilisons',
     'old_thread' => 'La dernière réponse à ce sujet remonte à plus de six mois. Pensez à ouvrir un nouveau sujet si vous avez une question similaire.',
     'best_answer' => 'Meilleure réponse',
+    'mark_answer' => 'Marquer comme réponse',
+    'report_spam' => 'Signaler un spam',
+    'max_thread_length' => 'Maximum de 100 caractères.',
 
 ];
diff --git a/resources/views/components/ads.blade.php b/resources/views/components/ads.blade.php
index a6f49b37..1f0eef31 100644
--- a/resources/views/components/ads.blade.php
+++ b/resources/views/components/ads.blade.php
@@ -1,9 +1,9 @@
 @php($ads = Illuminate\Support\Arr::random(config('lcm.ads')))
 
 <div id="laravelcm-ads">
-    <a href="{{ $ads['url'] }}" class="block rounded-lg overflow-hidden ring-1 ring-gray-100 shadow dark:ring-white/20">
+    <a href="{{ $ads['url'] }}" target="_blank" class="block aspect-[2/1] rounded-lg overflow-hidden ring-1 ring-gray-200/50 shadow dark:ring-white/20">
         <img
-            class="aspect-[3/2] object-cover"
+            class="size-full object-cover"
             src="{{ asset("/images/ads/{$ads['image']}.png") }}"
             alt="{{ $ads['alt'] }}"
         />
@@ -14,6 +14,7 @@ class="aspect-[3/2] object-cover"
     <div class="mt-2">
         <a
             href="{{ $ads['url'] }}"
+            target="_blank"
             class="text-sm font-medium text-primary-600 hover:text-primary-600-hover hover:underline"
         >
             {{ __('global.view_more') }}
diff --git a/resources/views/components/buttons/submit.blade.php b/resources/views/components/buttons/submit.blade.php
index e5f2ee1e..7506ea82 100644
--- a/resources/views/components/buttons/submit.blade.php
+++ b/resources/views/components/buttons/submit.blade.php
@@ -1,13 +1,13 @@
 @props([
-    'title',
+    'title' => null,
 ])
 
 <x-buttons.primary
     type="submit"
     {{ $attributes->twMerge(['class' => 'relative data-[loading]:pointer-events-none']) }}
 >
-    <span class="[[data-loading]>&]:opacity-0 transition-opacity delay-100">
-        {{ $title }}
+    <span class="inline-flex items-center gap-2 [[data-loading]>&]:opacity-0 transition-opacity delay-100">
+        {{ $title ?? $slot }}
     </span>
     <span class="[[data-loading]>&]:opacity-100 opacity-0 absolute inset-0 flex items-center justify-center">
         <x-loader class="bg-white" />
diff --git a/resources/views/components/forum/thread-channels.blade.php b/resources/views/components/forum/thread-channels.blade.php
new file mode 100644
index 00000000..5a35e818
--- /dev/null
+++ b/resources/views/components/forum/thread-channels.blade.php
@@ -0,0 +1,20 @@
+@props([
+    'thread',
+])
+
+@if (count($channels = $thread->channels->load('parent')))
+    <div {{ $attributes->twMerge(['class' => 'flex mb-2 flex-wrap gap-1.5']) }}>
+        @foreach ($channels as $channel)
+            @php
+                $color = $channel->parent_id ? $channel->parent->color : $channel->color;
+            @endphp
+            <x-link :href="route('forum.channels', $channel)" class="flex gap-2">
+                <x-forum.channel
+                    :channel="$channel"
+                    class="text-xs is-channel is-{{ $channel->slug }}"
+                    style="--channel-color: {{ $color }}"
+                />
+            </x-link>
+        @endforeach
+    </div>
+@endif
diff --git a/resources/views/components/forum/thread-metadata.blade.php b/resources/views/components/forum/thread-metadata.blade.php
index 32a483b6..bc443478 100644
--- a/resources/views/components/forum/thread-metadata.blade.php
+++ b/resources/views/components/forum/thread-metadata.blade.php
@@ -1,15 +1,25 @@
 @props([
     'thread',
+    'vertical' => false,
 ])
 
-<div {{ $attributes->twMerge(['class' => 'flex items-center gap-2']) }}>
-    <p class="inline-flex items-center gap-1 text-sm">
+<div {{ $attributes->class([
+    'flex items-center gap-2 text-sm',
+    'flex-col' => $vertical
+]) }}>
+    <p @class([
+        'inline-flex items-center gap-1',
+        'flex-col justify-center' => $vertical
+    ])>
         <x-untitledui-message-text-square-02 class="size-5 text-gray-400 dark:text-gray-500" stroke-width="1.5" aria-hidden="true" />
         <span class="text-gray-500 dark:text-gray-400">{{ count($thread->replies) }}</span>
         <span class="sr-only">{{ __('global.answers') }}</span>
     </p>
 
-    <p class="inline-flex items-center gap-1 text-sm">
+    <p @class([
+        'inline-flex items-center gap-1',
+        'flex-col justify-center' => $vertical
+    ])>
         <x-untitledui-eye class="size-5 text-gray-400 dark:text-gray-500" stroke-width="1.5" aria-hidden="true" />
         <span class="text-gray-500 dark:text-gray-400">{{ $thread->views_count }}</span>
         <span class="sr-only">{{ __('global.views') }}</span>
diff --git a/resources/views/components/forum/thread-overview.blade.php b/resources/views/components/forum/thread-overview.blade.php
deleted file mode 100644
index bb3cd36d..00000000
--- a/resources/views/components/forum/thread-overview.blade.php
+++ /dev/null
@@ -1,62 +0,0 @@
-@props([
-    'thread',
-])
-
-<article class="rounded-xl cursor-pointer bg-white p-4 ring-1 ring-inset ring-gray-200/60 transition duration-200 ease-in-out dark:bg-gray-800 dark:ring-white/10 dark:hover:bg-white/10 lg:py-5 lg:px-6" aria-labelledby="{{ $thread->slug }}">
-    @if (count($channels = $thread->channels->load('parent')))
-        <div class="flex mb-2 flex-wrap lg:gap-1.5">
-            @foreach ($channels as $channel)
-                @php
-                    $color = $channel->parent_id ? $channel->parent->color : $channel->color;
-                @endphp
-                <x-link :href="route('forum.channels', $channel)" class="flex gap-2">
-                    <x-forum.channel
-                        :channel="$channel"
-                        class="text-xs is-channel is-{{ $channel->slug }}"
-                        style="--channel-color: {{ $color }}"
-                    />
-                </x-link>
-            @endforeach
-        </div>
-    @endif
-
-    <div class="flex items-center gap-4">
-        <h2 id="question-title-{{ $thread->id }}" class="truncate font-medium text-gray-900 dark:text-white lg:text-xl">
-            <x-link :href="route('forum.show', $thread)" class="hover:underline">
-                {{ $thread->subject() }}
-            </x-link>
-        </h2>
-        @if ($thread->isSolved())
-            <x-link
-                :href="route('forum.show', $thread->slug). '#' .$thread->solution_reply_id"
-                class="inline-flex items-center rounded-xl gap-1 px-2 py-0.5 font-medium bg-primary-50 ring-1 ring-primary-200 text-primary-700 dark:bg-primary-800/20 dark:text-primary-500 dark:ring-primary-800"
-            >
-                <x-untitledui-check-verified class="size-3.5 text-primary-600" stroke-width="1.5" aria-hidden="true" />
-                <span class="text-xs">{{ __('pages/forum.navigation.solve') }}</span>
-            </x-link>
-        @endif
-    </div>
-
-    <div class="mt-2 text-sm text-gray-700 line-clamp-2 dark:text-gray-300">
-        <x-link :href="route('forum.show', $thread)">{!! $thread->excerpt() !!}</x-link>
-    </div>
-
-    <div class="mt-6 flex justify-between space-x-8">
-        <div class="flex items-center gap-2">
-            <x-link :href="route('profile', $thread->user->username)" class="group inline-flex items-center gap-1 shrink-0">
-                <x-user.avatar :user="$thread->user" class="size-6" />
-                <span class="font-medium text-sm text-gray-700 group-hover:underline dark:text-gray-300">
-                    {{ '@' . $thread->user->username }}
-                </span>
-            </x-link>
-            <span class="flex items-center text-xs text-gray-500 flex-wrap gap-x-1 dark:text-gray-400">
-                <span>{{ __('global.ask') }}</span>
-                <time datetime="{{ $thread->created_at }}">
-                    {{ $thread->created_at->diffForHumans() }}
-                </time>
-            </span>
-        </div>
-
-        <x-forum.thread-metadata :thread="$thread" />
-    </div>
-</article>
diff --git a/resources/views/components/forum/thread.blade.php b/resources/views/components/forum/thread.blade.php
index d2d2aa1f..b7a9a6d1 100644
--- a/resources/views/components/forum/thread.blade.php
+++ b/resources/views/components/forum/thread.blade.php
@@ -2,117 +2,46 @@
     'thread',
 ])
 
-{{--<div class="thread mt-5 rounded-md bg-skin-card p-3 shadow sm:p-4">
-    @canany([App\Policies\ThreadPolicy::UPDATE, App\Policies\ThreadPolicy::DELETE], $thread)
-        <div class="mb-4 flex items-center justify-end">
-            <div class="flex shrink-0 self-center">
-                <div
-                    x-data="{ open: false }"
-                    @keydown.escape.stop="open = false;"
-                    @click.away="open = false"
-                    class="relative inline-block text-left"
-                >
-                    <div>
-                        <button
-                            type="button"
-                            class="-m-2 flex items-center rounded-full p-2 text-skin-muted hover:text-gray-500 dark:text-gray-400"
-                            x-ref="button"
-                            @click="open = !open"
-                            aria-expanded="false"
-                            aria-haspopup="true"
-                            x-bind:aria-expanded="open.toString()"
-                        >
-                            <span class="sr-only">Afficher les options</span>
-                            <svg
-                                xmlns="http://www.w3.org/2000/svg"
-                                fill="none"
-                                viewBox="0 0 24 24"
-                                stroke-width="1.5"
-                                stroke="currentColor"
-                                class="size-5"
-                            >
-                                <path
-                                    stroke-linecap="round"
-                                    stroke-linejoin="round"
-                                    d="M12 6.75a.75.75 0 110-1.5.75.75 0 010 1.5zM12 12.75a.75.75 0 110-1.5.75.75 0 010 1.5zM12 18.75a.75.75 0 110-1.5.75.75 0 010 1.5z"
-                                />
-                            </svg>
-                        </button>
-                    </div>
+<article class="rounded-xl cursor-pointer bg-white p-4 ring-1 ring-inset ring-gray-200/60 transition duration-200 ease-in-out dark:bg-gray-800 dark:ring-white/10 dark:hover:bg-white/10 lg:py-5 lg:px-6" aria-labelledby="{{ $thread->slug }}">
+    <x-forum.thread-channels :thread="$thread" />
 
-                    <div
-                        x-show="open"
-                        x-transition:enter="transition duration-100 ease-out"
-                        x-transition:enter-start="scale-95 transform opacity-0"
-                        x-transition:enter-end="scale-100 transform opacity-100"
-                        x-transition:leave="transition duration-75 ease-in"
-                        x-transition:leave-start="scale-100 transform opacity-100"
-                        x-transition:leave-end="scale-95 transform opacity-0"
-                        class="absolute right-0 mt-2 w-56 origin-top-right rounded-md bg-skin-card shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"
-                        x-ref="menu-items"
-                        role="menu"
-                        aria-orientation="vertical"
-                        aria-labelledby="options-menu-{{ $thread->id }}-button"
-                        tabindex="-1"
-                        @keydown.tab="open = false"
-                        @keydown.enter.prevent="open = false;"
-                        @keyup.space.prevent="open = false;"
-                        style="display: none"
-                    >
-                        <div class="py-1" role="none">
-                            @can(App\Policies\ThreadPolicy::UPDATE, $thread)
-                                <a
-                                    href="{{ route('forum.edit', $thread) }}"
-                                    class="group flex px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:text-gray-900"
-                                    role="menuitem"
-                                    tabindex="-1"
-                                >
-                                    <svg
-                                        class="mr-3 size-5 text-skin-muted group-hover:text-gray-500 dark:text-gray-400"
-                                        xmlns="http://www.w3.org/2000/svg"
-                                        fill="none"
-                                        viewBox="0 0 24 24"
-                                        stroke-width="1.5"
-                                        stroke="currentColor"
-                                    >
-                                        <path
-                                            stroke-linecap="round"
-                                            stroke-linejoin="round"
-                                            d="M16.862 4.487l1.687-1.688a1.875 1.875 0 112.652 2.652L6.832 19.82a4.5 4.5 0 01-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 011.13-1.897L16.863 4.487zm0 0L19.5 7.125"
-                                        />
-                                    </svg>
-                                    <span>Éditer</span>
-                                </a>
-                            @endcan
+    <div class="flex items-center gap-4">
+        <h2 id="question-title-{{ $thread->id }}" class="truncate font-medium text-gray-900 dark:text-white lg:text-xl">
+            <x-link :href="route('forum.show', $thread)" class="hover:underline">
+                {{ $thread->subject() }}
+            </x-link>
+        </h2>
+        @if ($thread->isSolved())
+            <x-link
+                :href="route('forum.show', $thread->slug). '#' .$thread->solution_reply_id"
+                class="inline-flex items-center rounded-xl gap-1 px-2 py-0.5 font-medium bg-primary-50 ring-1 ring-primary-200 text-primary-700 dark:bg-primary-800/20 dark:text-primary-500 dark:ring-primary-800"
+            >
+                <x-untitledui-check-verified class="size-3.5 text-primary-600" stroke-width="1.5" aria-hidden="true" />
+                <span class="text-xs">{{ __('pages/forum.navigation.solve') }}</span>
+            </x-link>
+        @endif
+    </div>
 
-                            @can(App\Policies\ThreadPolicy::DELETE, $thread)
-                                <button
-                                    type="button"
-                                    onclick="Livewire.dispatch('openModal', {component: 'modals.delete-thread', arguments: {{ json_encode([$thread->id]) }} })"
-                                    class="group flex px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:text-gray-900"
-                                    role="menuitem"
-                                    tabindex="-1"
-                                >
-                                    <x-untitledui-trash-03
-                                        class="mr-3 size-5 text-skin-muted group-hover:text-gray-500 dark:text-gray-400"
-                                    />
-                                    <span>Supprimer</span>
-                                </button>
-                            @endcan
+    <div class="mt-2 text-sm text-gray-700 line-clamp-2 dark:text-gray-300">
+        <x-link :href="route('forum.show', $thread)">{!! $thread->excerpt() !!}</x-link>
+    </div>
 
-                            <a
-                                href="#"
-                                class="group flex px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:text-gray-900"
-                                role="menuitem"
-                                tabindex="-1"
-                            >
-                                <x-heroicon-s-flag class="mr-3 size-5 text-skin-muted group-hover:text-gray-500 dark:text-gray-400" />
-                                <span>Signaler contenu</span>
-                            </a>
-                        </div>
-                    </div>
-                </div>
-            </div>
+    <div class="mt-6 flex justify-between space-x-8">
+        <div class="flex items-center gap-2">
+            <x-link :href="route('profile', $thread->user->username)" class="group inline-flex items-center gap-1 shrink-0">
+                <x-user.avatar :user="$thread->user" class="size-6" />
+                <span class="font-medium text-sm text-gray-700 group-hover:underline dark:text-gray-300">
+                    {{ '@' . $thread->user->username }}
+                </span>
+            </x-link>
+            <span class="flex items-center text-xs text-gray-500 flex-wrap gap-x-1 dark:text-gray-400">
+                <span>{{ __('global.ask') }}</span>
+                <time datetime="{{ $thread->created_at }}">
+                    {{ $thread->created_at->diffForHumans() }}
+                </time>
+            </span>
         </div>
-    @endcanany
-</div>--}}
+
+        <x-forum.thread-metadata :thread="$thread" />
+    </div>
+</article>
diff --git a/resources/views/components/info-panel.blade.php b/resources/views/components/info-panel.blade.php
index 63dc10e0..31015794 100644
--- a/resources/views/components/info-panel.blade.php
+++ b/resources/views/components/info-panel.blade.php
@@ -1,9 +1,9 @@
-<div {{ $attributes->merge(['class' => 'rounded-lg bg-blue-50 p-4 dark:bg-blue-800/20']) }}>
+<div {{ $attributes->twMerge(['class' => 'rounded-lg bg-gray-100 ring-1 ring-gray-200 p-4 dark:bg-gray-800 dark:ring-white/20']) }}>
     <div class="flex">
         <div class="shrink-0">
-            <x-heroicon-s-information-circle class="size-5 text-blue-400" aria-hidden="true" />
+            <x-untitledui-lock class="size-5 text-gray-400 dark:text-gray-500" aria-hidden="true" />
         </div>
-        <div class="ml-3 flex-1">
+        <div class="ml-3 flex-1 text-gray-500 dark:text-gray-400">
             {{ $slot }}
         </div>
     </div>
diff --git a/resources/views/components/layouts/header.blade.php b/resources/views/components/layouts/header.blade.php
index 692733b4..abb01535 100644
--- a/resources/views/components/layouts/header.blade.php
+++ b/resources/views/components/layouts/header.blade.php
@@ -1,4 +1,4 @@
-<header {{ $attributes->twMerge(['class' => 'relative z-10 backdrop-blur-sm bg-white lg:bg-transparent']) }}>
+<header {{ $attributes->twMerge(['class' => 'relative z-10 bg-white lg:bg-transparent']) }}>
     <x-container>
         <nav class="flex h-16 items-center justify-between">
             <div class="flex flex-1 items-center">
@@ -12,7 +12,7 @@
                 </div>
             </div>
 
-            <div x-data class="flex items-center gap-6">
+            <div x-data="{ open: false }" class="flex items-center gap-6">
                 @include('partials._search')
 
                 <!-- Large screen authenticate links -->
diff --git a/resources/views/livewire/forum/create-reply.blade.php b/resources/views/livewire/forum/create-reply.blade.php
index 24f2ba4b..b29d3490 100644
--- a/resources/views/livewire/forum/create-reply.blade.php
+++ b/resources/views/livewire/forum/create-reply.blade.php
@@ -1,12 +1,12 @@
 <div x-data="{ open: false }" class="mt-10 flex items-center justify-center lg:mt-16">
     <div class="w-full max-w-3xl mx-auto">
-        <button type="button" class="relative bg-white rounded-xl px-6 py-5 ring-1 ring-gray-200/60 flex items-center w-full gap-5 hover:ring-gray-300 dark:bg-white/20 dark:bg-gray-800 dark:hover:bg-white/10 focus:outline transition duration-200 ease-in-out">
+        <button type="button" class="relative bg-white rounded-xl px-6 py-5 ring-1 ring-gray-200/60 flex items-center w-full gap-5 hover:ring-gray-300 dark:ring-white/20 dark:hover:ring-white/10 dark:bg-gray-800 dark:hover:bg-white/10 focus:outline transition duration-200 ease-in-out">
             <x-user.avatar
                 :user="\Illuminate\Support\Facades\Auth::user()"
                 class="size-10 ring-4 ring-white dark:ring-white/20"
                 span="-right-1 size-3.5 -top-1"
             />
-            <span class="text-sm leading-6 text-gray-500 dark:text-gray-400">
+            <span class="text-sm leading-6 text-gray-500 dark:text-gray-300">
                 {{ __('Laissez votre réponse') }}
             </span>
         </button>
diff --git a/resources/views/livewire/forum/reply.blade.php b/resources/views/livewire/forum/reply.blade.php
index 892ccbf2..f147a129 100644
--- a/resources/views/livewire/forum/reply.blade.php
+++ b/resources/views/livewire/forum/reply.blade.php
@@ -47,124 +47,48 @@ class="size-8 lg:hidden"
                     </div>
                 @endif
             </div>
-            <div class="mt-5 prose prose-green max-w-none text-gray-500 dark:text-gray-400 dark:prose-invert">
-                <x-markdown-content :content="$reply->body" />
-            </div>
-            <div class="mt-10">
-                @can('manage', $reply)
-                    <x-filament::dropdown placement="top-start">
-                        <x-slot name="trigger">
-                            <button type="button" class="inline-flex items-center rounded-lg px-2 py-1.5 text-gray-400 dark:text-gray-500 hover:bg-gray-50 dark:hover:bg-gray-900 focus:outline-none">
-                                <x-untitledui-dots-horizontal class="size-5" aria-hidden="true" />
-                            </button>
-                        </x-slot>
+            <x-markdown-content
+                class="mt-5 prose prose-sm prose-green !prose-heading-off max-w-none space-y-3 text-gray-500 dark:text-gray-400"
+                :content="$reply->body"
+            />
+            <div class="mt-4 flex items-center justify-between">
+                @if(! $thread->isSolutionReply($reply))
+                    @can('manage', $reply)
+                        <x-filament::dropdown class="inline-flex" placement="top-start">
+                            <x-slot name="trigger" class="-mx-2">
+                                <button type="button" class="inline-flex items-center rounded-lg px-2 py-1.5 text-gray-400 dark:text-gray-500 hover:bg-gray-50 dark:hover:bg-gray-900 focus:outline-none">
+                                    <x-untitledui-dots-horizontal class="size-5" aria-hidden="true" />
+                                </button>
+                            </x-slot>
 
-                        <x-filament::dropdown.list>
-                            <x-filament::dropdown.list.item wire:click="openEditModal">
-                                {{ __('actions.edit') }}
-                            </x-filament::dropdown.list.item>
+                            <x-filament::dropdown.list>
+                                @can('update', $reply)
+                                    <x-filament::dropdown.list.item wire:click="openEditModal">
+                                        {{ __('actions.edit') }}
+                                    </x-filament::dropdown.list.item>
+                                @endcan
 
-                            <x-filament::dropdown.list.item color="danger" wire:click="openDeleteModal">
-                                {{ __('actions.delete') }}
-                            </x-filament::dropdown.list.item>
-                        </x-filament::dropdown.list>
-                    </x-filament::dropdown>
-                @endcan
-                <div class="hidden group-hover:flex"></div>
-            </div>
-        </div>
-    </div>
-</div>
+                                @can('manage', $thread)
+                                    <x-filament::dropdown.list.item color="success" wire:click="markAsSolution">
+                                        {{ __('pages/forum.mark_answer') }}
+                                    </x-filament::dropdown.list.item>
+                                @endcan
 
-{{--<li
-    x-data="{ open: @entangle('isUpdating') }"
-    @class(['relative z-10 rounded-md border border-green-500 p-4 sm:-mx-4' => $isSolution])
->
-    <div class="sm:flex sm:space-x-3">
-        <div x-show="!open" class="flex-1 overflow-hidden">
-            <div class="flex items-start">
-                <div class="hidden flex-1 space-x-2 font-sans text-sm sm:flex sm:items-center">
-                    @can('update', $reply)
-                        <span class="font-medium text-gray-500 dark:text-gray-400">·</span>
-                        <div class="flex items-center divide-x divide-skin-base">
-                            <button
-                                @click="open = true"
-                                type="button"
-                                class="pr-2 font-sans text-sm leading-5 text-gray-500 dark:text-gray-400 hover:underline focus:outline-none"
-                            >
-                                Éditer
-                            </button>
-                            @if (! $isSolution)
-                                <button
-                                    wire:click="$dispatch('openModal', { component: 'modals.delete-reply', arguments: {{ json_encode(['id' => $reply->id, 'slug' => $thread->slug()]) }} })"
-                                    type="button"
-                                    class="pl-2 font-sans text-sm leading-5 text-red-500 hover:underline focus:outline-none"
-                                >
-                                    Supprimer
-                                </button>
-                            @endif
-                        </div>
+                                @can('delete', $reply)
+                                    <x-filament::dropdown.list.item color="danger" wire:click="openDeleteModal">
+                                        {{ __('actions.delete') }}
+                                    </x-filament::dropdown.list.item>
+                                @endcan
+                            </x-filament::dropdown.list>
+                        </x-filament::dropdown>
                     @endcan
-                </div>
-                @can('update', $thread)
-                    @if ($isSolution)
-                        <div class="mt-2 flex items-center sm:ml-4 sm:mt-0">
-                            <button
-                                wire:click="UnMarkAsSolution"
-                                type="button"
-                                class="inline-flex transform items-center justify-center rounded-full bg-red-500 bg-opacity-10 p-2.5 text-sm leading-5 text-red-600 transition-all hover:scale-125 focus:outline-none"
-                            >
-                                <x-untitledui-x class="size-6" />
-                            </button>
-                            <span class="ml-2 font-sans text-sm text-red-500 sm:hidden">Retirer comme solution</span>
-                        </div>
-                    @else
-                        <div class="mt-2 flex items-center sm:ml-4 sm:mt-0">
-                            <button
-                                wire:click="markAsSolution"
-                                type="button"
-                                class="inline-flex transform items-center justify-center rounded-full bg-green-500 bg-opacity-10 p-2.5 text-sm leading-5 text-green-600 transition-all hover:scale-125 focus:outline-none"
-                            >
-                                <x-heroicon-s-check-circle class="size-6" />
-                            </button>
-                            <span class="ml-2 font-sans text-sm text-green-500 sm:hidden">Marquer comme solution</span>
-                        </div>
-                    @endif
-                @else
-                    @if ($isSolution)
-                        <span
-                            class="absolute -top-3 right-3 z-20 ml-4 inline-flex items-center rounded-full bg-green-500 px-3 py-0.5 text-sm font-medium text-green-900"
-                        >
-                            <x-heroicon-o-check-circle class="mr-1.5 size-4" />
-                            Réponse acceptée
-                        </span>
-                    @endif
-                @endcan
-            </div>
-            <div class="prose prose-green mt-1 overflow-x-auto font-normal text-gray-500 dark:text-gray-400 sm:prose-base sm:max-w-none">
-                <x-markdown-content :content="$reply->body" />
-            </div>
-        </div>
-        <div x-show="open" class="flex-1" style="display: none">
-            <livewire:editor :body="$body" />
-
-            @error('body')
-                <p class="mt-2 text-sm leading-5 text-red-500">
-                    {{ $message }}
-                </p>
-            @enderror
-
-            <div class="mt-5">
-                <div class="flex justify-end space-x-3">
-                    <x-buttons.default type="button" class="inline-flex" x-on:click="open = false">
-                        Annuler
-                    </x-buttons.default>
-                    <x-buttons.primary type="button" class="inline-flex" wire:click="edit">
-                        <x-loader class="text-white" wire:loading wire:target="edit" />
-                        Enregistrer
-                    </x-buttons.primary>
+                @endif
+                <div class="opacity-0 group-hover:opacity-100">
+                    <button type="button" class="inline-flex items-center rounded-lg text-xs px-2 py-1.5 text-gray-500 dark:text-gray-400 hover:bg-gray-50 hover:text-gray-700 dark:hover:bg-gray-900 dark:hover:text-white focus:outline-none">
+                        {{ __('pages/forum.report_spam') }}
+                    </button>
                 </div>
             </div>
         </div>
     </div>
-</li>--}}
+</div>
diff --git a/resources/views/livewire/pages/forum/detail-thread.blade.php b/resources/views/livewire/pages/forum/detail-thread.blade.php
index 5d4f7c29..e229522f 100644
--- a/resources/views/livewire/pages/forum/detail-thread.blade.php
+++ b/resources/views/livewire/pages/forum/detail-thread.blade.php
@@ -1,4 +1,4 @@
-<div class="relative">
+<div x-data class="relative">
     <x-slot:buttons>
         <div class="space-y-3">
             <x-buttons.primary type="button" class="gap-2 w-full justify-center py-2.5">
@@ -17,52 +17,69 @@
                 <div class="relative pb-8">
                     <span class="hidden absolute left-5 top-5 -ml-px h-full w-0.5 bg-gray-100 dark:bg-white/20 lg:block" aria-hidden="true"></span>
                     <div class="relative flex items-start gap-6">
-                        <div class="hidden sticky top-10 lg:block">
+                        <div class="hidden sticky top-10 flex-col justify-center items-center gap-y-5 lg:flex">
                             <x-user.avatar
                                 :user="$thread->user"
                                 class="size-10 ring-4 ring-white dark:ring-white/20"
                                 span="-right-1 size-3.5 -top-1"
                             />
+                            <div class="inline-flex flex-col gap-y-3 ring-1 ring-gray-200 bg-white py-3 px-1.5 rounded-full dark:bg-gray-800 dark:ring-white/20">
+                                <livewire:reactions
+                                    wire:key="$thread->id"
+                                    :model="$thread"
+                                    :with-place-holder="false"
+                                    :with-background="false"
+                                    direction="vertical"
+                                />
+                                <x-forum.thread-metadata :thread="$thread" class="gap-3 text-xs" vertical />
+                            </div>
                         </div>
                         <div class="min-w-0 flex-1 rounded-xl bg-white p-5 ring-1 ring-inset ring-gray-200/60 dark:bg-gray-800 dark:ring-white/10 lg:py-6 lg:px-8">
-                            <div class="flex items-center gap-2">
-                                <x-user.avatar
-                                    :user="$thread->user"
-                                    class="size-8 lg:hidden"
-                                    span="-right-1 size-3.5 -top-1"
-                                />
-                                <div>
-                                    <div class="text-sm flex items-center gap-2">
-                                        <x-link :href="route('profile', $thread->user->username)" class="font-medium text-gray-900 dark:text-white">
-                                            {{ $thread->user->username }}
-                                        </x-link>
-                                        <x-user.points class="ring-1 ring-inset ring-gray-200 dark:ring-white/10" :author="$thread->user" />
-                                    </div>
-                                    <div class="flex items-center text-xs text-gray-500 flex-wrap gap-x-1 dark:text-gray-400 lg:mt-1">
-                                        <span>{{ __('global.ask') }}</span>
-                                        <time datetime="{{ $thread->created_at }}">
-                                            {{ $thread->created_at->diffForHumans() }}
-                                        </time>
+                            <div class="flex items-center justify-between gap-4">
+                                <div class="flex items-center gap-2">
+                                    <x-user.avatar
+                                        :user="$thread->user"
+                                        class="size-8 lg:hidden"
+                                        span="-right-1 size-3.5 -top-1"
+                                    />
+                                    <div>
+                                        <div class="text-sm flex items-center gap-2">
+                                            <x-link :href="route('profile', $thread->user->username)" class="font-medium text-gray-900 dark:text-white">
+                                                {{ $thread->user->username }}
+                                            </x-link>
+                                            <x-user.points class="ring-1 ring-inset ring-gray-200 dark:ring-white/10" :author="$thread->user" />
+                                        </div>
+                                        <div class="flex items-center text-xs text-gray-500 flex-wrap gap-x-1 dark:text-gray-400 lg:mt-1">
+                                            <span>{{ __('global.ask') }}</span>
+                                            <time datetime="{{ $thread->created_at }}">
+                                                {{ $thread->created_at->diffForHumans() }}
+                                            </time>
+                                        </div>
                                     </div>
                                 </div>
+                                <x-forum.thread-channels :thread="$thread" class="hidden lg:flex" />
                             </div>
                             <div class="mt-4 rounded-lg bg-gray-50 dark:bg-gray-900 py-2 px-4">
                                 <h1 class="text-xl font-heading font-bold text-gray-900 dark:text-white leading-7">
                                     {{ $thread->title }}
                                 </h1>
                             </div>
-                            <div class="mt-5 prose prose-primary max-w-none text-gray-500 dark:text-gray-400 dark:prose-invert">
-                                <x-markdown-content :content="$thread->body" />
-                            </div>
-                            <div class="flex items-center gap-3">
-                                <livewire:reactions
-                                    wire:key="$thread->id"
-                                    :model="$thread"
-                                    :with-place-holder="false"
-                                    :with-background="false"
-                                />
-                                <x-forum.thread-metadata :thread="$thread" class="gap-3" />
-                            </div>
+                            <x-markdown-content
+                                :content="$thread->body"
+                                class="mt-5 prose prose-primary !prose-heading-off max-w-none text-gray-500 dark:text-gray-400 dark:prose-invert"
+                            />
+                            @can('manage', $thread)
+                                <div class="mt-5">
+                                    <x-filament-actions::group
+                                        icon="untitledui-dots-horizontal"
+                                        color="gray"
+                                        :actions="[
+                                            $this->editAction,
+                                            $this->deleteAction,
+                                        ]"
+                                    />
+                                </div>
+                            @endcan
                         </div>
                     </div>
                 </div>
@@ -77,14 +94,15 @@ class="size-8 lg:hidden"
 
         @can('create', App\Models\Reply::class)
             @if ($thread->isConversationOld())
-                <x-info-panel>
-                    <p class="text-sm text-blue-700">
+                <x-info-panel class="mt-14 text-sm">
+                    <p>
                         {{ __('pages/forum.old_thread') }}
                     </p>
-                    <p class="mt-4 text-sm">
+                    <p class="mt-4">
                         <x-buttons.default
                             type="button"
                             onclick="Livewire.dispatch('openPanel', { component: 'components.slideovers.thread-form' })"
+                            class="gap-2"
                         >
                             {{ __('pages/forum.new_thread') }}
                             <span aria-hidden="true">&rarr;</span>
@@ -117,11 +135,13 @@ class="size-8 lg:hidden"
                         @csrf
                         <x-buttons.primary type="submit" class="px-3 py-2 gap-2">
                             {{ __('pages/forum.received_link') }}
-                            <x-heroicon-o-arrow-long-right class="size-5" aria-hidden="true" />
+                            <x-heroicon-o-arrow-long-right class="size-5 text-gray-400 dar:text-gray-500" aria-hidden="true" />
                         </x-buttons.primary>
                     </form>
                 </div>
             @endguest
         @endcan
     </div>
+
+    <x-filament-actions::modals />
 </div>
diff --git a/resources/views/livewire/pages/forum/index.blade.php b/resources/views/livewire/pages/forum/index.blade.php
index ed227f5e..5d6d4806 100644
--- a/resources/views/livewire/pages/forum/index.blade.php
+++ b/resources/views/livewire/pages/forum/index.blade.php
@@ -14,6 +14,7 @@ class="gap-2 w-full justify-center py-2.5"
 
     <div class="flex items-center justify-between gap-6">
         <livewire:components.channels-selector />
+
         <x-filament::input.wrapper class="relative max-w-60 w-full">
             <span class="pointer-events-none absolute top-2.5 left-0 pl-2.5">
                 <x-untitledui-search-md class="size-4 text-gray-400 dark:text-gray-500" aria-hidden="true" />
@@ -33,7 +34,7 @@ class="!pl-8"
     <div class="mt-6 lg:mb-12">
         <div class="space-y-6">
             @foreach ($threads as $thread)
-                <x-forum.thread-overview :thread="$thread" />
+                <x-forum.thread :thread="$thread" />
             @endforeach
         </div>
 
diff --git a/resources/views/livewire/reactions.blade.php b/resources/views/livewire/reactions.blade.php
index b3a242fa..64f059e2 100644
--- a/resources/views/livewire/reactions.blade.php
+++ b/resources/views/livewire/reactions.blade.php
@@ -1,40 +1,60 @@
-<div class="relative inline-flex items-center" x-data="{ showReactions: false }">
+<div @class([
+    'relative inline-flex items-center',
+    'justify-center' => $direction === 'vertical',
+]) x-data="{ showReactions: false }">
     @php
-        $buttonClasses = 'inline-flex items-center justify-center size-6 rounded-full bg-white hover:bg-gray-100 dark:bg-gray-900 dark:hover:bg-white/10 focus:outline-none';
+        $buttonClasses = 'inline-flex items-center justify-center size-6 rounded-full focus:outline-none';
     @endphp
 
     @if ($model->getReactionsSummary()->isEmpty())
         <button
             @click="showReactions = ! showReactions"
-            class="inline-flex items-center gap-2 text-sm leading-5 text-gray-500 dark:text-gray-400 hover:underline focus:outline-none"
+            class="group inline-flex items-center gap-2 text-sm leading-5 text-gray-500 dark:text-gray-400 hover:underline focus:outline-none"
         >
             @if ($withPlaceHolder)
                 {{ __('global.first_to_react') }}
             @endif
 
-            <x-untitledui-face-smile class="size-4" stroke-width="1.5" aria-hidden="true" />
+            <x-untitledui-heart
+                class="size-5 text-gray-400 dark:text-gray-500 group-hover:text-gray-600 dark:group-hover:text-gray-300"
+                stroke-width="1.5"
+                aria-hidden="true"
+            />
         </button>
     @else
         <button
             @click="showReactions = ! showReactions"
             @class([
-                'relative flex items-center h-8 cursor-pointer items-center justify-between',
+                'group relative flex items-center h-8 cursor-pointer items-center justify-between',
                 'rounded-lg bg-white px-3 py-2 shadow hover:bg-gray-50' => $withBackground,
             ])
         >
-            <div class="flex items-center justify-center space-x-2">
-                @foreach ($model->getReactionsSummary() as $reaction)
-                    <img
-                        class="size-4"
-                        src="{{ asset("/images/reactions/{$reaction->name}.svg") }}"
-                        alt="{{ $reaction->name }} emoji"
+            @if($direction === 'vertical')
+                <div class="flex flex-col items-center justify-center gap-y-1">
+                    <x-untitledui-heart
+                        class="size-5 text-gray-400 dark:text-gray-500 group-hover:text-gray-600 dark:group-hover:text-gray-300"
+                        stroke-width="1.5"
+                        aria-hidden="true"
                     />
-                @endforeach
+                    <span class="text-xs text-gray-500 dark:text-gray-400">
+                        {{ $model->getReactionsSummary()->sum('count') }}
+                    </span>
+                </div>
+            @else
+                <div class="flex items-center justify-center space-x-2">
+                    @foreach ($model->getReactionsSummary() as $reaction)
+                        <img
+                            class="size-4"
+                            src="{{ asset("/images/reactions/{$reaction->name}.svg") }}"
+                            alt="{{ $reaction->name }} emoji"
+                        />
+                    @endforeach
 
-                <span class="ml-3 text-sm font-medium text-green-500">
-                    {{ $model->getReactionsSummary()->sum('count') }}
-                </span>
-            </div>
+                    <span class="ml-3 text-sm font-medium text-green-500">
+                        {{ $model->getReactionsSummary()->sum('count') }}
+                    </span>
+                </div>
+            @endif
         </button>
     @endif
 
diff --git a/tailwind.config.js b/tailwind.config.js
index 50ad53a1..6d5e4bf2 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -111,6 +111,14 @@ export default {
             },
           },
         },
+        'heading-off': {
+          css: {
+            'h1, h2, h3, h4, h5': {
+              margin: '10px 0',
+              fontSize: theme('fontSize.base')
+            },
+          },
+        },
       })
     },
   },
diff --git a/tests/Feature/Livewire/Pages/Forum/DetailThreadTest.php b/tests/Feature/Livewire/Pages/Forum/DetailThreadTest.php
index 031880aa..b50ec120 100644
--- a/tests/Feature/Livewire/Pages/Forum/DetailThreadTest.php
+++ b/tests/Feature/Livewire/Pages/Forum/DetailThreadTest.php
@@ -3,9 +3,34 @@
 declare(strict_types=1);
 
 use App\Livewire\Pages\Forum\DetailThread;
+use App\Models\Thread;
 use Livewire\Livewire;
 
-it('renders successfully', function () {
-    Livewire::test(DetailThread::class)
+it('renders thread successfully', function (): void {
+    $thread = Thread::factory()->create();
+
+    Livewire::test(DetailThread::class, ['thread' => $thread])
         ->assertStatus(200);
 });
+
+it('user can delete his own thread', function (): void {
+    $user = $this->login();
+    $thread = Thread::factory(['user_id' => $user->id])->create();
+
+    Livewire::test(DetailThread::class, ['thread' => $thread])
+        ->callAction('delete')
+        ->assertStatus(200)
+        ->assertRedirect(route('forum.index'));
+
+    $this->assertModelMissing($thread);
+});
+
+it('user cannot delete a thread of another user', function (): void {
+    $user = $this->createUser(['email' => 'john@doe.cm']);
+    $thread = Thread::factory()->create(['user_id' => $user->id]);
+
+    $this->login();
+
+    Livewire::test(DetailThread::class, ['thread' => $thread])
+        ->assertActionHidden('delete');
+});
diff --git a/tests/Feature/Livewire/Pages/Forum/IndexTest.php b/tests/Feature/Livewire/Pages/Forum/IndexTest.php
index 3ade6d17..ed055a40 100644
--- a/tests/Feature/Livewire/Pages/Forum/IndexTest.php
+++ b/tests/Feature/Livewire/Pages/Forum/IndexTest.php
@@ -2,28 +2,27 @@
 
 declare(strict_types=1);
 
+use App\Livewire\Components\Slideovers\ThreadForm;
 use App\Livewire\Pages\Forum\Index;
 use App\Models\Thread;
 use Livewire\Livewire;
 
 use function Pest\Laravel\get;
 
-describe(Index::class, function (): void {
-    it('forum page renders successfully', function (): void {
-        get(route('forum.index'))->assertOk();
+it('forum page renders successfully', function (): void {
+    get(route('forum.index'))->assertOk();
 
-        Livewire::test(Index::class)
-            ->assertStatus(200);
-    })->group('forum');
+    Livewire::test(Index::class)
+        ->assertStatus(200);
+})->group('forum');
 
-    it('forum page renders views with threads', function (): void {
-        get(route('forum.index'))->assertOk();
+it('forum page renders views with threads', function (): void {
+    get(route('forum.index'))->assertOk();
 
-        Thread::factory()->count(50)->create();
+    Thread::factory()->count(50)->create();
 
-        Livewire::test(Index::class)
-            ->assertViewHas('threads', fn ($threads) => count($threads) === 10)
-            ->assertSee(__('pagination.next'))
-            ->assertStatus(200);
-    });
+    Livewire::test(Index::class)
+        ->assertViewHas('threads', fn ($threads) => count($threads) === 30)
+        ->assertSee(__('pagination.next'))
+        ->assertStatus(200);
 });

From dfd59e0b3b32f86eefd7a6b46106387959bbf541 Mon Sep 17 00:00:00 2001
From: Arthur Monney <monneylobe@gmail.com>
Date: Mon, 4 Nov 2024 02:51:21 +0100
Subject: [PATCH 7/8] feat: [LAR-28] add reply form to create and update reply
 to thread

---
 app/Actions/Forum/CreateReplyAction.php       |  29 ++
 app/Gamify/Points/ArticleCreated.php          |   9 +-
 app/Gamify/Points/BestReply.php               |   5 +-
 app/Gamify/Points/DiscussionCreated.php       |   9 +-
 app/Gamify/Points/PostCreated.php             |  11 +-
 app/Gamify/Points/ThreadCreated.php           |  11 +-
 app/Livewire/Forum/CreateReply.php            |  66 ---
 app/Livewire/Forum/Reply.php                  |  94 ++--
 app/Livewire/Forum/ReplyForm.php              | 121 +++++
 app/Livewire/Pages/Forum/DetailThread.php     |   3 +-
 app/Models/Reply.php                          |   4 +-
 app/Models/Thread.php                         |   1 +
 app/helpers.php                               |   6 +-
 composer.json                                 |   7 +-
 composer.lock                                 | 449 ++++++++----------
 config/markdown.php                           |   4 +-
 lang/en/notifications.php                     |   5 +
 lang/en/pages/forum.php                       |   1 +
 lang/fr/notifications.php                     |   5 +
 lang/fr/pages/forum.php                       |   1 +
 resources/views/forum/_channels.blade.php     |  78 ---
 resources/views/forum/edit.blade.php          |  18 -
 .../views/livewire/articles/_form.blade.php   |  16 +-
 .../livewire/discussions/_form.blade.php      |  14 +-
 .../livewire/forum/create-reply.blade.php     |  25 -
 .../views/livewire/forum/reply-form.blade.php |  78 +++
 .../views/livewire/forum/reply.blade.php      |  44 +-
 .../pages/forum/detail-thread.blade.php       |  24 +-
 .../most_active_users_per_week.blade.php      |   2 +-
 routes/forum.php                              |   2 -
 routes/web.php                                |   1 -
 .../Article/SendTelegramNotificationTest.php  |   2 +-
 tests/Feature/Forum/ChannelTest.php           |   1 -
 tests/Feature/Forum/DiscussionTest.php        |  11 +-
 tests/Feature/Forum/ReplyTest.php             |  15 +-
 tests/Feature/Forum/ThreadTest.php            |   5 +-
 .../Livewire/Pages/Forum/DetailThreadTest.php |  27 ++
 .../Livewire/Pages/Forum/IndexTest.php        |   1 -
 tests/Feature/UserActivitiesTest.php          |  34 +-
 tests/Pest.php                                |   2 +-
 40 files changed, 603 insertions(+), 638 deletions(-)
 create mode 100644 app/Actions/Forum/CreateReplyAction.php
 delete mode 100644 app/Livewire/Forum/CreateReply.php
 create mode 100644 app/Livewire/Forum/ReplyForm.php
 delete mode 100644 resources/views/forum/_channels.blade.php
 delete mode 100644 resources/views/forum/edit.blade.php
 delete mode 100644 resources/views/livewire/forum/create-reply.blade.php
 create mode 100644 resources/views/livewire/forum/reply-form.blade.php

diff --git a/app/Actions/Forum/CreateReplyAction.php b/app/Actions/Forum/CreateReplyAction.php
new file mode 100644
index 00000000..ee55249a
--- /dev/null
+++ b/app/Actions/Forum/CreateReplyAction.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Forum;
+
+use App\Contracts\ReplyInterface;
+use App\Events\ReplyWasCreated;
+use App\Gamify\Points\ReplyCreated;
+use App\Models\Reply;
+use App\Models\User;
+use Illuminate\Support\Facades\Auth;
+
+final class CreateReplyAction
+{
+    public function execute(string $body, ReplyInterface $model): void
+    {
+        /** @var User $user */
+        $user = Auth::user();
+
+        $reply = new Reply(['body' => $body]);
+        $reply->authoredBy($user);
+        $reply->to($model);
+        $reply->save();
+
+        givePoint(new ReplyCreated($model, $user));
+        event(new ReplyWasCreated($reply));
+    }
+}
diff --git a/app/Gamify/Points/ArticleCreated.php b/app/Gamify/Points/ArticleCreated.php
index 8e455ed5..b37c5777 100644
--- a/app/Gamify/Points/ArticleCreated.php
+++ b/app/Gamify/Points/ArticleCreated.php
@@ -5,21 +5,16 @@
 namespace App\Gamify\Points;
 
 use App\Models\Article;
-use App\Models\User;
 use QCod\Gamify\PointType;
 
 final class ArticleCreated extends PointType
 {
     public int $points = 50;
 
+    protected string $payee = 'user';
+
     public function __construct(Article $subject)
     {
         $this->subject = $subject;
     }
-
-    public function payee(): User
-    {
-        // @phpstan-ignore-next-line
-        return $this->getSubject()->user;
-    }
 }
diff --git a/app/Gamify/Points/BestReply.php b/app/Gamify/Points/BestReply.php
index e7b41703..cd643c43 100644
--- a/app/Gamify/Points/BestReply.php
+++ b/app/Gamify/Points/BestReply.php
@@ -4,15 +4,16 @@
 
 namespace App\Gamify\Points;
 
+use App\Models\Reply;
 use QCod\Gamify\PointType;
 
 final class BestReply extends PointType
 {
     public int $points = 20;
 
-    protected string $payee = 'author';
+    protected string $payee = 'user';
 
-    public function __construct(mixed $subject)
+    public function __construct(Reply $subject)
     {
         $this->subject = $subject;
     }
diff --git a/app/Gamify/Points/DiscussionCreated.php b/app/Gamify/Points/DiscussionCreated.php
index 04083e9c..66e94afc 100644
--- a/app/Gamify/Points/DiscussionCreated.php
+++ b/app/Gamify/Points/DiscussionCreated.php
@@ -5,21 +5,16 @@
 namespace App\Gamify\Points;
 
 use App\Models\Discussion;
-use App\Models\User;
 use QCod\Gamify\PointType;
 
 final class DiscussionCreated extends PointType
 {
     public int $points = 20;
 
+    protected string $payee = 'user';
+
     public function __construct(Discussion $subject)
     {
         $this->subject = $subject;
     }
-
-    public function payee(): User
-    {
-        // @phpstan-ignore-next-line
-        return $this->getSubject()->user;
-    }
 }
diff --git a/app/Gamify/Points/PostCreated.php b/app/Gamify/Points/PostCreated.php
index f28c5975..5ec37b35 100644
--- a/app/Gamify/Points/PostCreated.php
+++ b/app/Gamify/Points/PostCreated.php
@@ -5,23 +5,16 @@
 namespace App\Gamify\Points;
 
 use App\Models\Article;
-use App\Models\User;
 use QCod\Gamify\PointType;
 
-/**
- * @method Article getSubject()
- */
 final class PostCreated extends PointType
 {
     public int $points = 50;
 
+    protected string $payee = 'user';
+
     public function __construct(Article $subject)
     {
         $this->subject = $subject;
     }
-
-    public function payee(): User
-    {
-        return $this->getSubject()->user;
-    }
 }
diff --git a/app/Gamify/Points/ThreadCreated.php b/app/Gamify/Points/ThreadCreated.php
index 70cf2809..d84f0204 100644
--- a/app/Gamify/Points/ThreadCreated.php
+++ b/app/Gamify/Points/ThreadCreated.php
@@ -5,23 +5,16 @@
 namespace App\Gamify\Points;
 
 use App\Models\Thread;
-use App\Models\User;
 use QCod\Gamify\PointType;
 
-/**
- * @method Thread getSubject()
- */
 final class ThreadCreated extends PointType
 {
     public int $points = 55;
 
+    protected string $payee = 'user';
+
     public function __construct(Thread $subject)
     {
         $this->subject = $subject;
     }
-
-    public function payee(): User
-    {
-        return $this->getSubject()->user;
-    }
 }
diff --git a/app/Livewire/Forum/CreateReply.php b/app/Livewire/Forum/CreateReply.php
deleted file mode 100644
index fa5db7a0..00000000
--- a/app/Livewire/Forum/CreateReply.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Livewire\Forum;
-
-use App\Events\ReplyWasCreated;
-use App\Gamify\Points\ReplyCreated;
-use App\Models\Reply;
-use App\Models\Thread;
-use App\Policies\ReplyPolicy;
-use Illuminate\Contracts\View\View;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Support\Facades\Auth;
-use Livewire\Component;
-
-final class CreateReply extends Component
-{
-    use AuthorizesRequests;
-
-    public Thread $thread;
-
-    public string $body = '';
-
-    /**
-     * @var string[]
-     */
-    protected $listeners = ['markdown-x:update' => 'onMarkdownUpdate'];
-
-    /**
-     * @var string[]
-     */
-    protected $rules = [
-        'body' => 'required',
-    ];
-
-    public function onMarkdownUpdate(string $content): void
-    {
-        $this->body = $content;
-    }
-
-    public function save(): void
-    {
-        $this->authorize('create', Reply::class);
-
-        $this->validate();
-
-        $reply = new Reply(['body' => $this->body]);
-        $reply->authoredBy(Auth::user()); // @phpstan-ignore-line
-        $reply->to($this->thread);
-        $reply->save();
-
-        givePoint(new ReplyCreated($this->thread, Auth::user()));
-
-        event(new ReplyWasCreated($reply));
-
-        session()->flash('status', 'Réponse ajoutée avec succès!');
-
-        $this->redirectRoute('forum.show', $this->thread);
-    }
-
-    public function render(): View
-    {
-        return view('livewire.forum.create-reply');
-    }
-}
diff --git a/app/Livewire/Forum/Reply.php b/app/Livewire/Forum/Reply.php
index 3420bdbb..33c1f8c2 100644
--- a/app/Livewire/Forum/Reply.php
+++ b/app/Livewire/Forum/Reply.php
@@ -4,65 +4,83 @@
 
 namespace App\Livewire\Forum;
 
-use App\Exceptions\CouldNotMarkReplyAsSolution;
 use App\Gamify\Points\BestReply;
 use App\Models\Reply as ReplyModel;
 use App\Models\Thread;
+use Filament\Actions\Action;
+use Filament\Actions\Concerns\InteractsWithActions;
+use Filament\Actions\Contracts\HasActions;
+use Filament\Forms\Concerns\InteractsWithForms;
+use Filament\Forms\Contracts\HasForms;
 use Filament\Notifications\Notification;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Auth;
 use Livewire\Attributes\On;
 use Livewire\Component;
 
-final class Reply extends Component
+final class Reply extends Component implements HasActions, HasForms
 {
+    use InteractsWithActions;
+    use InteractsWithForms;
+
     public ReplyModel $reply;
 
     public Thread $thread;
 
-    public function edit(): void
+    public function editAction(): Action
     {
-        $this->authorize('update', $this->reply);
-
-        $this->validate();
-
-        // $this->reply->update(['body' => $this->body]);
-
-        Notification::make()
-            ->title(__('Réponse modifiée'))
-            ->body(__('Vous avez modifié cette solution avec succès.'))
-            ->success()
-            ->duration(5000)
-            ->send();
-
-        $this->dispatch('reply.updated');
+        return Action::make('edit')
+            ->label(__('actions.edit'))
+            ->color('gray')
+            ->authorize('update', $this->reply)
+            ->action(
+                fn () => $this->dispatch(
+                    'replyForm',
+                    replyId: $this->reply->id
+                )->to(ReplyForm::class)
+            );
     }
 
-    /**
-     * @throws CouldNotMarkReplyAsSolution
-     */
-    public function markAsSolution(): void
+    public function deleteAction(): Action
     {
-        $this->authorize('manage', $this->thread);
-
-        if ($this->thread->isSolved()) {
-            undoPoint(new BestReply($this->thread->solutionReply));
-        }
-
-        $this->thread->markSolution($this->reply, Auth::user()); // @phpstan-ignore-line
-
-        givePoint(new BestReply($this->reply));
-
-        Notification::make()
-            ->title(__('notifications.thread.best_reply'))
-            ->success()
-            ->duration(5000)
-            ->send();
+        return Action::make('delete')
+            ->label(__('actions.delete'))
+            ->color('danger')
+            ->authorize('delete', $this->reply)
+            ->requiresConfirmation()
+            ->action(function (): void {
+                $this->reply->delete();
+
+                $this->redirectRoute('forum.show', $this->thread, navigate: true);
+            });
+    }
 
-        $this->dispatch('thread.save.{$thread->id}');
+    public function solutionAction(): Action
+    {
+        return Action::make('solution')
+            ->label(__('pages/forum.mark_answer'))
+            ->color('success')
+            ->authorize('manage', $this->thread)
+            ->action(function (): void {
+                if ($this->thread->isSolved()) {
+                    undoPoint(new BestReply($this->thread->solutionReply));
+                }
+
+                $this->thread->markSolution($this->reply, Auth::user()); // @phpstan-ignore-line
+
+                givePoint(new BestReply($this->reply));
+
+                Notification::make()
+                    ->title(__('notifications.thread.best_reply'))
+                    ->success()
+                    ->duration(5000)
+                    ->send();
+
+                $this->redirect(route('forum.show', $this->thread).$this->reply->getPathUrl(), navigate: true);
+            });
     }
 
-    #[On('reply.updated')]
+    #[On('reply.save.{reply.id}')]
     public function render(): View
     {
         return view('livewire.forum.reply');
diff --git a/app/Livewire/Forum/ReplyForm.php b/app/Livewire/Forum/ReplyForm.php
new file mode 100644
index 00000000..943d5a58
--- /dev/null
+++ b/app/Livewire/Forum/ReplyForm.php
@@ -0,0 +1,121 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Livewire\Forum;
+
+use App\Actions\Forum\CreateReplyAction;
+use App\Models\Reply;
+use App\Models\Thread;
+use Filament\Forms;
+use Filament\Forms\Concerns\InteractsWithForms;
+use Filament\Forms\Contracts\HasForms;
+use Filament\Forms\Form;
+use Filament\Notifications\Notification;
+use Illuminate\Contracts\View\View;
+use Livewire\Attributes\On;
+use Livewire\Component;
+
+/**
+ * @property Form $form
+ */
+final class ReplyForm extends Component implements HasForms
+{
+    use InteractsWithForms;
+
+    public Thread $thread;
+
+    public ?Reply $reply = null;
+
+    public bool $show = false;
+
+    public ?string $body = null;
+
+    public function mount(): void
+    {
+        $this->form->fill();
+    }
+
+    #[On('replyForm')]
+    public function open(?int $replyId = null): void
+    {
+        $this->reply = Reply::query()->find($replyId);
+
+        $this->form->fill(['body' => $this->reply?->body ?? '']);
+
+        $this->show = true;
+    }
+
+    public function close(): void
+    {
+        $this->show = false;
+        $this->body = null;
+        $this->reply = null;
+    }
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\MarkdownEditor::make('body')
+                    ->hiddenLabel()
+                    ->fileAttachmentsDisk('public')
+                    ->autofocus()
+                    ->toolbarButtons([
+                        'attachFiles',
+                        'blockquote',
+                        'bold',
+                        'bulletList',
+                        'codeBlock',
+                        'link',
+                    ]),
+            ]);
+    }
+
+    public function save(): void
+    {
+        $this->validate();
+
+        if ($this->reply) {
+            $this->updateReply();
+        } else {
+            $this->createReply();
+        }
+
+        $this->redirectRoute('forum.show', $this->thread, navigate: true);
+    }
+
+    public function createReply(): void
+    {
+        $this->authorize('create', Reply::class);
+
+        app(CreateReplyAction::class)->execute(
+            body: (string) $this->body,
+            model: $this->thread,
+        );
+
+        Notification::make()
+            ->title(__('notifications.reply.created'))
+            ->success()
+            ->duration(5000)
+            ->send();
+    }
+
+    public function updateReply(): void
+    {
+        $this->authorize('update', $this->reply);
+
+        $this->reply?->update(['body' => $this->body]);
+
+        Notification::make()
+            ->title(__('notifications.reply.updated'))
+            ->success()
+            ->duration(5000)
+            ->send();
+    }
+
+    public function render(): View
+    {
+        return view('livewire.forum.reply-form');
+    }
+}
diff --git a/app/Livewire/Pages/Forum/DetailThread.php b/app/Livewire/Pages/Forum/DetailThread.php
index d91bb2ed..cd0b2df5 100644
--- a/app/Livewire/Pages/Forum/DetailThread.php
+++ b/app/Livewire/Pages/Forum/DetailThread.php
@@ -11,7 +11,6 @@
 use Filament\Forms\Concerns\InteractsWithForms;
 use Filament\Forms\Contracts\HasForms;
 use Illuminate\Contracts\View\View;
-use Illuminate\Support\Facades\Auth;
 use Livewire\Attributes\Layout;
 use Livewire\Attributes\On;
 use Livewire\Component;
@@ -51,8 +50,8 @@ public function deleteAction(): Action
         return Action::make('delete')
             ->label(__('actions.delete'))
             ->color('danger')
-            ->requiresConfirmation()
             ->authorize('delete', $this->thread)
+            ->requiresConfirmation()
             ->action(function (): void {
                 $this->thread->delete();
 
diff --git a/app/Models/Reply.php b/app/Models/Reply.php
index b219bff0..2048b7f9 100644
--- a/app/Models/Reply.php
+++ b/app/Models/Reply.php
@@ -85,7 +85,9 @@ public function to(ReplyInterface $replyable): void
 
     public function allChildReplies(): MorphMany
     {
-        return $this->replies()->with('allChildReplies')->where('replyable_type', 'reply');
+        return $this->replies()
+            ->with('allChildReplies')
+            ->where('replyable_type', 'reply');
     }
 
     /**
diff --git a/app/Models/Thread.php b/app/Models/Thread.php
index 6b0e91f2..91617bb1 100644
--- a/app/Models/Thread.php
+++ b/app/Models/Thread.php
@@ -46,6 +46,7 @@
  * @property int | null $resolved_by
  * @property User | null $resolvedBy
  * @property User $user
+ * @property Reply $solutionReply
  * @property \Illuminate\Database\Eloquent\Collection | Channel[] $channels
  */
 final class Thread extends Model implements Feedable, ReactableInterface, ReplyInterface, SubscribeInterface, Viewable
diff --git a/app/helpers.php b/app/helpers.php
index e610f6b2..19f7ec8f 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -86,8 +86,8 @@ function getFilter(string $key, array $filters = [], string $default = 'recent')
      */
     function route_to_reply_able(mixed $replyAble): string
     {
-        return $replyAble instanceof \App\Models\Thread ?
-            route('forum.show', $replyAble->slug()) :
-            route('discussions.show', $replyAble->slug());
+        $routeName = $replyAble instanceof \App\Models\Thread ? 'forum.show' : 'discussions.show';
+
+        return route($routeName, $replyAble->slug());
     }
 }
diff --git a/composer.json b/composer.json
index 6e404597..65066a11 100644
--- a/composer.json
+++ b/composer.json
@@ -11,14 +11,13 @@
     "archtechx/laravel-seo": "^0.9",
     "arrilot/laravel-widgets": "^3.13.2",
     "blade-ui-kit/blade-heroicons": "^2.0",
-    "blade-ui-kit/blade-ui-kit": "^0.4",
     "cyrildewit/eloquent-viewable": "^7.0",
     "doctrine/dbal": "^3.6.4",
     "filament/filament": "^3.0",
     "filament/notifications": "^3.0",
     "francescomalatesta/laravel-feature": "dev-l10-compatibility",
     "gehrisandro/tailwind-merge-laravel": "^1.1",
-    "graham-campbell/markdown": "^15.0",
+    "graham-campbell/markdown": "^15.2",
     "guzzlehttp/guzzle": "^7.7.0",
     "jenssegers/agent": "^2.6.4",
     "laravel-notification-channels/telegram": "^4.0",
@@ -29,11 +28,11 @@
     "laravel/slack-notification-channel": "^2.5",
     "laravel/socialite": "^5.6.3",
     "laravel/tinker": "^2.8.1",
-    "laravelcm/laravel-subscriptions": "^1.0",
+    "laravelcm/laravel-subscriptions": "^1.3",
     "laravelcm/livewire-slide-overs": "^1.0",
     "livewire/livewire": "^3.0",
     "mckenziearts/blade-untitledui-icons": "^1.3",
-    "notchpay/notchpay-php": "^1.3",
+    "notchpay/notchpay-php": "^1.6",
     "qcod/laravel-gamify": "1.0.7",
     "ramsey/uuid": "^4.7.4",
     "sentry/sentry-laravel": "^3.7",
diff --git a/composer.lock b/composer.lock
index c4daf8c5..fda0c1b8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2f61037f9a5ce54e25cb939458b800e0",
+    "content-hash": "0efc9d1d67bfc842186d5b7a908935c4",
     "packages": [
         {
             "name": "abraham/twitteroauth",
@@ -1323,86 +1323,6 @@
             ],
             "time": "2024-10-17T17:38:00+00:00"
         },
-        {
-            "name": "blade-ui-kit/blade-ui-kit",
-            "version": "0.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/blade-ui-kit/blade-ui-kit.git",
-                "reference": "bfb5beb26e1347e0f2be6f245a22388410fe53ce"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/blade-ui-kit/blade-ui-kit/zipball/bfb5beb26e1347e0f2be6f245a22388410fe53ce",
-                "reference": "bfb5beb26e1347e0f2be6f245a22388410fe53ce",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "illuminate/filesystem": "^9.0|^10.0",
-                "illuminate/support": "^9.0|^10.0",
-                "illuminate/view": "^9.0|^10.0",
-                "nesbot/carbon": "^2.38",
-                "php": "^8.0"
-            },
-            "require-dev": {
-                "gajus/dindent": "^2.0",
-                "guzzlehttp/guzzle": "^7.4",
-                "league/commonmark": "^1.4|^2.0",
-                "lorisleiva/cron-translator": "^0.1.1",
-                "orchestra/testbench": "^7.1|^8.0",
-                "phpunit/phpunit": "^9.0"
-            },
-            "suggest": {
-                "league/commonmark": "Required to use the markdown component (^1.4).",
-                "lorisleiva/cron-translator": "Required to use the cron component (^0.1.1)."
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "BladeUIKit\\BladeUIKitServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "BladeUIKit\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Dries Vints",
-                    "homepage": "https://driesvints.com"
-                }
-            ],
-            "description": "A set of renderless components to utilise in your Laravel Blade views.",
-            "homepage": "https://github.com/blade-ui-kit/blade-ui-kit",
-            "keywords": [
-                "blade",
-                "laravel",
-                "ui"
-            ],
-            "support": {
-                "issues": "https://github.com/blade-ui-kit/blade-ui-kit/issues",
-                "source": "https://github.com/blade-ui-kit/blade-ui-kit"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/caneco",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/driesvints",
-                    "type": "github"
-                }
-            ],
-            "time": "2023-02-13T16:56:05+00:00"
-        },
         {
             "name": "brick/math",
             "version": "0.12.1",
@@ -2672,16 +2592,16 @@
         },
         {
             "name": "filament/actions",
-            "version": "v3.2.121",
+            "version": "v3.2.122",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
-                "reference": "1c79f2ffefdee6a21995717a52f006a541b971bc"
+                "reference": "3badf1a1589bf70fdc625130f6dfc1ca2146a32f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/actions/zipball/1c79f2ffefdee6a21995717a52f006a541b971bc",
-                "reference": "1c79f2ffefdee6a21995717a52f006a541b971bc",
+                "url": "https://api.github.com/repos/filamentphp/actions/zipball/3badf1a1589bf70fdc625130f6dfc1ca2146a32f",
+                "reference": "3badf1a1589bf70fdc625130f6dfc1ca2146a32f",
                 "shasum": ""
             },
             "require": {
@@ -2721,20 +2641,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-24T13:46:52+00:00"
+            "time": "2024-10-31T13:38:12+00:00"
         },
         {
             "name": "filament/filament",
-            "version": "v3.2.121",
+            "version": "v3.2.122",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
-                "reference": "5e9a946d0b64c1ef9a7ef1cb256a427f2838dbc2"
+                "reference": "076f5367a3dfe5f6864d117f6826ca7821586931"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/5e9a946d0b64c1ef9a7ef1cb256a427f2838dbc2",
-                "reference": "5e9a946d0b64c1ef9a7ef1cb256a427f2838dbc2",
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/076f5367a3dfe5f6864d117f6826ca7821586931",
+                "reference": "076f5367a3dfe5f6864d117f6826ca7821586931",
                 "shasum": ""
             },
             "require": {
@@ -2786,20 +2706,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-24T13:47:13+00:00"
+            "time": "2024-10-31T13:38:14+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v3.2.121",
+            "version": "v3.2.122",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "68c9f7f4bd9677f6f99d21396dfbe69cfa142584"
+                "reference": "c863b5765b871485a2c624c43a0eb6e957a04b54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/68c9f7f4bd9677f6f99d21396dfbe69cfa142584",
-                "reference": "68c9f7f4bd9677f6f99d21396dfbe69cfa142584",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/c863b5765b871485a2c624c43a0eb6e957a04b54",
+                "reference": "c863b5765b871485a2c624c43a0eb6e957a04b54",
                 "shasum": ""
             },
             "require": {
@@ -2842,11 +2762,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-24T13:47:01+00:00"
+            "time": "2024-10-31T13:38:16+00:00"
         },
         {
             "name": "filament/infolists",
-            "version": "v3.2.121",
+            "version": "v3.2.122",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
@@ -2897,7 +2817,7 @@
         },
         {
             "name": "filament/notifications",
-            "version": "v3.2.121",
+            "version": "v3.2.122",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
@@ -2949,16 +2869,16 @@
         },
         {
             "name": "filament/support",
-            "version": "v3.2.121",
+            "version": "v3.2.122",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
-                "reference": "fa8ada5101be964daa8f112616945a8f2ca5929e"
+                "reference": "e7174cee7e1d08205f7120d0dcc0d00d9bdd4d32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/support/zipball/fa8ada5101be964daa8f112616945a8f2ca5929e",
-                "reference": "fa8ada5101be964daa8f112616945a8f2ca5929e",
+                "url": "https://api.github.com/repos/filamentphp/support/zipball/e7174cee7e1d08205f7120d0dcc0d00d9bdd4d32",
+                "reference": "e7174cee7e1d08205f7120d0dcc0d00d9bdd4d32",
                 "shasum": ""
             },
             "require": {
@@ -3004,20 +2924,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-24T13:47:33+00:00"
+            "time": "2024-10-31T13:38:25+00:00"
         },
         {
             "name": "filament/tables",
-            "version": "v3.2.121",
+            "version": "v3.2.122",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
-                "reference": "7800832d8507a418787c5f05bd562b65d4601827"
+                "reference": "56a852f7992a01ad8d7b85034cdbb2ae8a21086a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/7800832d8507a418787c5f05bd562b65d4601827",
-                "reference": "7800832d8507a418787c5f05bd562b65d4601827",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/56a852f7992a01ad8d7b85034cdbb2ae8a21086a",
+                "reference": "56a852f7992a01ad8d7b85034cdbb2ae8a21086a",
                 "shasum": ""
             },
             "require": {
@@ -3056,11 +2976,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-10-24T13:47:33+00:00"
+            "time": "2024-10-31T13:38:27+00:00"
         },
         {
             "name": "filament/widgets",
-            "version": "v3.2.121",
+            "version": "v3.2.122",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
@@ -4705,16 +4625,16 @@
         },
         {
             "name": "laravel/fortify",
-            "version": "v1.24.3",
+            "version": "v1.24.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/fortify.git",
-                "reference": "0e9c9ec6f9c36f4d8a4b7b5df78e4dfccec47797"
+                "reference": "5bd3bdd535acf4054865c64eec6d8bb8c60cc127"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/fortify/zipball/0e9c9ec6f9c36f4d8a4b7b5df78e4dfccec47797",
-                "reference": "0e9c9ec6f9c36f4d8a4b7b5df78e4dfccec47797",
+                "url": "https://api.github.com/repos/laravel/fortify/zipball/5bd3bdd535acf4054865c64eec6d8bb8c60cc127",
+                "reference": "5bd3bdd535acf4054865c64eec6d8bb8c60cc127",
                 "shasum": ""
             },
             "require": {
@@ -4766,7 +4686,7 @@
                 "issues": "https://github.com/laravel/fortify/issues",
                 "source": "https://github.com/laravel/fortify"
             },
-            "time": "2024-10-18T13:43:00+00:00"
+            "time": "2024-10-29T13:59:23+00:00"
         },
         {
             "name": "laravel/framework",
@@ -5361,16 +5281,16 @@
         },
         {
             "name": "laravelcm/laravel-subscriptions",
-            "version": "v1.3.1",
+            "version": "v1.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravelcm/laravel-subscriptions.git",
-                "reference": "0fb781ac067a769a7653c6580aef68e1ace351fc"
+                "reference": "fbde435db5488b33a181e76d6719acd4db74e5d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravelcm/laravel-subscriptions/zipball/0fb781ac067a769a7653c6580aef68e1ace351fc",
-                "reference": "0fb781ac067a769a7653c6580aef68e1ace351fc",
+                "url": "https://api.github.com/repos/laravelcm/laravel-subscriptions/zipball/fbde435db5488b33a181e76d6719acd4db74e5d9",
+                "reference": "fbde435db5488b33a181e76d6719acd4db74e5d9",
                 "shasum": ""
             },
             "require": {
@@ -5388,7 +5308,8 @@
                 "larastan/larastan": "^2.0",
                 "laravel/pint": "^1.13",
                 "orchestra/testbench": "^8.0|^9.0",
-                "pestphp/pest": "^2.18"
+                "pestphp/pest": "^2.18",
+                "spatie/test-time": "^1.3"
             },
             "type": "library",
             "extra": {
@@ -5441,7 +5362,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-24T04:08:22+00:00"
+            "time": "2024-11-01T20:48:24+00:00"
         },
         {
             "name": "laravelcm/livewire-slide-overs",
@@ -8219,23 +8140,23 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.8.2",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "153ae662783729388a584b4361f2545e4d841e3c"
+                "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c",
-                "reference": "153ae662783729388a584b4361f2545e4d841e3c",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/1fb5ba8d045f5dd984ebded5b1cc66f29459422d",
+                "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d",
                 "shasum": ""
             },
             "require": {
                 "doctrine/deprecations": "^1.0",
                 "php": "^7.3 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.0",
-                "phpstan/phpdoc-parser": "^1.13"
+                "phpstan/phpdoc-parser": "^1.18"
             },
             "require-dev": {
                 "ext-tokenizer": "*",
@@ -8271,9 +8192,9 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.9.0"
             },
-            "time": "2024-02-23T11:10:43+00:00"
+            "time": "2024-11-03T20:11:34+00:00"
         },
         {
             "name": "phpoption/phpoption",
@@ -11359,16 +11280,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "72d080eb9edf80e36c19be61f72c98ed8273b765"
+                "reference": "f793dd5a7d9ae9923e35d0503d08ba734cec1d79"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/72d080eb9edf80e36c19be61f72c98ed8273b765",
-                "reference": "72d080eb9edf80e36c19be61f72c98ed8273b765",
+                "url": "https://api.github.com/repos/symfony/console/zipball/f793dd5a7d9ae9923e35d0503d08ba734cec1d79",
+                "reference": "f793dd5a7d9ae9923e35d0503d08ba734cec1d79",
                 "shasum": ""
             },
             "require": {
@@ -11433,7 +11354,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.12"
+                "source": "https://github.com/symfony/console/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -11449,20 +11370,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:15:52+00:00"
+            "time": "2024-10-09T08:40:40+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v7.1.1",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "1c7cee86c6f812896af54434f8ce29c8d94f9ff4"
+                "reference": "4aa4f6b3d6749c14d3aa815eef8226632e7bbc66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/1c7cee86c6f812896af54434f8ce29c8d94f9ff4",
-                "reference": "1c7cee86c6f812896af54434f8ce29c8d94f9ff4",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/4aa4f6b3d6749c14d3aa815eef8226632e7bbc66",
+                "reference": "4aa4f6b3d6749c14d3aa815eef8226632e7bbc66",
                 "shasum": ""
             },
             "require": {
@@ -11498,7 +11419,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v7.1.1"
+                "source": "https://github.com/symfony/css-selector/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -11514,7 +11435,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -11585,16 +11506,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "9d307ecbcb917001692be333cdc58f474fdb37f0"
+                "reference": "ae074dffb018c37a57071990d16e6152728dd972"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/9d307ecbcb917001692be333cdc58f474fdb37f0",
-                "reference": "9d307ecbcb917001692be333cdc58f474fdb37f0",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/ae074dffb018c37a57071990d16e6152728dd972",
+                "reference": "ae074dffb018c37a57071990d16e6152728dd972",
                 "shasum": ""
             },
             "require": {
@@ -11632,7 +11553,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v6.4.12"
+                "source": "https://github.com/symfony/dom-crawler/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -11648,20 +11569,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-15T06:35:36+00:00"
+            "time": "2024-10-25T15:07:50+00:00"
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.10",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "231f1b2ee80f72daa1972f7340297d67439224f0"
+                "reference": "e3c78742f86a5b65fe2ac4c4b6b776d92fd7ca0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/231f1b2ee80f72daa1972f7340297d67439224f0",
-                "reference": "231f1b2ee80f72daa1972f7340297d67439224f0",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/e3c78742f86a5b65fe2ac4c4b6b776d92fd7ca0c",
+                "reference": "e3c78742f86a5b65fe2ac4c4b6b776d92fd7ca0c",
                 "shasum": ""
             },
             "require": {
@@ -11707,7 +11628,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.10"
+                "source": "https://github.com/symfony/error-handler/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -11723,20 +11644,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-26T12:30:32+00:00"
+            "time": "2024-09-25T14:18:03+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v7.1.1",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7"
+                "reference": "87254c78dd50721cfd015b62277a8281c5589702"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7",
-                "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87254c78dd50721cfd015b62277a8281c5589702",
+                "reference": "87254c78dd50721cfd015b62277a8281c5589702",
                 "shasum": ""
             },
             "require": {
@@ -11787,7 +11708,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.1"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -11803,7 +11724,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -11883,16 +11804,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.11",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453"
+                "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/d7eb6daf8cd7e9ac4976e9576b32042ef7253453",
-                "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/daea9eca0b08d0ed1dc9ab702a46128fd1be4958",
+                "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958",
                 "shasum": ""
             },
             "require": {
@@ -11927,7 +11848,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.11"
+                "source": "https://github.com/symfony/finder/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -11943,20 +11864,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-13T14:27:37+00:00"
+            "time": "2024-10-01T08:30:56+00:00"
         },
         {
             "name": "symfony/html-sanitizer",
-            "version": "v7.1.5",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/html-sanitizer.git",
-                "reference": "89bf376c056926bd7fe8a81c0f486a060e20fdbc"
+                "reference": "a25620fc6407e14331f3c0c5668eb4f35c392d4a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/html-sanitizer/zipball/89bf376c056926bd7fe8a81c0f486a060e20fdbc",
-                "reference": "89bf376c056926bd7fe8a81c0f486a060e20fdbc",
+                "url": "https://api.github.com/repos/symfony/html-sanitizer/zipball/a25620fc6407e14331f3c0c5668eb4f35c392d4a",
+                "reference": "a25620fc6407e14331f3c0c5668eb4f35c392d4a",
                 "shasum": ""
             },
             "require": {
@@ -11996,7 +11917,7 @@
                 "sanitizer"
             ],
             "support": {
-                "source": "https://github.com/symfony/html-sanitizer/tree/v7.1.5"
+                "source": "https://github.com/symfony/html-sanitizer/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -12012,20 +11933,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T13:35:23+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/http-client",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client.git",
-                "reference": "fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56"
+                "reference": "509d0e8a798bf5e41e0b6317e9bce1140af47376"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56",
-                "reference": "fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/509d0e8a798bf5e41e0b6317e9bce1140af47376",
+                "reference": "509d0e8a798bf5e41e0b6317e9bce1140af47376",
                 "shasum": ""
             },
             "require": {
@@ -12089,7 +12010,7 @@
                 "http"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v6.4.12"
+                "source": "https://github.com/symfony/http-client/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -12105,7 +12026,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:21:33+00:00"
+            "time": "2024-10-14T18:15:01+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
@@ -12187,16 +12108,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "133ac043875f59c26c55e79cf074562127cce4d2"
+                "reference": "4c0341b3e0a7291e752c69d2a1ed9a84b68d604c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/133ac043875f59c26c55e79cf074562127cce4d2",
-                "reference": "133ac043875f59c26c55e79cf074562127cce4d2",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/4c0341b3e0a7291e752c69d2a1ed9a84b68d604c",
+                "reference": "4c0341b3e0a7291e752c69d2a1ed9a84b68d604c",
                 "shasum": ""
             },
             "require": {
@@ -12244,7 +12165,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.4.12"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -12260,20 +12181,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:18:25+00:00"
+            "time": "2024-10-11T19:20:58+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "96df83d51b5f78804f70c093b97310794fd6257b"
+                "reference": "4474015c363ec0cd3bf47d55657e68630dbae66e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/96df83d51b5f78804f70c093b97310794fd6257b",
-                "reference": "96df83d51b5f78804f70c093b97310794fd6257b",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4474015c363ec0cd3bf47d55657e68630dbae66e",
+                "reference": "4474015c363ec0cd3bf47d55657e68630dbae66e",
                 "shasum": ""
             },
             "require": {
@@ -12358,7 +12279,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.12"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -12374,20 +12295,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-21T06:02:57+00:00"
+            "time": "2024-10-27T13:00:29+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "b6a25408c569ae2366b3f663a4edad19420a9c26"
+                "reference": "c2f7e0d8d7ac8fe25faccf5d8cac462805db2663"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/b6a25408c569ae2366b3f663a4edad19420a9c26",
-                "reference": "b6a25408c569ae2366b3f663a4edad19420a9c26",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/c2f7e0d8d7ac8fe25faccf5d8cac462805db2663",
+                "reference": "c2f7e0d8d7ac8fe25faccf5d8cac462805db2663",
                 "shasum": ""
             },
             "require": {
@@ -12438,7 +12359,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v6.4.12"
+                "source": "https://github.com/symfony/mailer/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -12454,20 +12375,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-08T12:30:05+00:00"
+            "time": "2024-09-25T14:18:03+00:00"
         },
         {
             "name": "symfony/mailgun-mailer",
-            "version": "v6.4.10",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailgun-mailer.git",
-                "reference": "3eb7c7b644179a766f5d816620b7b6d4a4e7ec43"
+                "reference": "ad4e79798a5eb80af99004a4871b4fe5effe33a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/3eb7c7b644179a766f5d816620b7b6d4a4e7ec43",
-                "reference": "3eb7c7b644179a766f5d816620b7b6d4a4e7ec43",
+                "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/ad4e79798a5eb80af99004a4871b4fe5effe33a3",
+                "reference": "ad4e79798a5eb80af99004a4871b4fe5effe33a3",
                 "shasum": ""
             },
             "require": {
@@ -12507,7 +12428,7 @@
             "description": "Symfony Mailgun Mailer Bridge",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailgun-mailer/tree/v6.4.10"
+                "source": "https://github.com/symfony/mailgun-mailer/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -12523,20 +12444,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-04T11:16:22+00:00"
+            "time": "2024-09-25T14:18:03+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "abe16ee7790b16aa525877419deb0f113953f0e1"
+                "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/abe16ee7790b16aa525877419deb0f113953f0e1",
-                "reference": "abe16ee7790b16aa525877419deb0f113953f0e1",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/1de1cf14d99b12c7ebbb850491ec6ae3ed468855",
+                "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855",
                 "shasum": ""
             },
             "require": {
@@ -12592,7 +12513,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.12"
+                "source": "https://github.com/symfony/mime/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -12608,20 +12529,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:18:25+00:00"
+            "time": "2024-10-25T15:07:50+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v7.1.1",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55"
+                "reference": "85e95eeede2d41cd146146e98c9c81d9214cae85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/47aa818121ed3950acd2b58d1d37d08a94f9bf55",
-                "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/85e95eeede2d41cd146146e98c9c81d9214cae85",
+                "reference": "85e95eeede2d41cd146146e98c9c81d9214cae85",
                 "shasum": ""
             },
             "require": {
@@ -12659,7 +12580,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v7.1.1"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -12675,7 +12596,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -13315,16 +13236,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "3f94e5f13ff58df371a7ead461b6e8068900fbb3"
+                "reference": "1f9f59b46880201629df3bd950fc5ae8c55b960f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/3f94e5f13ff58df371a7ead461b6e8068900fbb3",
-                "reference": "3f94e5f13ff58df371a7ead461b6e8068900fbb3",
+                "url": "https://api.github.com/repos/symfony/process/zipball/1f9f59b46880201629df3bd950fc5ae8c55b960f",
+                "reference": "1f9f59b46880201629df3bd950fc5ae8c55b960f",
                 "shasum": ""
             },
             "require": {
@@ -13356,7 +13277,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.4.12"
+                "source": "https://github.com/symfony/process/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -13372,7 +13293,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-17T12:47:12+00:00"
+            "time": "2024-09-25T14:18:03+00:00"
         },
         {
             "name": "symfony/psr-http-message-bridge",
@@ -13465,16 +13386,16 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f"
+                "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/a7c8036bd159486228dc9be3e846a00a0dda9f9f",
-                "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/640a74250d13f9c30d5ca045b6aaaabcc8215278",
+                "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278",
                 "shasum": ""
             },
             "require": {
@@ -13528,7 +13449,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.12"
+                "source": "https://github.com/symfony/routing/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -13544,7 +13465,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:32:26+00:00"
+            "time": "2024-10-01T08:30:56+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -13631,16 +13552,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.1.5",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306"
+                "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/d66f9c343fa894ec2037cc928381df90a7ad4306",
-                "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306",
+                "url": "https://api.github.com/repos/symfony/string/zipball/61b72d66bf96c360a727ae6232df5ac83c71f626",
+                "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626",
                 "shasum": ""
             },
             "require": {
@@ -13698,7 +13619,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.1.5"
+                "source": "https://github.com/symfony/string/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -13714,20 +13635,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:28:38+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "cf8360b8352b086be620fae8342c4d96e391a489"
+                "reference": "bee9bfabfa8b4045a66bf82520e492cddbaffa66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/cf8360b8352b086be620fae8342c4d96e391a489",
-                "reference": "cf8360b8352b086be620fae8342c4d96e391a489",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/bee9bfabfa8b4045a66bf82520e492cddbaffa66",
+                "reference": "bee9bfabfa8b4045a66bf82520e492cddbaffa66",
                 "shasum": ""
             },
             "require": {
@@ -13793,7 +13714,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.4.12"
+                "source": "https://github.com/symfony/translation/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -13809,7 +13730,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-16T06:02:54+00:00"
+            "time": "2024-09-27T18:14:25+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -13891,16 +13812,16 @@
         },
         {
             "name": "symfony/uid",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "2f16054e0a9b194b8ca581d4a64eee3f7d4a9d4d"
+                "reference": "18eb207f0436a993fffbdd811b5b8fa35fa5e007"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/2f16054e0a9b194b8ca581d4a64eee3f7d4a9d4d",
-                "reference": "2f16054e0a9b194b8ca581d4a64eee3f7d4a9d4d",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/18eb207f0436a993fffbdd811b5b8fa35fa5e007",
+                "reference": "18eb207f0436a993fffbdd811b5b8fa35fa5e007",
                 "shasum": ""
             },
             "require": {
@@ -13945,7 +13866,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v6.4.12"
+                "source": "https://github.com/symfony/uid/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -13961,20 +13882,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:32:26+00:00"
+            "time": "2024-09-25T14:18:03+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.11",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "ee14c8254a480913268b1e3b1cba8045ed122694"
+                "reference": "2acb151474ed8cb43624e3f41a0bf7c4c8ce4f41"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ee14c8254a480913268b1e3b1cba8045ed122694",
-                "reference": "ee14c8254a480913268b1e3b1cba8045ed122694",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2acb151474ed8cb43624e3f41a0bf7c4c8ce4f41",
+                "reference": "2acb151474ed8cb43624e3f41a0bf7c4c8ce4f41",
                 "shasum": ""
             },
             "require": {
@@ -14030,7 +13951,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.11"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -14046,7 +13967,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-30T16:03:21+00:00"
+            "time": "2024-09-25T14:18:03+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -14971,16 +14892,16 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v2.9.9",
+            "version": "v2.9.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "148faa138f0d8acb7d85f4a55693d3e13b6048d2"
+                "reference": "9e7233d88f4f10796fadb8a2d85c5f2b55277c76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/148faa138f0d8acb7d85f4a55693d3e13b6048d2",
-                "reference": "148faa138f0d8acb7d85f4a55693d3e13b6048d2",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/9e7233d88f4f10796fadb8a2d85c5f2b55277c76",
+                "reference": "9e7233d88f4f10796fadb8a2d85c5f2b55277c76",
                 "shasum": ""
             },
             "require": {
@@ -15050,7 +14971,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v2.9.9"
+                "source": "https://github.com/larastan/larastan/tree/v2.9.10"
             },
             "funding": [
                 {
@@ -15070,7 +14991,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-10-15T19:41:22+00:00"
+            "time": "2024-10-19T23:04:40+00:00"
         },
         {
             "name": "laravel/pint",
@@ -15140,16 +15061,16 @@
         },
         {
             "name": "laravel/sail",
-            "version": "v1.37.0",
+            "version": "v1.37.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sail.git",
-                "reference": "5d385f2e698f0f774cdead82aff5d989fb95309b"
+                "reference": "7efa151ea0d16f48233d6a6cd69f81270acc6e93"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sail/zipball/5d385f2e698f0f774cdead82aff5d989fb95309b",
-                "reference": "5d385f2e698f0f774cdead82aff5d989fb95309b",
+                "url": "https://api.github.com/repos/laravel/sail/zipball/7efa151ea0d16f48233d6a6cd69f81270acc6e93",
+                "reference": "7efa151ea0d16f48233d6a6cd69f81270acc6e93",
                 "shasum": ""
             },
             "require": {
@@ -15199,7 +15120,7 @@
                 "issues": "https://github.com/laravel/sail/issues",
                 "source": "https://github.com/laravel/sail"
             },
-            "time": "2024-10-21T17:13:38+00:00"
+            "time": "2024-10-29T20:18:14+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -17880,16 +17801,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v7.1.5",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "4e561c316e135e053bd758bf3b3eb291d9919de4"
+                "reference": "3ced3f29e4f0d6bce2170ff26719f1fe9aacc671"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/4e561c316e135e053bd758bf3b3eb291d9919de4",
-                "reference": "4e561c316e135e053bd758bf3b3eb291d9919de4",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/3ced3f29e4f0d6bce2170ff26719f1fe9aacc671",
+                "reference": "3ced3f29e4f0d6bce2170ff26719f1fe9aacc671",
                 "shasum": ""
             },
             "require": {
@@ -17931,7 +17852,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v7.1.5"
+                "source": "https://github.com/symfony/yaml/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -17947,7 +17868,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-17T12:49:58+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "ta-tikoma/phpunit-architecture-test",
diff --git a/config/markdown.php b/config/markdown.php
index 60df990b..89d021e5 100644
--- a/config/markdown.php
+++ b/config/markdown.php
@@ -56,7 +56,7 @@
     ],
 
     'heading_permalink' => [
-        'html_class' => 'anchor mr-2 !text-skin-primary !no-underline hover:!text-skin-primary-hover focus:!text-skin-primary-hover focus:outline-none',
+        'html_class' => 'anchor mr-2 !text-primary-500 !no-underline hover:!text-primary-500 focus:outline-none',
         'fragment_prefix' => '',
         'id_prefix' => '',
         'symbol' => '#',
@@ -127,7 +127,7 @@
     |
     */
 
-    'html_input' => 'allow',
+    'html_input' => 'strip',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/lang/en/notifications.php b/lang/en/notifications.php
index 2106cddb..0dcf61d5 100644
--- a/lang/en/notifications.php
+++ b/lang/en/notifications.php
@@ -19,4 +19,9 @@
         'unverified_user' => 'You are not authorized to do this. Your e-mail is not verified',
     ],
 
+    'reply' => [
+        'created' => 'Answer successfully added.',
+        'updated' => 'Successfully updated answer.',
+    ],
+
 ];
diff --git a/lang/en/pages/forum.php b/lang/en/pages/forum.php
index f6fe1e74..dd7824ab 100644
--- a/lang/en/pages/forum.php
+++ b/lang/en/pages/forum.php
@@ -38,5 +38,6 @@
     'mark_answer' => 'Mark as solution',
     'report_spam' => 'Report spam',
     'max_thread_length' => '100 characters maximum',
+    'answer_reply' => 'Answer to',
 
 ];
diff --git a/lang/fr/notifications.php b/lang/fr/notifications.php
index 91453e8d..f2f925ef 100644
--- a/lang/fr/notifications.php
+++ b/lang/fr/notifications.php
@@ -19,4 +19,9 @@
         'unverified_user' => "Vous n'êtes pas autorisé à effectuer cette. Votre e-mail n'est pas vérifiée",
     ],
 
+    'reply' => [
+        'created' => 'Réponse ajoutée avec succès!',
+        'updated' => 'Réponse modifiée avec succès.',
+    ],
+
 ];
diff --git a/lang/fr/pages/forum.php b/lang/fr/pages/forum.php
index 73c41ce5..fb22b526 100644
--- a/lang/fr/pages/forum.php
+++ b/lang/fr/pages/forum.php
@@ -38,5 +38,6 @@
     'mark_answer' => 'Marquer comme réponse',
     'report_spam' => 'Signaler un spam',
     'max_thread_length' => 'Maximum de 100 caractères.',
+    'answer_reply' => 'Répondre au sujet',
 
 ];
diff --git a/resources/views/forum/_channels.blade.php b/resources/views/forum/_channels.blade.php
deleted file mode 100644
index 22fe54d9..00000000
--- a/resources/views/forum/_channels.blade.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<nav class="space-y-6">
-    <x-buttons.primary :href="route('forum.new')" class="gap-2 justify-between">
-        {{ __('pages/forum.new_thread') }}
-        <x-untitledui-plus class="size-4" stroke-width="1.5" aria-hidden="true" />
-    </x-buttons.primary>
-
-    <div class="sm:hidden">
-        <x-forms.select
-            onchange="this.options[this.selectedIndex].value && (window.location = this.options[this.selectedIndex].value);"
-        >
-            <option value="">Filtrer par channel</option>
-            @foreach ($channels as $channel)
-                <option
-                    value="{{ route('forum.channels', $channel) }}"
-                    @if(request()->fullUrlIs(route('forum.channels', $channel))) selected @endif
-                >
-                    {{ $channel->name }}
-                </option>
-                @if ($channel->items->isNotEmpty())
-                    @foreach ($channel->items as $item)
-                        <option
-                            value="{{ route('forum.channels', $item) }}"
-                            @if(request()->fullUrlIs(route('forum.channels', $item))) selected @endif
-                        >
-                            {{ $item->name }}
-                        </option>
-                    @endforeach
-                @endif
-            @endforeach
-        </x-forms.select>
-    </div>
-
-    <div class="hidden sm:block">
-        <ul class="space-y-3">
-            @foreach ($channels as $channel)
-                <li class="{{ $loop->last ?: 'pb-4' }} relative">
-                    <div class="absolute left-1 top-4 -ml-px mt-0.5 h-full w-0.5 bg-gray-100" aria-hidden="true"></div>
-                    <div class="flex items-center space-x-3">
-                        <div
-                            class="size-2 shrink-0 rounded-full"
-                            aria-hidden="true"
-                            style="background-color: {{ $channel->color }}"
-                        ></div>
-                        <x-link
-                            :href="route('forum.channels', $channel)"
-                            @class([
-                                'truncate font-medium',
-                                 'text-primary-600 hover:text-primary-600-hover' => url()->route('forum.channels', $channel) === request()->fullUrl(),
-                                 'text-gray-700 dark:text-gray-300 hover:text-gray-900 dark:hover:text-white' => url()->route('forum.channels', $channel) !== request()->fullUrl()
-                            ])
-                        >
-                            {{ $channel->name }}
-                        </x-link>
-                    </div>
-
-                    @if ($channel->items->isNotEmpty())
-                        <ul class="ml-8 mt-3 space-y-2">
-                            @foreach ($channel->items as $item)
-                                <li>
-                                    <x-link
-                                        :href="route('forum.channels', $item)"
-                                        @class([
-                                            'truncate text-sm',
-                                             'text-primary-600 hover:text-primary-600-hover' => url()->route('forum.channels', $item) === request()->fullUrl(),
-                                             'text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300' => url()->route('forum.channels', $item) !== request()->fullUrl()
-                                        ])
-                                    >
-                                        {{ $item->name }}
-                                    </x-link>
-                                </li>
-                            @endforeach
-                        </ul>
-                    @endif
-                </li>
-            @endforeach
-        </ul>
-    </div>
-</nav>
diff --git a/resources/views/forum/edit.blade.php b/resources/views/forum/edit.blade.php
deleted file mode 100644
index 2f0ee170..00000000
--- a/resources/views/forum/edit.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<x-app-layout :title="'Modifier le sujet ' . $thread->subject()">
-    <div class="mx-auto max-w-4xl py-12">
-        <div class="space-y-8 divide-y divide-skin-base sm:space-y-5">
-            <div>
-                <h3 class="font-heading text-lg font-medium leading-6 text-gray-900">Modifier mon sujet</h3>
-                <p class="mt-1 max-w-2xl text-sm font-normal text-gray-500 dark:text-gray-400">
-                    Assurez-vous d'avoir lu nos
-                    <a href="{{ route('rules') }}" class="font-medium text-primary-600 hover:text-primary-600-hover">
-                        règles de conduite
-                    </a>
-                    avant de continuer.
-                </p>
-            </div>
-
-            <livewire:forum.edit-thread :thread="$thread" />
-        </div>
-    </div>
-</x-app-layout>
diff --git a/resources/views/livewire/articles/_form.blade.php b/resources/views/livewire/articles/_form.blade.php
index da0239d5..261089c1 100644
--- a/resources/views/livewire/articles/_form.blade.php
+++ b/resources/views/livewire/articles/_form.blade.php
@@ -170,9 +170,9 @@ class="size-6"
                             </div>
                             <div class="relative mt-6 flex-1 px-4 sm:px-6">
                                 <div class="h-full" aria-hidden="true">
-                                    <x-label for="cover_photo">
+                                    <label for="cover_photo">
                                         {{ __('Image de couverture') }}
-                                    </x-label>
+                                    </label>
                                     <div class="mt-2">
                                         <x-forms.single-upload
                                             id="file"
@@ -217,7 +217,7 @@ class="pointer-events-none inline-block size-5 translate-x-0 transform rounded-f
                                     </div>
 
                                     <div class="mt-8" x-data="datepicker" wire:ignore>
-                                        <x-label for="published_at">Date de publication</x-label>
+                                        <label for="published_at">Date de publication</label>
                                         <div class="relative mt-1" wire:model="published_at">
                                             <input
                                                 x-ref="datePickerInput"
@@ -347,8 +347,8 @@ class="flex h-7 w-7 cursor-pointer items-center justify-center rounded-full text
                                     </div>
 
                                     <div class="mt-8">
-                                        <x-label for="slug">URL Slug</x-label>
-                                        <x-input
+                                        <label for="slug">URL Slug</label>
+                                        <input
                                             wire:model.debounce.500ms="slug"
                                             id="slug"
                                             name="slug"
@@ -360,12 +360,12 @@ class="mt-1"
                                     </div>
 
                                     <div class="mt-8">
-                                        <x-label for="canonical_url">Canonical URL</x-label>
+                                        <label for="canonical_url">Canonical URL</label>
                                         <span class="text-xs leading-3 text-skin-muted">
                                             Modifiez si l'article a été publié pour la première fois ailleurs (comme sur
                                             votre propre blog).
                                         </span>
-                                        <x-input
+                                        <input
                                             wire:model="canonical_url"
                                             id="canonical_url"
                                             name="canonical_url"
@@ -376,7 +376,7 @@ class="mt-1"
                                     </div>
 
                                     <div class="standard mt-8" wire:ignore>
-                                        <x-label for="tags_selected">Tags</x-label>
+                                        <label for="tags_selected">Tags</label>
                                         <x-forms.select
                                             wire:model="tags_selected"
                                             id="tags_selected"
diff --git a/resources/views/livewire/discussions/_form.blade.php b/resources/views/livewire/discussions/_form.blade.php
index 217056ae..776652a1 100644
--- a/resources/views/livewire/discussions/_form.blade.php
+++ b/resources/views/livewire/discussions/_form.blade.php
@@ -2,13 +2,13 @@
     <x-validation-errors />
 
     <div class="block">
-        <x-label for="title">Titre</x-label>
-        <x-input id="title" class="mt-1 block w-full" wire:model="title" name="title" required />
+        <label for="title">Titre</label>
+        <input id="title" class="mt-1 block w-full" wire:model="title" name="title" required />
         <p class="mt-2 text-sm text-gray-500 dark:text-gray-400">Maximum de 160 caractères.</p>
     </div>
 
     <div class="standard relative z-50 block" wire:ignore>
-        <x-label for="channels_selected">Tags</x-label>
+        <label for="channels_selected">Tags</label>
         <x-forms.select
             wire:model="tags_selected"
             id="tags_selected"
@@ -26,13 +26,13 @@ class="mt-2"
     </div>
 
     <div class="block space-y-2">
-        <x-label for="body">Votre contenu</x-label>
+        <label for="body">Votre contenu</label>
         <livewire:markdown-x
             :content="$body"
             :style="[
-            'textarea' => 'w-full h-full border border-skin-input focus:border-skin-base focus:outline-none p-4 rounded-b-lg',
-            'height' => 'h-[450px]',
-        ]"
+                'textarea' => 'w-full h-full border border-skin-input focus:border-skin-base focus:outline-none p-4 rounded-b-lg',
+                'height' => 'h-[450px]',
+            ]"
         />
     </div>
 
diff --git a/resources/views/livewire/forum/create-reply.blade.php b/resources/views/livewire/forum/create-reply.blade.php
deleted file mode 100644
index b29d3490..00000000
--- a/resources/views/livewire/forum/create-reply.blade.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<div x-data="{ open: false }" class="mt-10 flex items-center justify-center lg:mt-16">
-    <div class="w-full max-w-3xl mx-auto">
-        <button type="button" class="relative bg-white rounded-xl px-6 py-5 ring-1 ring-gray-200/60 flex items-center w-full gap-5 hover:ring-gray-300 dark:ring-white/20 dark:hover:ring-white/10 dark:bg-gray-800 dark:hover:bg-white/10 focus:outline transition duration-200 ease-in-out">
-            <x-user.avatar
-                :user="\Illuminate\Support\Facades\Auth::user()"
-                class="size-10 ring-4 ring-white dark:ring-white/20"
-                span="-right-1 size-3.5 -top-1"
-            />
-            <span class="text-sm leading-6 text-gray-500 dark:text-gray-300">
-                {{ __('Laissez votre réponse') }}
-            </span>
-        </button>
-        <div class="mt-5 text-center">
-            <p class="text-sm leading-5 text-gray-500 dark:text-gray-400">
-                Assurez-vous d'avoir lu nos
-                <x-link :href="route('rules')" class="font-medium text-primary-600 hover:text-primary-500">
-                    règles de conduite
-                </x-link>
-                avant de répondre à ce thread.
-            </p>
-        </div>
-    </div>
-
-    <div></div>
-</div>
diff --git a/resources/views/livewire/forum/reply-form.blade.php b/resources/views/livewire/forum/reply-form.blade.php
new file mode 100644
index 00000000..4f442293
--- /dev/null
+++ b/resources/views/livewire/forum/reply-form.blade.php
@@ -0,0 +1,78 @@
+<div x-data="{ open: @entangle('show').live }" class="relative mt-10 lg:mt-16">
+    <div class="flex items-center justify-center">
+        <div class="w-full max-w-3xl mx-auto">
+            <button type="button" @click="open = true" class="relative bg-white rounded-xl px-6 py-5 ring-1 ring-gray-200/60 flex items-center w-full gap-5 hover:ring-gray-300 dark:ring-white/20 dark:hover:ring-white/10 dark:bg-gray-800 dark:hover:bg-white/10 focus:outline-none transition duration-200 ease-in-out">
+                <x-user.avatar
+                    :user="\Illuminate\Support\Facades\Auth::user()"
+                    class="size-10 ring-4 ring-white dark:ring-white/20"
+                    span="-right-1 size-3.5 -top-1"
+                />
+                <span class="text-sm leading-6 text-gray-500 dark:text-gray-300">
+                    {{ __('Laissez votre réponse') }}
+                </span>
+            </button>
+            <div class="mt-5 text-center">
+                <p class="text-sm leading-5 text-gray-500 dark:text-gray-400">
+                    Assurez-vous d'avoir lu nos
+                    <x-link :href="route('rules')" class="font-medium text-primary-600 hover:text-primary-500">
+                        règles de conduite
+                    </x-link>
+                    avant de répondre à ce thread.
+                </p>
+            </div>
+        </div>
+    </div>
+
+    <div
+        x-cloak
+        x-show="open"
+        class="fixed inset-x-0 bottom-0 z-10 w-screen overflow-y-auto"
+        x-ref="dialog"
+        aria-modal="true"
+    >
+        <div class="flex min-h-full items-center justify-center p-4 text-center sm:p-0">
+            <div
+                x-show="open"
+                x-transition:enter="ease-out duration-300"
+                x-transition:enter-start="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+                x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"
+                x-transition:leave="ease-in duration-200"
+                x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
+                x-transition:leave-end="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+                class="relative transform overflow-hidden rounded-lg ring-1 ring-gray-200/60 bg-white dark:ring-white/10 dark:bg-gray-900 text-left shadow-xl transition-all sm:my-4 sm:w-full sm:max-w-3xl"
+            >
+                <form wire:submit="save" class="flex h-full flex-col divide-y divide-gray-200/60 dark:divide-white/10">
+                    <div class="flex items-center px-4 py-3 gap-2">
+                        <x-untitledui-corner-up-right class="size-4 text-gray-400 dark:text-gray-500" aria-hidden="true" />
+                        <span class="font-medium text-sm text-gray-700 dark:text-gray-300 truncate">
+                            {{ __('Répondre au sujet') }}
+                        </span>
+                        <code class="text-xs py-1 px-1.5 rounded-md bg-gray-50 text-gray-700 dark:bg-gray-800 dark:text-gray-300">
+                            {{ $thread->title }}
+                        </code>
+                    </div>
+                    <div class="h-0 max-h-96 flex-1 overflow-y-auto px-4 py-6">
+                        {{ $this->form }}
+                    </div>
+                    <div class="flex items-center justify-between gap-4 p-4">
+                        <p class="text-sm leading-5 text-gray-500 dark:text-gray-400">
+                            {{ __('pages/forum.torchlight') }}
+                            <a href="https://torchlight.dev/docs/overview" target="_blank" class="font-medium text-primary-600 underline hover:text-primary-500">
+                                Torchlight
+                            </a>
+                        </p>
+                        <div class="flex shrink-0 justify-end gap-4">
+                            <x-buttons.default wire:click="close" type="button" class="sm:w-auto">
+                                {{ __('actions.cancel') }}
+                            </x-buttons.default>
+                            <x-buttons.submit
+                                wire.loading.attr="data-loading"
+                                :title="__('actions.save')"
+                            />
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/resources/views/livewire/forum/reply.blade.php b/resources/views/livewire/forum/reply.blade.php
index f147a129..ae8c5eb7 100644
--- a/resources/views/livewire/forum/reply.blade.php
+++ b/resources/views/livewire/forum/reply.blade.php
@@ -2,7 +2,7 @@
     $isSolution = $thread->isSolutionReply($reply);
 @endphp
 
-<div class="relative pb-8" id="reply-{{ $reply->id }}">
+<div x-data class="relative pb-8" id="reply-{{ $reply->id }}">
     <span class="hidden absolute left-5 top-5 -ml-px h-full w-0.5 bg-gray-100 dark:bg-white/20 lg:block" aria-hidden="true"></span>
     <div class="relative flex items-start gap-6">
         <div class="hidden sticky top-10 lg:block">
@@ -48,39 +48,21 @@ class="size-8 lg:hidden"
                 @endif
             </div>
             <x-markdown-content
-                class="mt-5 prose prose-sm prose-green !prose-heading-off max-w-none space-y-3 text-gray-500 dark:text-gray-400"
+                class="mt-5 prose prose-green !prose-heading-off max-w-none space-y-3 text-gray-500 dark:text-gray-400 dark:prose-invert"
                 :content="$reply->body"
             />
             <div class="mt-4 flex items-center justify-between">
                 @if(! $thread->isSolutionReply($reply))
                     @can('manage', $reply)
-                        <x-filament::dropdown class="inline-flex" placement="top-start">
-                            <x-slot name="trigger" class="-mx-2">
-                                <button type="button" class="inline-flex items-center rounded-lg px-2 py-1.5 text-gray-400 dark:text-gray-500 hover:bg-gray-50 dark:hover:bg-gray-900 focus:outline-none">
-                                    <x-untitledui-dots-horizontal class="size-5" aria-hidden="true" />
-                                </button>
-                            </x-slot>
-
-                            <x-filament::dropdown.list>
-                                @can('update', $reply)
-                                    <x-filament::dropdown.list.item wire:click="openEditModal">
-                                        {{ __('actions.edit') }}
-                                    </x-filament::dropdown.list.item>
-                                @endcan
-
-                                @can('manage', $thread)
-                                    <x-filament::dropdown.list.item color="success" wire:click="markAsSolution">
-                                        {{ __('pages/forum.mark_answer') }}
-                                    </x-filament::dropdown.list.item>
-                                @endcan
-
-                                @can('delete', $reply)
-                                    <x-filament::dropdown.list.item color="danger" wire:click="openDeleteModal">
-                                        {{ __('actions.delete') }}
-                                    </x-filament::dropdown.list.item>
-                                @endcan
-                            </x-filament::dropdown.list>
-                        </x-filament::dropdown>
+                        <x-filament-actions::group
+                            icon="untitledui-dots-horizontal"
+                            color="gray"
+                            :actions="[
+                                $this->editAction,
+                                $this->solutionAction,
+                                $this->deleteAction,
+                            ]"
+                        />
                     @endcan
                 @endif
                 <div class="opacity-0 group-hover:opacity-100">
@@ -91,4 +73,8 @@ class="mt-5 prose prose-sm prose-green !prose-heading-off max-w-none space-y-3 t
             </div>
         </div>
     </div>
+
+    <template x-teleport="body">
+        <x-filament-actions::modals />
+    </template>
 </div>
diff --git a/resources/views/livewire/pages/forum/detail-thread.blade.php b/resources/views/livewire/pages/forum/detail-thread.blade.php
index e229522f..fbd30fb4 100644
--- a/resources/views/livewire/pages/forum/detail-thread.blade.php
+++ b/resources/views/livewire/pages/forum/detail-thread.blade.php
@@ -1,7 +1,11 @@
 <div x-data class="relative">
     <x-slot:buttons>
         <div class="space-y-3">
-            <x-buttons.primary type="button" class="gap-2 w-full justify-center py-2.5">
+            <x-buttons.primary
+                type="button"
+                onclick="Livewire.dispatchTo('forum.reply-form', 'replyForm')"
+                class="gap-2 w-full justify-center py-2.5"
+            >
                 {{ __('pages/forum.reply_thread') }}
             </x-buttons.primary>
 
@@ -34,7 +38,7 @@ class="size-10 ring-4 ring-white dark:ring-white/20"
                                 <x-forum.thread-metadata :thread="$thread" class="gap-3 text-xs" vertical />
                             </div>
                         </div>
-                        <div class="min-w-0 flex-1 rounded-xl bg-white p-5 ring-1 ring-inset ring-gray-200/60 dark:bg-gray-800 dark:ring-white/10 lg:py-6 lg:px-8">
+                        <div class="min-w-0 flex-1 rounded-xl bg-white p-5 ring-1 ring-inset text-wrap overflow-hidden ring-gray-200/60 dark:bg-gray-800 dark:ring-white/10 lg:py-6 lg:px-8">
                             <div class="flex items-center justify-between gap-4">
                                 <div class="flex items-center gap-2">
                                     <x-user.avatar
@@ -69,7 +73,7 @@ class="size-8 lg:hidden"
                                 class="mt-5 prose prose-primary !prose-heading-off max-w-none text-gray-500 dark:text-gray-400 dark:prose-invert"
                             />
                             @can('manage', $thread)
-                                <div class="mt-5">
+                                <div class="mt-5 inline-flex">
                                     <x-filament-actions::group
                                         icon="untitledui-dots-horizontal"
                                         color="gray"
@@ -110,23 +114,23 @@ class="gap-2"
                     </p>
                 </x-info-panel>
             @else
-                <livewire:forum.create-reply :thread="$thread" />
+                <livewire:forum.reply-form :thread="$thread" />
             @endif
         @else
             @guest
                 <p class="py-8 text-center text-gray-500 dark:text-gray-400 lg:py-12">
                     {{ __('global.need') }}
-                    <x-link :href="route('login')" class="text-primary-600 hover:text-primary-600-hover hover:underline">
+                    <x-link :href="route('login')" class="text-primary-600 hover:text-primary-500 hover:underline">
                         {{ __('pages/auth.login.page_title') }}
                     </x-link>
                     {{ __('global.or') }}
-                    <x-link :href="route('register')" class="text-primary-600 hover:text-primary-600-hover hover:underline">
+                    <x-link :href="route('register')" class="text-primary-600 hover:text-primary-500 hover:underline">
                         {{ __('pages/auth.register.page_title') }}
                     </x-link>
                     {{ __('pages/forum.collaborate_thread') }}
                 </p>
             @else
-                <div class="mt-10 flex items-center justify-between gap-x-12 text-gray-500 dark:text-gray-400">
+                <div class="mt-10 flex items-center justify-between gap-12">
                     <p class="text-sm text-gray-500 dark:text-gray-400">
                         {{ __('pages/forum.verify_account') }}
                     </p>
@@ -135,7 +139,7 @@ class="gap-2"
                         @csrf
                         <x-buttons.primary type="submit" class="px-3 py-2 gap-2">
                             {{ __('pages/forum.received_link') }}
-                            <x-heroicon-o-arrow-long-right class="size-5 text-gray-400 dar:text-gray-500" aria-hidden="true" />
+                            <x-heroicon-o-arrow-long-right class="size-5 text-gray-400 dark:text-gray-500" aria-hidden="true" />
                         </x-buttons.primary>
                     </form>
                 </div>
@@ -143,5 +147,7 @@ class="gap-2"
         @endcan
     </div>
 
-    <x-filament-actions::modals />
+    <template x-teleport="body">
+        <x-filament-actions::modals />
+    </template>
 </div>
diff --git a/resources/views/widgets/most_active_users_per_week.blade.php b/resources/views/widgets/most_active_users_per_week.blade.php
index 64b8a038..62e8d6da 100644
--- a/resources/views/widgets/most_active_users_per_week.blade.php
+++ b/resources/views/widgets/most_active_users_per_week.blade.php
@@ -7,7 +7,7 @@ class="inline-flex items-center rounded-full bg-green-100 px-2.5 py-0.5 text-xs
             {{ $users->count() }}
         </span>
     </div>
-    <div class="items-centerheroicon-o flex justify-between bg-skin-body px-4 py-3">
+    <div class="items-center heroicon-o flex justify-between bg-skin-body px-4 py-3">
         <span class="text-xs uppercase leading-4 tracking-wider text-gray-700 dark:text-gray-300">Utilisateur</span>
         <span class="text-xs uppercase leading-4 tracking-wider text-gray-700 dark:text-gray-300">Profil</span>
     </div>
diff --git a/routes/forum.php b/routes/forum.php
index 450b2b50..ba7b573d 100644
--- a/routes/forum.php
+++ b/routes/forum.php
@@ -9,5 +9,3 @@
 Route::get('/', Forum\Index::class)->name('index');
 Route::get('/channels/{channel}', [ThreadController::class, 'channel'])->name('channels');
 Route::get('/{thread}', Forum\DetailThread::class)->name('show');
-
-Route::get('/{thread}/edit', [ThreadController::class, 'edit'])->name('edit');
diff --git a/routes/web.php b/routes/web.php
index ec568836..20b2eb76 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -12,7 +12,6 @@
 use App\Http\Controllers\SlackController;
 use App\Http\Controllers\SponsoringController;
 use App\Http\Controllers\SubscriptionController;
-use App\Http\Controllers\ThreadController;
 use App\Http\Controllers\User;
 use Illuminate\Support\Facades\Route;
 
diff --git a/tests/Feature/Article/SendTelegramNotificationTest.php b/tests/Feature/Article/SendTelegramNotificationTest.php
index d8981622..3ffb2d4d 100644
--- a/tests/Feature/Article/SendTelegramNotificationTest.php
+++ b/tests/Feature/Article/SendTelegramNotificationTest.php
@@ -18,7 +18,7 @@
 
     $file = UploadedFile::fake()->image('article.png');
 
-    $article = Livewire::actingAs($this->user)->test(Create::class)
+    $article = Livewire::test(Create::class)
         ->set('title', 'Test Article')
         ->set('slug', 'test-article')
         ->set('body', 'This is a test article')
diff --git a/tests/Feature/Forum/ChannelTest.php b/tests/Feature/Forum/ChannelTest.php
index 86250d40..e6592390 100644
--- a/tests/Feature/Forum/ChannelTest.php
+++ b/tests/Feature/Forum/ChannelTest.php
@@ -21,4 +21,3 @@
         Channel::factory()->create(['parent_id' => $child->id]);
     })->throws(CannotAddChannelToChild::class);
 });
-
diff --git a/tests/Feature/Forum/DiscussionTest.php b/tests/Feature/Forum/DiscussionTest.php
index 9518fe55..95ce0ef3 100644
--- a/tests/Feature/Forum/DiscussionTest.php
+++ b/tests/Feature/Forum/DiscussionTest.php
@@ -35,21 +35,14 @@
 it('records activity when a discussion is created', function (): void {
     $user = $this->login();
 
-    $discussion = Discussion::factory()->create(['user_id' => $user->id]);
-
-    Activity::factory()->create([
-        'type' => 'created_discussion',
-        'user_id' => $user->id,
-        'subject_id' => $discussion->id,
-        'subject_type' => 'discussion',
-    ]);
+    $discussion = Discussion::factory(['user_id' => $user->id])->create();
 
     $activity = Activity::query()->first();
 
     $this->assertEquals($activity->subject->id, $discussion->id);
 
     $this->assertEquals($user->activities->count(), 1);
-})->skip();
+});
 
 it('generates a slug when valid url characters provided', function (): void {
     $discussion = Discussion::factory()->make(['slug' => 'Help with eloquent']);
diff --git a/tests/Feature/Forum/ReplyTest.php b/tests/Feature/Forum/ReplyTest.php
index 4de427f2..961d1de5 100644
--- a/tests/Feature/Forum/ReplyTest.php
+++ b/tests/Feature/Forum/ReplyTest.php
@@ -5,25 +5,16 @@
 use App\Models\Activity;
 use App\Models\Reply;
 use App\Models\Thread;
-use App\Models\User;
 
 it('records activity when a reply is send', function (): void {
-    $user = User::factory()->create();
-    $this->actingAs($user);
+    $user = $this->login();
 
     $thread = Thread::factory()->create();
     $reply = Reply::factory()->create(['user_id' => $user->id]);
     $reply->to($thread);
     $reply->save();
 
-    Activity::factory()->create([
-        'type' => 'created_reply',
-        'user_id' => $user->id,
-        'subject_id' => $reply->id,
-        'subject_type' => 'reply',
-    ]);
-
-    $activity = Activity::first();
+    $activity = Activity::query()->first();
 
     $this->assertEquals($activity->subject->id, $reply->id);
 
@@ -34,4 +25,4 @@
             ->count(),
         1
     );
-})->skip();
+});
diff --git a/tests/Feature/Forum/ThreadTest.php b/tests/Feature/Forum/ThreadTest.php
index aecac48e..08225e5c 100644
--- a/tests/Feature/Forum/ThreadTest.php
+++ b/tests/Feature/Forum/ThreadTest.php
@@ -6,9 +6,6 @@
 use App\Models\Channel;
 use App\Models\Reply;
 use App\Models\Thread;
-use App\Models\User;
-use Carbon\Carbon;
-use Illuminate\Support\Collection;
 
 it('can find by slug', function (): void {
     Thread::factory()->create(['slug' => 'foo']);
@@ -25,7 +22,7 @@
 
 test('html in excerpts is markdown converted', function (): void {
     /** @var Thread $thread */
-    $thread = Thread::factory()->make(['body' => '<p>Thread body</p>']);
+    $thread = Thread::factory()->make(['body' => 'Thread body']);
 
     expect($thread->excerpt())->toEqual("Thread body\n");
 });
diff --git a/tests/Feature/Livewire/Pages/Forum/DetailThreadTest.php b/tests/Feature/Livewire/Pages/Forum/DetailThreadTest.php
index b50ec120..b4942f16 100644
--- a/tests/Feature/Livewire/Pages/Forum/DetailThreadTest.php
+++ b/tests/Feature/Livewire/Pages/Forum/DetailThreadTest.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use App\Livewire\Forum\ReplyForm;
 use App\Livewire\Pages\Forum\DetailThread;
 use App\Models\Thread;
 use Livewire\Livewire;
@@ -34,3 +35,29 @@
     Livewire::test(DetailThread::class, ['thread' => $thread])
         ->assertActionHidden('delete');
 });
+
+it('can view the reply form when logged', function (): void {
+    $this->login();
+
+    $thread = Thread::factory()->create();
+
+    Livewire::test(DetailThread::class, ['thread' => $thread])
+        ->assertSee(__('pages/forum.answer_reply'));
+
+    Livewire::test(ReplyForm::class, ['thread' => $thread])
+        ->assertSuccessful();
+});
+
+it('user can reply to thread', function (): void {
+    $user = $this->login();
+    $thread = Thread::factory()->create();
+
+    Livewire::test(ReplyForm::class, ['thread' => $thread])
+        ->set('body', 'This is a reply body')
+        ->call('createReply');
+
+    expect($thread->replies->count())
+        ->toBe(1)
+        ->and($thread->replies->first()->user->id)
+        ->toBe($user->id);
+});
diff --git a/tests/Feature/Livewire/Pages/Forum/IndexTest.php b/tests/Feature/Livewire/Pages/Forum/IndexTest.php
index ed055a40..88dcd159 100644
--- a/tests/Feature/Livewire/Pages/Forum/IndexTest.php
+++ b/tests/Feature/Livewire/Pages/Forum/IndexTest.php
@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use App\Livewire\Components\Slideovers\ThreadForm;
 use App\Livewire\Pages\Forum\Index;
 use App\Models\Thread;
 use Livewire\Livewire;
diff --git a/tests/Feature/UserActivitiesTest.php b/tests/Feature/UserActivitiesTest.php
index 988cf4e0..a518252f 100644
--- a/tests/Feature/UserActivitiesTest.php
+++ b/tests/Feature/UserActivitiesTest.php
@@ -7,27 +7,27 @@
 use Carbon\Carbon;
 
 it('records activity when an article is created', function (): void {
-    $user = $this->createUser();
+    $user = $this->login();
 
-    $article = Article::factory()->create(['user_id' => $user->id]);
+    $article = Article::factory(['user_id' => $user->id])->create();
+    $activity = Activity::query()->first();
 
-    Activity::factory()->create([
-        'type' => 'created_article',
-        'user_id' => $user->id,
-        'subject_id' => $article->id,
-        'subject_type' => 'article',
-    ]);
-
-    $activity = Activity::first();
-
-    $this->assertEquals($activity->subject->id, $article->id);
-})->skip();
+    expect($activity->subject->id)
+        ->toEqual($article->id)
+        ->and(Activity::query()->count())
+        ->toEqual(1);
+});
 
 it('get feed from any user', function (): void {
-    $user = $this->createUser();
+    $user = $this->login();
+
+    Article::factory(['user_id' => $user->id])
+        ->count(2)
+        ->create();
 
-    Article::factory()->count(2)->create(['user_id' => $user->id]);
-    $user->activities()->first()->update(['created_at' => Carbon::now()->subWeek()]);
+    $user->activities()
+        ->first()
+        ->update(['created_at' => Carbon::now()->subWeek()]);
 
     $feed = Activity::feed($user);
 
@@ -38,4 +38,4 @@
     $this->assertFalse($feed->keys()->contains(
         Carbon::now()->subWeek()->format('Y-m-d')
     ));
-})->skip();
+});
diff --git a/tests/Pest.php b/tests/Pest.php
index eb3ae5c1..88ffc641 100644
--- a/tests/Pest.php
+++ b/tests/Pest.php
@@ -12,7 +12,7 @@
 uses(Tests\TestCase::class, RefreshDatabase::class)
     ->in('Feature');
 
-function createThreadFromToday(int $count = 1): Thread | Collection
+function createThreadFromToday(int $count = 1): Thread|Collection
 {
     $today = Carbon::now();
 

From 03100d2b3adfde083aa6470ea7a1c54b74fcdf5d Mon Sep 17 00:00:00 2001
From: Arthur Monney <monneylobe@gmail.com>
Date: Tue, 5 Nov 2024 00:26:45 +0100
Subject: [PATCH 8/8] feat: [LAR-28] update forum feature

---
 .../Commands/UpdateUserBestRepliesPoints.php  |  6 +-
 app/Http/Controllers/ThreadController.php     | 30 -------
 app/Livewire/{ => Components}/Forum/Reply.php |  4 +-
 .../{ => Components}/Forum/ReplyForm.php      |  4 +-
 .../{ => Components}/Forum/Subscribe.php      |  8 +-
 app/Livewire/Forum/EditThread.php             | 69 --------------
 app/Livewire/Pages/Forum/Channels.php         | 31 +++++++
 app/Livewire/Pages/Forum/Index.php            | 90 +++++++++++++++++--
 app/Models/Channel.php                        |  8 +-
 app/Models/Thread.php                         |  4 +-
 composer.json                                 |  1 +
 composer.lock                                 |  2 +-
 ..._description_columns_to_channels_table.php | 24 +++++
 lang/en/notifications.php                     |  2 +
 lang/en/pages/forum.php                       |  1 +
 lang/fr/notifications.php                     |  2 +
 lang/fr/pages/forum.php                       |  1 +
 .../components/forum/channels-grid.blade.php  | 29 ++++++
 .../views/components/forum/thread.blade.php   |  2 +-
 .../views/components/nav/forum-link.blade.php | 10 ++-
 resources/views/forum/_moderators.blade.php   | 36 --------
 resources/views/forum/_top-members.blade.php  |  0
 resources/views/forum/thread.blade.php        | 19 ----
 resources/views/layouts/forum.blade.php       | 59 +++++++++---
 .../forum/reply-form.blade.php                |  0
 .../{ => components}/forum/reply.blade.php    |  0
 .../forum/subscribe.blade.php                 |  0
 .../livewire/modals/delete-thread.blade.php   | 34 -------
 .../livewire/pages/forum/channels.blade.php   | 29 ++++++
 .../pages/forum/detail-thread.blade.php       |  6 +-
 .../livewire/pages/forum/index.blade.php      |  2 +-
 routes/forum.php                              |  3 +-
 .../Livewire/Pages/Forum/DetailThreadTest.php |  2 +-
 33 files changed, 283 insertions(+), 235 deletions(-)
 delete mode 100644 app/Http/Controllers/ThreadController.php
 rename app/Livewire/{ => Components}/Forum/Reply.php (96%)
 rename app/Livewire/{ => Components}/Forum/ReplyForm.php (96%)
 rename app/Livewire/{ => Components}/Forum/Subscribe.php (83%)
 delete mode 100644 app/Livewire/Forum/EditThread.php
 create mode 100644 app/Livewire/Pages/Forum/Channels.php
 create mode 100644 database/migrations/2024_11_04_194431_add_description_columns_to_channels_table.php
 create mode 100644 resources/views/components/forum/channels-grid.blade.php
 delete mode 100644 resources/views/forum/_moderators.blade.php
 delete mode 100644 resources/views/forum/_top-members.blade.php
 delete mode 100644 resources/views/forum/thread.blade.php
 rename resources/views/livewire/{ => components}/forum/reply-form.blade.php (100%)
 rename resources/views/livewire/{ => components}/forum/reply.blade.php (100%)
 rename resources/views/livewire/{ => components}/forum/subscribe.blade.php (100%)
 delete mode 100644 resources/views/livewire/modals/delete-thread.blade.php
 create mode 100644 resources/views/livewire/pages/forum/channels.blade.php

diff --git a/app/Console/Commands/UpdateUserBestRepliesPoints.php b/app/Console/Commands/UpdateUserBestRepliesPoints.php
index 7fc30bf3..afc4f842 100644
--- a/app/Console/Commands/UpdateUserBestRepliesPoints.php
+++ b/app/Console/Commands/UpdateUserBestRepliesPoints.php
@@ -7,6 +7,7 @@
 use App\Gamify\Points\BestReply;
 use App\Models\Thread;
 use Illuminate\Console\Command;
+use Illuminate\Support\Collection;
 
 final class UpdateUserBestRepliesPoints extends Command
 {
@@ -18,10 +19,11 @@ public function handle(): void
     {
         $this->info('Updating users bests replies reputations...');
 
-        $resolvedThread = Thread::resolved()->with('solutionReply')->get();
+        /** @var Collection | Thread[] $resolvedThread */
+        $resolvedThread = Thread::with('solutionReply')->scopes('resolved')->get();
 
         foreach ($resolvedThread as $thread) {
-            givePoint(new BestReply($thread->solutionReply));
+            givePoint(new BestReply($thread->solutionReply)); // @phpstan-ignore-line
         }
 
         $this->info('All done!');
diff --git a/app/Http/Controllers/ThreadController.php b/app/Http/Controllers/ThreadController.php
deleted file mode 100644
index c99cc495..00000000
--- a/app/Http/Controllers/ThreadController.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers;
-
-use App\Models\Channel;
-use App\Models\Thread;
-use Illuminate\Contracts\View\View;
-use Illuminate\Http\Request;
-
-final class ThreadController extends Controller
-{
-    public function __construct()
-    {
-        $this->middleware(['auth', 'verified'], ['only' => ['create', 'edit']]);
-    }
-
-    public function channel(Request $request, Channel $channel): View
-    {
-        $filter = getFilter('sortBy', ['recent', 'resolved', 'unresolved']);
-        $threads = Thread::forChannel($channel)
-            ->filter($request)
-            ->withviewscount()
-            ->orderByDesc('created_at')
-            ->paginate(10);
-
-        return view('forum.index', compact('channel', 'threads', 'filter'));
-    }
-}
diff --git a/app/Livewire/Forum/Reply.php b/app/Livewire/Components/Forum/Reply.php
similarity index 96%
rename from app/Livewire/Forum/Reply.php
rename to app/Livewire/Components/Forum/Reply.php
index 33c1f8c2..b63ecd57 100644
--- a/app/Livewire/Forum/Reply.php
+++ b/app/Livewire/Components/Forum/Reply.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Livewire\Forum;
+namespace App\Livewire\Components\Forum;
 
 use App\Gamify\Points\BestReply;
 use App\Models\Reply as ReplyModel;
@@ -83,6 +83,6 @@ public function solutionAction(): Action
     #[On('reply.save.{reply.id}')]
     public function render(): View
     {
-        return view('livewire.forum.reply');
+        return view('livewire.components.forum.reply');
     }
 }
diff --git a/app/Livewire/Forum/ReplyForm.php b/app/Livewire/Components/Forum/ReplyForm.php
similarity index 96%
rename from app/Livewire/Forum/ReplyForm.php
rename to app/Livewire/Components/Forum/ReplyForm.php
index 943d5a58..82731778 100644
--- a/app/Livewire/Forum/ReplyForm.php
+++ b/app/Livewire/Components/Forum/ReplyForm.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Livewire\Forum;
+namespace App\Livewire\Components\Forum;
 
 use App\Actions\Forum\CreateReplyAction;
 use App\Models\Reply;
@@ -116,6 +116,6 @@ public function updateReply(): void
 
     public function render(): View
     {
-        return view('livewire.forum.reply-form');
+        return view('livewire.components.forum.reply-form');
     }
 }
diff --git a/app/Livewire/Forum/Subscribe.php b/app/Livewire/Components/Forum/Subscribe.php
similarity index 83%
rename from app/Livewire/Forum/Subscribe.php
rename to app/Livewire/Components/Forum/Subscribe.php
index 9bcd4986..bcffadaa 100644
--- a/app/Livewire/Forum/Subscribe.php
+++ b/app/Livewire/Components/Forum/Subscribe.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Livewire\Forum;
+namespace App\Livewire\Components\Forum;
 
 use App\Actions\Forum\SubscribeToThreadAction;
 use App\Models\Thread;
@@ -23,7 +23,7 @@ public function subscribe(): void
         app(SubscribeToThreadAction::class)->execute($this->thread);
 
         Notification::make()
-            ->title(__('Vous êtes maintenant abonné à ce sujet.'))
+            ->title(__('notifications.thread.subscribe'))
             ->success()
             ->duration(5000)
             ->send();
@@ -40,7 +40,7 @@ public function unsubscribe(): void
             ->delete();
 
         Notification::make()
-            ->title(__('Vous vous êtes désabonné de ce sujet.'))
+            ->title(__('notifications.thread.unsubscribe'))
             ->success()
             ->duration(5000)
             ->send();
@@ -51,6 +51,6 @@ public function unsubscribe(): void
     #[On('subscription.update')]
     public function render(): View
     {
-        return view('livewire.forum.subscribe');
+        return view('livewire.components.forum.subscribe');
     }
 }
diff --git a/app/Livewire/Forum/EditThread.php b/app/Livewire/Forum/EditThread.php
deleted file mode 100644
index 45054180..00000000
--- a/app/Livewire/Forum/EditThread.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Livewire\Forum;
-
-use App\Models\Channel;
-use App\Models\Thread;
-use App\Traits\WithChannelsAssociation;
-use Illuminate\Contracts\View\View;
-use Livewire\Component;
-
-final class EditThread extends Component
-{
-    use WithChannelsAssociation;
-
-    public Thread $thread;
-
-    public string $title = '';
-
-    public string $body = '';
-
-    /**
-     * @var string[]
-     */
-    protected $listeners = ['markdown-x:update' => 'onMarkdownUpdate'];
-
-    /**
-     * @var string[]
-     */
-    protected $rules = [
-        'title' => 'required|max:75',
-        'body' => 'required',
-    ];
-
-    public function mount(Thread $thread): void
-    {
-        $this->title = $thread->title;
-        $this->body = $thread->body;
-        $this->associateChannels = $this->channels_selected = old('channels', $thread->channels()->pluck('id')->toArray());
-    }
-
-    public function onMarkdownUpdate(string $content): void
-    {
-        $this->body = $content;
-    }
-
-    public function store(): void
-    {
-        $this->validate();
-
-        $this->thread->update([
-            'title' => $this->title,
-            'slug' => $this->title,
-            'body' => $this->body,
-        ]);
-
-        $this->thread->syncChannels($this->associateChannels);
-
-        $this->redirectRoute('forum.show', $this->thread);
-    }
-
-    public function render(): View
-    {
-        return view('livewire.forum.edit-thread', [
-            'channels' => Channel::all(),
-        ]);
-    }
-}
diff --git a/app/Livewire/Pages/Forum/Channels.php b/app/Livewire/Pages/Forum/Channels.php
new file mode 100644
index 00000000..f9e98ed2
--- /dev/null
+++ b/app/Livewire/Pages/Forum/Channels.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Livewire\Pages\Forum;
+
+use App\Models\Channel;
+use Illuminate\Contracts\View\View;
+use Livewire\Attributes\Layout;
+use Livewire\Component;
+
+#[Layout('layouts.forum')]
+final class Channels extends Component
+{
+    public function render(): View
+    {
+        return view('livewire.pages.forum.channels', [
+            'channels' => Channel::query()
+                ->withCount('threads')
+                ->whereNull('parent_id')
+                ->get()
+                ->sortByDesc('threads_count'),
+            'childChannels' => Channel::query()
+                ->withCount('threads')
+                ->whereNotNull('parent_id')
+                ->get()
+                ->sortByDesc('threads_count'),
+        ])
+            ->title(__('pages/forum.navigation.channels'));
+    }
+}
diff --git a/app/Livewire/Pages/Forum/Index.php b/app/Livewire/Pages/Forum/Index.php
index 91b4a9e5..1ccdcd24 100644
--- a/app/Livewire/Pages/Forum/Index.php
+++ b/app/Livewire/Pages/Forum/Index.php
@@ -8,8 +8,10 @@
 use App\Models\Thread;
 use Illuminate\Contracts\View\View;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Auth;
 use Livewire\Attributes\Layout;
 use Livewire\Attributes\On;
+use Livewire\Attributes\Url;
 use Livewire\Component;
 use Livewire\WithoutUrlPagination;
 use Livewire\WithPagination;
@@ -20,12 +22,34 @@ final class Index extends Component
     use WithoutUrlPagination;
     use WithPagination;
 
+    #[Url(as: 'channel')]
+    public ?string $channel = null;
+
+    #[Url(as: 'solved')]
+    public ?string $solved = null;
+
+    #[Url(as: 'me')]
+    public ?string $user = null;
+
+    #[Url(as: 'no-replies')]
+    public ?string $unAnswered = null;
+
+    #[Url]
+    public ?string $subscribe = null;
+
     public ?Channel $currentChannel = null;
 
     public string $search = '';
 
     public int $perPage = 30;
 
+    public function mount(): void
+    {
+        if ($this->channel) {
+            $this->currentChannel = Channel::findBySlug($this->channel);
+        }
+    }
+
     #[On('channelUpdated')]
     public function reloadThreads(?int $channelId): void
     {
@@ -39,21 +63,71 @@ public function reloadThreads(?int $channelId): void
         $this->dispatch('render');
     }
 
-    public function render(): View
+    protected function applySearch(Builder $query): Builder
     {
-        $query = Thread::with('channels')
-            ->orderByDesc('created_at');
+        if ($this->search) {
+            return $query->where(function (Builder $query): void {
+                $query->where('title', 'like', '%'.$this->search.'%');
+            });
+        }
 
-        if ($this->currentChannel?->id) {
-            $query->scopes(['channel' => $this->currentChannel]);
+        return $query;
+    }
+
+    protected function applySolved(Builder $query): Builder
+    {
+        if ($this->solved) {
+            return match ($this->solved) {
+                'no' => $query->scopes('unresolved'),
+                'yes' => $query->scopes('resolved'),
+            };
         }
 
-        if ($this->search) {
-            $query->where(function (Builder $query): void {
-                $query->where('title', 'like', '%'.$this->search.'%');
+        return $query;
+    }
+
+    protected function applyAuthor(Builder $query): Builder
+    {
+        if (Auth::check() && $this->user) {
+            return $query->whereHas('user', function (Builder $query): void {
+                $query->where('user_id', Auth::id());
             });
         }
 
+        return $query;
+    }
+
+    protected function applyChannel(Builder $query): Builder
+    {
+        if ($this->currentChannel?->id) {
+            return $query->scopes(['channel' => $this->currentChannel]);
+        }
+
+        return $query;
+    }
+
+    protected function applySubscribe(Builder $query): Builder
+    {
+        return $query;
+    }
+
+    protected function applyUnAnswer(Builder $query): Builder
+    {
+        return $query;
+    }
+
+    public function render(): View
+    {
+        $query = Thread::with('channels')
+            ->orderByDesc('created_at');
+
+        $query = $this->applyChannel($query);
+        $query = $this->applySearch($query);
+        $query = $this->applySolved($query);
+        $query = $this->applyAuthor($query);
+        $query = $this->applySubscribe($query);
+        $query = $this->applyUnAnswer($query);
+
         $threads = $query
             ->scopes('withViewsCount')
             ->paginate($this->perPage);
diff --git a/app/Models/Channel.php b/app/Models/Channel.php
index aec67d7f..a8d7853a 100644
--- a/app/Models/Channel.php
+++ b/app/Models/Channel.php
@@ -11,11 +11,13 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Spatie\Translatable\HasTranslations;
 
 /**
  * @property-read int $id
  * @property string $name
  * @property string $slug
+ * @property array $description
  * @property string $color
  * @property int | null $parent_id
  */
@@ -23,17 +25,17 @@ final class Channel extends Model
 {
     use HasFactory;
     use HasSlug;
+    use HasTranslations;
 
     protected $fillable = [
         'name',
         'slug',
+        'description',
         'parent_id',
         'color',
     ];
 
-    protected $withCount = [
-        'threads',
-    ];
+    public array $translatable = ['description'];
 
     protected static function boot(): void
     {
diff --git a/app/Models/Thread.php b/app/Models/Thread.php
index 91617bb1..91db05a1 100644
--- a/app/Models/Thread.php
+++ b/app/Models/Thread.php
@@ -46,7 +46,7 @@
  * @property int | null $resolved_by
  * @property User | null $resolvedBy
  * @property User $user
- * @property Reply $solutionReply
+ * @property Reply | null $solutionReply
  * @property \Illuminate\Database\Eloquent\Collection | Channel[] $channels
  */
 final class Thread extends Model implements Feedable, ReactableInterface, ReplyInterface, SubscribeInterface, Viewable
@@ -94,7 +94,7 @@ public function replyAbleSubject(): string
 
     public function getPathUrl(): string
     {
-        return '/forum/'.$this->slug();
+        return route('forum.show', $this->slug());
     }
 
     public function excerpt(int $limit = 200): string
diff --git a/composer.json b/composer.json
index 65066a11..e32f847c 100644
--- a/composer.json
+++ b/composer.json
@@ -43,6 +43,7 @@
     "spatie/laravel-medialibrary": "^10.10.0",
     "spatie/laravel-permission": "^5.10.1",
     "spatie/laravel-sitemap": "^6.3.1",
+    "spatie/laravel-translatable": "^6.8",
     "stevebauman/location": "^6.6.2",
     "symfony/http-client": "^6.3.1",
     "symfony/mailgun-mailer": "^6.3",
diff --git a/composer.lock b/composer.lock
index fda0c1b8..de7211f1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0efc9d1d67bfc842186d5b7a908935c4",
+    "content-hash": "c894b3d2be13a5dd5f1e496299b2d0f0",
     "packages": [
         {
             "name": "abraham/twitteroauth",
diff --git a/database/migrations/2024_11_04_194431_add_description_columns_to_channels_table.php b/database/migrations/2024_11_04_194431_add_description_columns_to_channels_table.php
new file mode 100644
index 00000000..b236c930
--- /dev/null
+++ b/database/migrations/2024_11_04_194431_add_description_columns_to_channels_table.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('channels', static function (Blueprint $table): void {
+            $table->json('description')->nullable();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('channels', function (Blueprint $table): void {
+            $table->dropColumn('description');
+        });
+    }
+};
diff --git a/lang/en/notifications.php b/lang/en/notifications.php
index 0dcf61d5..91ddd4b9 100644
--- a/lang/en/notifications.php
+++ b/lang/en/notifications.php
@@ -13,6 +13,8 @@
         'updated' => 'Thread was successfully updated.',
         'deleted' => 'Thread was successfully deleted.',
         'best_reply' => 'You have accepted this solution as the best answer for this thread.',
+        'subscribe' => 'You are now subscribed to this thread.',
+        'unsubscribe' => 'You have unsubscribed from this thread.',
     ],
 
     'exceptions' => [
diff --git a/lang/en/pages/forum.php b/lang/en/pages/forum.php
index dd7824ab..4efa3b0d 100644
--- a/lang/en/pages/forum.php
+++ b/lang/en/pages/forum.php
@@ -39,5 +39,6 @@
     'report_spam' => 'Report spam',
     'max_thread_length' => '100 characters maximum',
     'answer_reply' => 'Answer to',
+    'threads_count' => ':count messages',
 
 ];
diff --git a/lang/fr/notifications.php b/lang/fr/notifications.php
index f2f925ef..dbdead6b 100644
--- a/lang/fr/notifications.php
+++ b/lang/fr/notifications.php
@@ -13,6 +13,8 @@
         'updated' => 'Votre sujet à été modifié.',
         'deleted' => 'Le sujet a été supprimé.',
         'best_reply' => 'Vous avez accepté cette solution comme meilleure réponse pour ce sujet.',
+        'subscribe' => 'Vous êtes maintenant abonné à ce sujet.',
+        'unsubscribe' => 'Vous vous êtes désabonné de ce sujet.',
     ],
 
     'exceptions' => [
diff --git a/lang/fr/pages/forum.php b/lang/fr/pages/forum.php
index fb22b526..fff63c38 100644
--- a/lang/fr/pages/forum.php
+++ b/lang/fr/pages/forum.php
@@ -39,5 +39,6 @@
     'report_spam' => 'Signaler un spam',
     'max_thread_length' => 'Maximum de 100 caractères.',
     'answer_reply' => 'Répondre au sujet',
+    'threads_count' => ':count messages',
 
 ];
diff --git a/resources/views/components/forum/channels-grid.blade.php b/resources/views/components/forum/channels-grid.blade.php
new file mode 100644
index 00000000..fe97956f
--- /dev/null
+++ b/resources/views/components/forum/channels-grid.blade.php
@@ -0,0 +1,29 @@
+@props([
+    'channels',
+])
+
+<div {{ $attributes->twMerge(['class' => 'mt-5 grid gap-4 lg:grid-cols-2']) }}>
+    @foreach($channels as $channel)
+        <div class="relative rounded-lg transition bg-white duration-200 ease-in-out ring-1 ring-gray-200/70 dark:ring-gray-800 dark:bg-gray-800 px-4 py-3 hover:ring-gray-200 dark:hover:ring-white/20 lg:px-5">
+            <header class="flex items-center">
+                <div class="flex flex-1 items-center gap-2">
+                    @if($channel->color)
+                        <span class="block h-4 w-1 rounded-full" style="background-color: {{ $channel->color }}"></span>
+                    @endif
+                    <x-link href="{{ route('forum.index') }}?channel={{ $channel->slug }}">
+                        <span class="font-medium text-gray-700 dark:text-white">{{ $channel->name }}</span>
+                        <span class="absolute inset-0"></span>
+                    </x-link>
+                </div>
+                <span class="text-xs font-mono leading-5 text-gray-400 dark:text-gray-500">
+                    {{ __('pages/forum.threads_count', ['count' => $channel->threads_count]) }}
+                </span>
+            </header>
+            @if($channel->description)
+                <p class="mt-4 text-xs text-gray-500 dark:text-gray-400">
+                    {{ $channel->description }}
+                </p>
+            @endif
+        </div>
+    @endforeach
+</div>
diff --git a/resources/views/components/forum/thread.blade.php b/resources/views/components/forum/thread.blade.php
index b7a9a6d1..9c47a765 100644
--- a/resources/views/components/forum/thread.blade.php
+++ b/resources/views/components/forum/thread.blade.php
@@ -2,7 +2,7 @@
     'thread',
 ])
 
-<article class="rounded-xl cursor-pointer bg-white p-4 ring-1 ring-inset ring-gray-200/60 transition duration-200 ease-in-out dark:bg-gray-800 dark:ring-white/10 dark:hover:bg-white/10 lg:py-5 lg:px-6" aria-labelledby="{{ $thread->slug }}">
+<article class="rounded-xl cursor-pointer bg-white p-4 ring-1 ring-inset ring-gray-200/60 transition duration-200 ease-in-out dark:bg-gray-800 dark:ring-gray-800 dark:hover:bg-white/10 lg:py-5 lg:px-6" aria-labelledby="{{ $thread->slug }}">
     <x-forum.thread-channels :thread="$thread" />
 
     <div class="flex items-center gap-4">
diff --git a/resources/views/components/nav/forum-link.blade.php b/resources/views/components/nav/forum-link.blade.php
index 8ef5740f..2ac67ef5 100644
--- a/resources/views/components/nav/forum-link.blade.php
+++ b/resources/views/components/nav/forum-link.blade.php
@@ -6,8 +6,12 @@
 
 @php
     $activeClasses = $active
-        ? 'ring-1 ring-gray-200 bg-gray-100 dark:bg-gray-800 dark:ring-white/10'
-        : 'text-gray-600 hover:text-gray-900 hover:bg-gray-100 dark:text-gray-400 dark:hover:bg-gray-800 dark:hover:text-white';
+        ? 'ring-1 ring-gray-200 text-gray-900 bg-gray-100 dark:bg-gray-800 dark:text-white dark:ring-white/10'
+        : 'text-gray-500 hover:text-gray-900 hover:bg-gray-100 dark:text-gray-400 dark:hover:bg-gray-800 dark:hover:text-white';
+
+    $iconClasses = $active
+        ? 'size-5 text-primary-600 dark:text-primary-500'
+        : 'size-5 text-gray-400 dark:text-gray-500';
 @endphp
 
 <x-link
@@ -20,7 +24,7 @@
     @if($icon instanceof \Illuminate\View\ComponentAttributeBag)
         {{ $icon }}
     @else
-        @svg($icon, 'size-5 text-gray-400 dark:text-gray-500', ['stroke-width' => '1.5', 'aria-hidden' => true])
+        @svg($icon, $iconClasses, ['stroke-width' => '1.5', 'aria-hidden' => true])
     @endif
     {{ $slot }}
 </x-link>
diff --git a/resources/views/forum/_moderators.blade.php b/resources/views/forum/_moderators.blade.php
deleted file mode 100644
index 26ea3d9c..00000000
--- a/resources/views/forum/_moderators.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<section aria-labelledby="moderators-title">
-    <div class="overflow-hidden rounded-xl bg-skin-card shadow">
-        <div class="p-6">
-            <h2 class="font-heading text-base font-medium text-gray-900" id="moderators-title">Modérateurs</h2>
-            <div class="mt-6 flow-root">
-                <ul role="list" class="-my-5 divide-y divide-skin-base">
-                    @foreach ($moderators as $moderator)
-                        <li class="py-4">
-                            <div class="flex items-center space-x-4">
-                                <div class="shrink-0">
-                                    <x-user.avatar :user="$moderator" class="size-8" />
-                                </div>
-                                <div class="min-w-0 flex-1">
-                                    <p class="truncate text-sm font-medium text-gray-900">
-                                        {{ $moderator->name }}
-                                    </p>
-                                    <p class="truncate text-sm text-gray-500 dark:text-gray-400">
-                                        {{ '@' . $moderator->username }}
-                                    </p>
-                                </div>
-                                <div>
-                                    <a
-                                        href="{{ route('profile', $moderator->username) }}"
-                                        class="inline-flex items-center rounded-full border border-skin-base bg-skin-card px-2.5 py-0.5 text-sm font-medium leading-5 text-gray-700 dark:text-gray-300 shadow-sm hover:bg-skin-footer"
-                                    >
-                                        Voir
-                                    </a>
-                                </div>
-                            </div>
-                        </li>
-                    @endforeach
-                </ul>
-            </div>
-        </div>
-    </div>
-</section>
diff --git a/resources/views/forum/_top-members.blade.php b/resources/views/forum/_top-members.blade.php
deleted file mode 100644
index e69de29b..00000000
diff --git a/resources/views/forum/thread.blade.php b/resources/views/forum/thread.blade.php
deleted file mode 100644
index ebfb41fe..00000000
--- a/resources/views/forum/thread.blade.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<x-app-layout :title="$thread->subject()" :canonical="route('forum.show', $thread)">
-    <x-container class="py-12">
-        <div class="relative lg:grid lg:grid-cols-9 lg:gap-10">
-            <div class="lg:col-span-7 lg:border-l lg:border-skin-base lg:pl-8">
-                <x-forum.thread :thread="$thread" />
-
-                @if ($thread->replies->isNotEmpty())
-                    <div class="mt-10">
-                        <ul class="space-y-8 sm:px-4" role="list">
-                            @foreach ($thread->replies as $reply)
-                                <livewire:forum.reply wire:key="$reply->id" :thread="$thread" :reply="$reply" />
-                            @endforeach
-                        </ul>
-                    </div>
-                @endif
-            </div>
-        </div>
-    </x-container>
-</x-app-layout>
diff --git a/resources/views/layouts/forum.blade.php b/resources/views/layouts/forum.blade.php
index b654d8e5..b33b0b94 100644
--- a/resources/views/layouts/forum.blade.php
+++ b/resources/views/layouts/forum.blade.php
@@ -15,28 +15,63 @@
                         <x-nav.forum-link :href="route('forum.index')" icon="untitledui-file-02">
                             {{ __('pages/forum.navigation.threads') }}
                         </x-nav.forum-link>
-                        <x-nav.forum-link icon="untitledui-git-branch">
+                        <x-nav.forum-link
+                            :href="route('forum.channels')"
+                            :active="request()->routeIs('forum.channels')"
+                            icon="untitledui-git-branch"
+                        >
                             {{ __('pages/forum.navigation.channels') }}
                         </x-nav.forum-link>
-                        <x-nav.forum-link icon="untitledui-user-left">
-                            {{ __('pages/forum.navigation.me') }}
-                        </x-nav.forum-link>
-                        <x-nav.forum-link icon="untitledui-bell-ringing-03">
-                            {{ __('pages/forum.navigation.following') }}
-                        </x-nav.forum-link>
-                        <x-nav.forum-link icon="untitledui-heart">
+                        @auth
+                            <x-nav.forum-link
+                                :href="route('forum.index') . '?me=true'"
+                                :active="request()->getUri() === route('forum.index') . '?me=true'"
+                                icon="untitledui-user-left"
+                            >
+                                {{ __('pages/forum.navigation.me') }}
+                            </x-nav.forum-link>
+                            <x-nav.forum-link
+                                :href="route('forum.index') . '?follow=true'"
+                                :active="request()->getUri() === route('forum.index') . '?follow=true'"
+                                icon="untitledui-bell-ringing-03"
+                            >
+                                {{ __('pages/forum.navigation.following') }}
+                            </x-nav.forum-link>
+                        @endauth
+                        <x-nav.forum-link
+                            :href="route('forum.index') . '?popular=true'"
+                            :active="request()->getUri() === route('forum.index') . '?popular=true'"
+                            icon="untitledui-heart"
+                            class="hidden"
+                        >
                             {{ __('pages/forum.navigation.popular') }}
                         </x-nav.forum-link>
-                        <x-nav.forum-link icon="untitledui-check-verified">
+                        <x-nav.forum-link
+                            :href="route('forum.index') . '?solved=yes'"
+                            :active="request()->getUri() === route('forum.index') . '?solved=yes'"
+                            icon="untitledui-check-verified"
+                        >
                             {{ __('pages/forum.navigation.solve') }}
                         </x-nav.forum-link>
-                        <x-nav.forum-link icon="untitledui-help-circle">
+                        <x-nav.forum-link
+                            :href="route('forum.index') . '?solved=no'"
+                            :active="request()->getUri() === route('forum.index') . '?solved=no'"
+                            icon="untitledui-help-circle"
+                        >
                             {{ __('pages/forum.navigation.unresolved') }}
                         </x-nav.forum-link>
-                        <x-nav.forum-link icon="untitledui-message-x-square">
+                        <x-nav.forum-link
+                            :href="route('forum.index') . '?no-replies=true'"
+                            :active="request()->getUri() === route('forum.index') . '?no-replies'"
+                            icon="untitledui-message-x-square"
+                        >
                             {{ __('pages/forum.navigation.no_reply') }}
                         </x-nav.forum-link>
-                        <x-nav.forum-link icon="untitledui-trophy-02">
+                        <x-nav.forum-link
+                            :active="request()->routeIs('forum.leaderboard')"
+                            icon="untitledui-trophy-02"
+                            class="hidden"
+                        >
                             {{ __('pages/forum.navigation.leaderboard') }}
                         </x-nav.forum-link>
                     </div>
diff --git a/resources/views/livewire/forum/reply-form.blade.php b/resources/views/livewire/components/forum/reply-form.blade.php
similarity index 100%
rename from resources/views/livewire/forum/reply-form.blade.php
rename to resources/views/livewire/components/forum/reply-form.blade.php
diff --git a/resources/views/livewire/forum/reply.blade.php b/resources/views/livewire/components/forum/reply.blade.php
similarity index 100%
rename from resources/views/livewire/forum/reply.blade.php
rename to resources/views/livewire/components/forum/reply.blade.php
diff --git a/resources/views/livewire/forum/subscribe.blade.php b/resources/views/livewire/components/forum/subscribe.blade.php
similarity index 100%
rename from resources/views/livewire/forum/subscribe.blade.php
rename to resources/views/livewire/components/forum/subscribe.blade.php
diff --git a/resources/views/livewire/modals/delete-thread.blade.php b/resources/views/livewire/modals/delete-thread.blade.php
deleted file mode 100644
index 9689fea3..00000000
--- a/resources/views/livewire/modals/delete-thread.blade.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<x-modal footerClasses="px-4 pb-5 sm:px-4 sm:flex sm:flex-row-reverse">
-    <x-slot name="content">
-        <div class="sm:flex sm:items-start">
-            <div
-                class="mx-auto flex size-12 shrink-0 items-center justify-center rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10"
-            >
-                <x-untitledui-alert-triangle class="size-6 text-red-600" />
-            </div>
-            <div class="mt-3 text-center sm:ml-4 sm:mt-0 sm:text-left">
-                <h3 class="font-heading text-lg font-medium leading-6 text-gray-900" id="modal-headline">
-                    Supprimer ce sujet
-                </h3>
-                <div class="mt-2">
-                    <p class="text-sm leading-5 text-gray-500 dark:text-gray-400">
-                        Voulez-vous vraiment supprimer ce sujet ? Toutes les réponses seront supprimées cette action est
-                        irréversible.
-                    </p>
-                </div>
-            </div>
-        </div>
-    </x-slot>
-
-    <x-slot name="buttons">
-        <span class="flex w-full rounded-md shadow-sm sm:ml-3 sm:w-auto">
-            <x-danger-button wire:click="delete" type="button">
-                <x-loader class="text-white" wire:loading wire:target="delete" />
-                Confirmer
-            </x-danger-button>
-        </span>
-        <span class="mt-3 flex w-full rounded-md shadow-sm sm:mt-0 sm:w-auto">
-            <x-default-button wire:click="$dispatch('closeModal')" type="button">Annuler</x-default-button>
-        </span>
-    </x-slot>
-</x-modal>
diff --git a/resources/views/livewire/pages/forum/channels.blade.php b/resources/views/livewire/pages/forum/channels.blade.php
new file mode 100644
index 00000000..6ece67ed
--- /dev/null
+++ b/resources/views/livewire/pages/forum/channels.blade.php
@@ -0,0 +1,29 @@
+<div>
+    <x-slot:buttons>
+        <x-buttons.primary
+            type="button"
+            onclick="Livewire.dispatch('openPanel', { component: 'components.slideovers.thread-form' })"
+            class="gap-2 w-full justify-center py-2.5"
+        >
+            {{ __('pages/forum.new_thread') }}
+            <span class="absolute pointer-events-none right-0 pr-3">
+                <x-untitledui-plus class="size-5" aria-hidden="true" />
+            </span>
+        </x-buttons.primary>
+    </x-slot:buttons>
+
+    <div>
+        <div>
+            <h1 class="text-xl font-bold font-heading text-gray-900 dark:text-white lg:text-2xl">
+                {{ __('Les plus gros channels') }}
+            </h1>
+            <x-forum.channels-grid :channels="$channels" />
+        </div>
+        <div class="mt-10">
+            <h1 class="text-xl font-bold font-heading text-gray-900 dark:text-white lg:text-2xl">
+                {{ __('Les autres channels') }}
+            </h1>
+            <x-forum.channels-grid :channels="$childChannels" />
+        </div>
+    </div>
+</div>
diff --git a/resources/views/livewire/pages/forum/detail-thread.blade.php b/resources/views/livewire/pages/forum/detail-thread.blade.php
index fbd30fb4..ac5707f4 100644
--- a/resources/views/livewire/pages/forum/detail-thread.blade.php
+++ b/resources/views/livewire/pages/forum/detail-thread.blade.php
@@ -10,7 +10,7 @@ class="gap-2 w-full justify-center py-2.5"
             </x-buttons.primary>
 
             @auth
-                <livewire:forum.subscribe :thread="$thread" />
+                <livewire:components.forum.subscribe :thread="$thread" />
             @endauth
         </div>
     </x-slot:buttons>
@@ -90,7 +90,7 @@ class="mt-5 prose prose-primary !prose-heading-off max-w-none text-gray-500 dark
 
                 @if ($thread->replies->isNotEmpty())
                     @foreach ($thread->replies as $reply)
-                        <livewire:forum.reply wire:key="$reply->id" :thread="$thread" :reply="$reply" />
+                        <livewire:components.forum.reply wire:key="$reply->id" :thread="$thread" :reply="$reply" />
                     @endforeach
                 @endif
             </div>
@@ -114,7 +114,7 @@ class="gap-2"
                     </p>
                 </x-info-panel>
             @else
-                <livewire:forum.reply-form :thread="$thread" />
+                <livewire:components.forum.reply-form :thread="$thread" />
             @endif
         @else
             @guest
diff --git a/resources/views/livewire/pages/forum/index.blade.php b/resources/views/livewire/pages/forum/index.blade.php
index 5d6d4806..9abc471b 100644
--- a/resources/views/livewire/pages/forum/index.blade.php
+++ b/resources/views/livewire/pages/forum/index.blade.php
@@ -13,7 +13,7 @@ class="gap-2 w-full justify-center py-2.5"
     </x-slot:buttons>
 
     <div class="flex items-center justify-between gap-6">
-        <livewire:components.channels-selector />
+        <livewire:components.channels-selector :slug="$channel" />
 
         <x-filament::input.wrapper class="relative max-w-60 w-full">
             <span class="pointer-events-none absolute top-2.5 left-0 pl-2.5">
diff --git a/routes/forum.php b/routes/forum.php
index ba7b573d..7d97be21 100644
--- a/routes/forum.php
+++ b/routes/forum.php
@@ -2,10 +2,9 @@
 
 declare(strict_types=1);
 
-use App\Http\Controllers\ThreadController;
 use App\Livewire\Pages\Forum;
 use Illuminate\Support\Facades\Route;
 
 Route::get('/', Forum\Index::class)->name('index');
-Route::get('/channels/{channel}', [ThreadController::class, 'channel'])->name('channels');
+Route::get('/channels', Forum\Channels::class)->name('channels');
 Route::get('/{thread}', Forum\DetailThread::class)->name('show');
diff --git a/tests/Feature/Livewire/Pages/Forum/DetailThreadTest.php b/tests/Feature/Livewire/Pages/Forum/DetailThreadTest.php
index b4942f16..e6ef6cf1 100644
--- a/tests/Feature/Livewire/Pages/Forum/DetailThreadTest.php
+++ b/tests/Feature/Livewire/Pages/Forum/DetailThreadTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use App\Livewire\Forum\ReplyForm;
+use App\Livewire\Components\Forum\ReplyForm;
 use App\Livewire\Pages\Forum\DetailThread;
 use App\Models\Thread;
 use Livewire\Livewire;