wip

Author: mckenziearts

app/Actions/Forum/DeleteThreadAction.php

@@ -15,6 +15,7 @@ public function execute(Thread $thread): void
         DB::beginTransaction();
 
         undoPoint(new ThreadCreated($thread));
+
         $thread->delete();
 
         DB::commit();

lang/en/global.php

@@ -88,8 +88,8 @@
     'launch_modal' => [
         'forum_action' => 'Create thread',
         'forum_description' => 'Do you have a question? Ask it in the forum',
-        'post_action' => 'Writing an article',
-        'post_description' => 'Share your discoveries with thousands of developers',
+        'article_action' => 'Writing an article',
+        'article_description' => 'Share your discoveries with thousands of developers',
         'discussion_action' => 'Start a discussion',
         'discussion_description' => 'Discuss and debate different themes and ideas',
     ],

lang/en/pages/article.php

@@ -11,7 +11,6 @@
     'next_article' => 'Next article',
     'prev_article' => 'Previous article',
     'share_article' => 'Share',
-    'new_article' => 'Write a new article',
     'advice' => [
         'title' => 'Important advices for articles',
         'content' => 'Submit your article to the Laravel.cm portal. We\'re looking for high quality articles revolving around Laravel, PHP, JavaScript, CSS, and related topics. Articles can\'t be promotional in nature and should be educational and informative. We reserve the right to decline articles that don\'t meet our quality standards.',
@@ -28,7 +27,7 @@
     'draft_help' => 'Putting an article in draft allows you to update it later.',
     'unpublished' => 'This article has not yet been published.',
     'draft' => 'Draft',
-    'your_article' => 'Your Articles',
+    'my_article' => 'My articles',
     'not_article_created' => "You haven't created any articles yet",
 
 ];

lang/fr/pages/article.php

@@ -11,7 +11,6 @@
     'next_article' => 'Article suivant',
     'prev_article' => 'Article précédent',
     'share_article' => 'Partager',
-    'new_article' => 'Rédiger un article',
     'advice' => [
         'title' => 'Conseils importants concernant les articles',
         'content' => 'Soumettez votre article au site Laravel.cm. Nous recherchons des articles de haute qualité autour de Laravel, PHP, JavaScript, CSS et autres sujets connexes. Les articles ne peuvent pas être de nature promotionnelle et doivent être éducatifs et informatifs. Nous nous réservons le droit de refuser les articles qui ne répondent pas à nos critères de qualité.',
@@ -28,7 +27,7 @@
     'draft_help' => 'Mettre en article en brouillon vous donne la possibilité de le modifier plus tard',
     'unpublished' => 'Cet article n\'a pas encore été publié.',
     'draft' => 'Brouillon',
-    'your_article' => 'Vos articles',
+    'my_article' => 'Mes articles',
     'not_article_created' => "Vous n'avez pas encore créé d'articles",
 
 ];

resources/views/livewire/components/account/articles.blade.php

@@ -2,9 +2,8 @@
 
 declare(strict_types=1);
 
-use App\Actions\Article\ArticleDeleteAction;
 use App\Models\Article;
-use Filament\Actions\Action;
+use Filament\Actions\Action,
 use Filament\Actions\Concerns\InteractsWithActions;
 use Filament\Actions\Contracts\HasActions;
 use Filament\Forms\Concerns\InteractsWithForms;
@@ -17,11 +16,12 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 
-new class extends Component implements HasForms, HasActions {
-
-    use WithPagination, WithoutUrlPagination;
+new class extends Component implements HasForms, HasActions
+{
     use InteractsWithActions;
     use InteractsWithForms;
+    use WithPagination;
+    use WithoutUrlPagination;
 
     #[Computed]
     public function articles(): LengthAwarePaginator
@@ -42,7 +42,7 @@ public function editAction(): Action
                 fn (array $arguments) => $this->dispatch(
                     'openPanel',
                     component: 'components.slideovers.article-form',
-                    arguments: ['articleId' => $arguments['article']]
+                    arguments: ['articleId' => $arguments['id']]
                 )
             );
     }
@@ -52,16 +52,19 @@ public function deleteAction(): Action
         return Action::make('delete')
             ->label(__('actions.delete'))
             ->color('danger')
+            ->badge()
             ->requiresConfirmation()
             ->action(function (array $arguments): void {
-                $article = Article::query()->find($arguments['article']);
+                $article = Article::query()->find($arguments['id']);
+
+                $this->authorize('delete', $article);
 
                 $article->delete();
 
                 Notification::make()
-                        ->success()
-                        ->title(__('notifications.article.deleted'))
-                        ->send();
+                    ->success()
+                    ->title(__('notifications.article.deleted'))
+                    ->send();
             });
     }
 };
@@ -76,10 +79,11 @@ public function deleteAction(): Action
                 </h2>
             </div>
             <div class="mt-4 flex md:ml-4 md:mt-0">
-                <x-buttons.primary class="justify-items-center" type="button"
-                                   onclick="Livewire.dispatch('openPanel', { component: 'components.slideovers.article-form' })">
-                    <x-untitledui-message-text-square class="size-5 mr-2" aria-hidden="true" />
-                    {{ __('pages/article.new_article') }}
+                <x-buttons.primary
+                    class="justify-items-center" type="button"
+                    wire:click="$dispatch('openPanel', { component: 'components.slideovers.article-form' })"
+                >
+                    {{ __('global.launch_modal.article_action') }}
                 </x-buttons.primary>
             </div>
         </div>

resources/views/livewire/components/account/discussions.blade.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use App\Actions\Article\ArticleDeleteAction;
 use App\Actions\Discussion\DeleteDiscussionAction;
 use App\Models\Discussion;

resources/views/livewire/components/account/threads.blade.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use App\Actions\Forum\DeleteThreadAction;
 use App\Models\Thread;
 use Livewire\Volt\Component;