Skip to content

Migrate to livewire v3 #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 7 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
node_modules
/vendor
/public
.git
package-lock.json
yarn.lock
composer.lock
22 changes: 22 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -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"
}
}
]
}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 à [[email protected]](mailto:[email protected]). **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 à [[email protected]](mailto:[email protected]). **Ne créez pas de problème pour la vulnérabilité.**

## License

Expand Down
16 changes: 8 additions & 8 deletions app/Http/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
],

Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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é!'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
Expand All @@ -30,7 +25,7 @@ public function delete(): void
->duration(5000)
->send();

$this->emitUp('reloadComment');
$this->dispatch('reloadComment');
}

public function toggleLike(): void
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -42,6 +38,7 @@ public function getCommentsProperty(): Collection
return $replies;
}

#[On('reloadComments')]
public function render(): View
{
return view('livewire.discussions.comments');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -41,7 +41,7 @@ public function subscribe(): void
->duration(5000)
->send();

$this->emitSelf('refresh');
$this->dispatch('refresh')->self();
}

public function unsubscribe(): void
Expand All @@ -59,7 +59,7 @@ public function unsubscribe(): void
->duration(5000)
->send();

$this->emitSelf('refresh');
$this->dispatch('refresh')->self();
}

public function render(): View
Expand Down
6 changes: 3 additions & 3 deletions app/Http/Livewire/Editor.php → app/Livewire/Editor.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace App\Http\Livewire;
namespace App\Livewire;

use App\Markdown\MarkdownHelper;
use Illuminate\Contracts\View\View;
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -71,7 +71,7 @@ public function edit(): void

$this->isUpdating = false;

$this->emitSelf('refresh');
$this->dispatch('refresh')->self();
}

public function UnMarkAsSolution(): void
Expand All @@ -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'))
Expand All @@ -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'))
Expand Down
Loading