Migrate to livewire v3 (#140)

* wip

* Fix code styling

* Update to livewire 3 and refactor components

* Fix code styling

* Fix phpstan error

---------

Co-authored-by: mckenziearts <mckenziearts@users.noreply.github.com>

Author: mckenziearts

.prettierignore

@@ -0,0 +1,7 @@
+node_modules
+/vendor
+/public
+.git
+package-lock.json
+yarn.lock
+composer.lock

.prettierrc

@@ -0,0 +1,22 @@
+{
+    "printWidth": 120,
+    "semi": false,
+    "singleQuote": true,
+    "tabWidth": 4,
+    "tailwindConfig": "./tailwind.config.js",
+    "trailingComma": "all",
+    "plugins": [
+        "prettier-plugin-blade",
+        "prettier-plugin-tailwindcss"
+    ],
+    "overrides": [
+        {
+            "files": [
+                "*.blade.php"
+            ],
+            "options": {
+                "parser": "blade"
+            }
+        }
+    ]
+}

README.md

@@ -55,12 +55,12 @@ The following tools are required in order to start the installation.
 
 Vous pouvez maintenant visiter l'application dans votre navigateur en visitant [http://laravel.cm.test](http://laravel.cm.test). Si vous avez amorcé la base de données, vous pouvez vous connecter à un compte de test avec ** `johndoe` ** & **` password` **.
 
-Une fois que vous avez installé et configuré, pour avoir des dummy data vous devez exécuter la commande
+Une fois que vous avez installé et configuré, pour avoir des dummy data, vous devez exécuter la commande
 ```shell
 php artisan db:seed --class=DummyDatabaseSeeder
 ```
 
-### Github Authentication (optionnel)
+### GitHub Authentication (optionnel)
 Pour que l'authentification Github fonctionne localement, vous devez [enregistrer une nouvelle application OAuth sur Github](https://github.com/settings/applications/new). Utilisez `http://laravel.cm.test` pour l'URL de la page d'accueil et `http://laravel.cm.test/auth/github` pour l'URL de rappel. Lorsque vous avez créé l'application, remplissez l'ID et le secret dans votre fichier `.env` dans les variables d'environnement ci-dessous. Vous devriez maintenant pouvoir vous authentifier avec Github.
 
 ```shell
@@ -110,7 +110,7 @@ Veuillez lire notre [Code de conduite](CODE_OF_CONDUCT.md) avant de contribuer o
 
 ## Vulnérabilités de sécurité
 
-Si vous découvrez une faille de sécurité dans Laravel.cm, veuillez envoyer un e-mail immédiatement à [contact@arthurmonney.me](mailto:contact@arthurmonney.me). **Ne créez pas de problème pour la vulnérabilité.**
+Si vous découvrez une faille de sécurité dans Laravel.cm, veuillez envoyer un e-mail immédiatement à [support@laravel.cm](mailto:support@laravel.cm). **Ne créez pas de problème pour la vulnérabilité.**
 
 ## License
 

app/Http/Kernel.php

@@ -10,23 +10,23 @@ final class Kernel extends HttpKernel
 {
     protected $middleware = [
         // \App\Http\Middleware\TrustHosts::class,
-        \App\Http\Middleware\TrustProxies::class,
-        \App\Http\Middleware\HttpsProtocol::class,
+        Middleware\TrustProxies::class,
+        Middleware\HttpsProtocol::class,
         \Illuminate\Http\Middleware\HandleCors::class,
-        \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
+        Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \App\Http\Middleware\TrimStrings::class,
+        Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
     ];
 
     protected $middlewareGroups = [
         'web' => [
-            \App\Http\Middleware\EncryptCookies::class,
+            Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
+            Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
@@ -38,11 +38,11 @@ final class Kernel extends HttpKernel
     ];
 
     protected $routeMiddleware = [
-        'auth' => \App\Http\Middleware\Authenticate::class,
+        'auth' => Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'guest' => Middleware\RedirectIfAuthenticated::class,
         'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,

app/Http/Livewire/Articles/Browse.php renamed to app/Livewire/Articles/Browse.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Livewire\Articles;
+namespace App\Livewire\Articles;
 
 use App\Models\Article;
 use App\Models\Tag;

app/Http/Livewire/Articles/Create.php renamed to app/Livewire/Articles/Create.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Livewire\Articles;
+namespace App\Livewire\Articles;
 
 use App\Events\ArticleWasSubmittedForApproval;
 use App\Gamify\Points\PostCreated;

app/Http/Livewire/Articles/Edit.php renamed to app/Livewire/Articles/Edit.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Livewire\Articles;
+namespace App\Livewire\Articles;
 
 use App\Models\Article;
 use App\Models\Tag;

app/Http/Livewire/Discussions/AddComment.php renamed to app/Livewire/Discussions/AddComment.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Livewire\Discussions;
+namespace App\Livewire\Discussions;
 
 use App\Actions\Replies\CreateReply;
 use App\Models\Discussion;
@@ -20,11 +20,6 @@ final class AddComment extends Component
 
     public string $body = '';
 
-    /**
-     * @var string[]
-     */
-    protected $listeners = ['reloadComment' => '$refresh'];
-
     public function mount(Discussion $discussion): void
     {
         $this->discussion = $discussion;
@@ -39,11 +34,9 @@ public function saveComment(): void
 
         $comment = CreateReply::run($this->body, auth()->user(), $this->discussion);
 
-        $this->emitSelf('reloadComment');
-
-        $this->emitUp('reloadComments');
+        $this->dispatch('$refresh')->self();
 
-        $this->dispatchBrowserEvent('scrollToComment', ['id' => $comment->id]);
+        $this->dispatch('scrollToComment', ['id' => $comment->id]);
 
         Notification::make()
             ->title(__('Votre commentaire a été ajouté!'))

app/Http/Livewire/Discussions/Browse.php renamed to app/Livewire/Discussions/Browse.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Livewire\Discussions;
+namespace App\Livewire\Discussions;
 
 use App\Models\Discussion;
 use App\Models\Tag;

app/Http/Livewire/Discussions/Comment.php renamed to app/Livewire/Discussions/Comment.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Livewire\Discussions;
+namespace App\Livewire\Discussions;
 
 use App\Actions\Replies\LikeReply;
 use App\Models\Reply;
@@ -15,11 +15,6 @@ final class Comment extends Component
 {
     public Reply $comment;
 
-    /**
-     * @var string[]
-     */
-    protected $listeners = ['reloadComment' => '$refresh'];
-
     public function delete(): void
     {
         $this->comment->delete();
@@ -30,7 +25,7 @@ public function delete(): void
             ->duration(5000)
             ->send();
 
-        $this->emitUp('reloadComment');
+        $this->dispatch('reloadComment');
     }
 
     public function toggleLike(): void
@@ -47,7 +42,7 @@ public function toggleLike(): void
 
         LikeReply::run(auth()->user(), $this->comment);
 
-        $this->emitSelf('reloadComment');
+        $this->dispatch('reloadComment')->self();
     }
 
     public function render(): View

app/Http/Livewire/Discussions/Comments.php renamed to app/Livewire/Discussions/Comments.php

@@ -2,23 +2,19 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Livewire\Discussions;
+namespace App\Livewire\Discussions;
 
 use App\Models\Discussion;
 use App\Models\Reply;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Collection;
+use Livewire\Attributes\On;
 use Livewire\Component;
 
 final class Comments extends Component
 {
     public Discussion $discussion;
 
-    /**
-     * @var string[]
-     */
-    public $listeners = ['reloadComments' => '$refresh'];
-
     public function mount(Discussion $discussion): void
     {
         $this->discussion = $discussion;
@@ -42,6 +38,7 @@ public function getCommentsProperty(): Collection
         return $replies;
     }
 
+    #[On('reloadComments')]
     public function render(): View
     {
         return view('livewire.discussions.comments');

app/Http/Livewire/Discussions/Create.php renamed to app/Livewire/Discussions/Create.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Livewire\Discussions;
+namespace App\Livewire\Discussions;
 
 use App\Gamify\Points\DiscussionCreated;
 use App\Models\Discussion;

app/Http/Livewire/Discussions/Edit.php renamed to app/Livewire/Discussions/Edit.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Livewire\Discussions;
+namespace App\Livewire\Discussions;
 
 use App\Models\Discussion;
 use App\Models\Tag;

app/Http/Livewire/Discussions/Subscribe.php renamed to app/Livewire/Discussions/Subscribe.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Livewire\Discussions;
+namespace App\Livewire\Discussions;
 
 use App\Models\Discussion;
 use App\Models\Subscribe as SubscribeModel;
@@ -41,7 +41,7 @@ public function subscribe(): void
             ->duration(5000)
             ->send();
 
-        $this->emitSelf('refresh');
+        $this->dispatch('refresh')->self();
     }
 
     public function unsubscribe(): void
@@ -59,7 +59,7 @@ public function unsubscribe(): void
             ->duration(5000)
             ->send();
 
-        $this->emitSelf('refresh');
+        $this->dispatch('refresh')->self();
     }
 
     public function render(): View

app/Http/Livewire/Editor.php renamed to app/Livewire/Editor.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use App\Markdown\MarkdownHelper;
 use Illuminate\Contracts\View\View;
@@ -31,12 +31,12 @@ public function getPreviewProperty(): string
 
     public function preview(): void
     {
-        $this->emit('previewRequested');
+        $this->dispatch('previewRequested');
     }
 
     public function updatedBody(): void
     {
-        $this->emitUp('editor:update', $this->body);
+        $this->dispatch('editor:update', body: $this->body);
     }
 
     public function render(): View

app/Http/Livewire/Forum/CreateReply.php renamed to app/Livewire/Forum/CreateReply.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Livewire\Forum;
+namespace App\Livewire\Forum;
 
 use App\Events\ReplyWasCreated;
 use App\Gamify\Points\ReplyCreated;

app/Http/Livewire/Forum/CreateThread.php renamed to app/Livewire/Forum/CreateThread.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Livewire\Forum;
+namespace App\Livewire\Forum;
 
 use App\Events\ThreadWasCreated;
 use App\Gamify\Points\ThreadCreated;

app/Http/Livewire/Forum/EditThread.php renamed to app/Livewire/Forum/EditThread.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Livewire\Forum;
+namespace App\Livewire\Forum;
 
 use App\Models\Channel;
 use App\Models\Thread;

app/Http/Livewire/Forum/Reply.php renamed to app/Livewire/Forum/Reply.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Livewire\Forum;
+namespace App\Livewire\Forum;
 
 use App\Gamify\Points\BestReply;
 use App\Models\Reply as ReplyModel;
@@ -71,7 +71,7 @@ public function edit(): void
 
         $this->isUpdating = false;
 
-        $this->emitSelf('refresh');
+        $this->dispatch('refresh')->self();
     }
 
     public function UnMarkAsSolution(): void
@@ -82,7 +82,7 @@ public function UnMarkAsSolution(): void
 
         $this->thread->unmarkSolution();
 
-        $this->emitSelf('refresh');
+        $this->dispatch('refresh')->self();
 
         Notification::make()
             ->title(__('Réponse rejetée'))
@@ -104,7 +104,7 @@ public function markAsSolution(): void
 
         givePoint(new BestReply($this->reply));
 
-        $this->emitSelf('refresh');
+        $this->dispatch('refresh')->self();
 
         Notification::make()
             ->title(__('Réponse acceptée'))