From 41e98192d1f8d84060ff79d3ecc3cf81afa13b44 Mon Sep 17 00:00:00 2001
From: Chri$ <chris@learn.edu>
Date: Mon, 14 Oct 2024 18:33:31 +0200
Subject: [PATCH 1/5] feat:[LAR-60] Add send mail for decline article and fix
 unsend mail for approve article

---
 app/Http/Livewire/Modals/DeclinedArticle.php  |  60 +++++++++
 app/Notifications/SendApprovedArticle.php     |   3 +-
 app/Notifications/SendDeclinedArticle.php     |  35 +++++
 resources/views/articles/show.blade.php       | 112 ++++++++--------
 .../views/components/danger-button.blade.php  |   2 +-
 .../components/forms/address-form.blade.php   | 122 ++++++++++++++++++
 .../views/components/forms/errors.blade.php   |   9 ++
 .../views/components/forms/input.blade.php    |   3 +
 .../views/components/forms/label.blade.php    |   8 ++
 .../views/components/forms/textarea.blade.php |   3 +
 .../modals/declined-article.blade.php         |  28 ++++
 11 files changed, 330 insertions(+), 55 deletions(-)
 create mode 100644 app/Http/Livewire/Modals/DeclinedArticle.php
 create mode 100644 app/Notifications/SendDeclinedArticle.php
 create mode 100755 resources/views/components/forms/address-form.blade.php
 create mode 100755 resources/views/components/forms/errors.blade.php
 create mode 100755 resources/views/components/forms/input.blade.php
 create mode 100755 resources/views/components/forms/label.blade.php
 create mode 100755 resources/views/components/forms/textarea.blade.php
 create mode 100644 resources/views/livewire/modals/declined-article.blade.php

diff --git a/app/Http/Livewire/Modals/DeclinedArticle.php b/app/Http/Livewire/Modals/DeclinedArticle.php
new file mode 100644
index 00000000..3b5cf412
--- /dev/null
+++ b/app/Http/Livewire/Modals/DeclinedArticle.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Http\Livewire\Modals;
+
+
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use App\Notifications\SendDeclinedArticle;
+use Illuminate\Support\Facades\Cache;
+use LivewireUI\Modal\ModalComponent;
+use App\Policies\ArticlePolicy;
+use App\Models\Article;
+
+class DeclinedArticle extends ModalComponent
+{
+    use AuthorizesRequests;
+
+    public ?string $raison = null;
+
+    public ?string $description = null;
+
+    public ?Article $article = null;
+
+    protected $rules = [
+        'raison' => 'required|string|min:6',
+        'description' => 'required|string',
+    ];
+
+    public function mount(int $id): void
+    {
+        $this->article = Article::find($id);
+    }
+
+    public static function modalMaxWidth(): string
+    {
+        return 'xl';
+    }
+
+    public function declined(): void
+    {
+        $data = $this->validate();
+
+        $this->authorize(ArticlePolicy::DISAPPROVE, $this->article);
+
+        $this->article->update(['declined_at' => now()]); // @phpstan-ignore-line
+
+        Cache::forget('post-'.$this->article->id); // @phpstan-ignore-line
+
+        $this->article->user->notify(new SendDeclinedArticle($this->article, $data)); // @phpstan-ignore-line
+
+        session()->flash('status', __('L\'article a été décliné et le mail a été envoyé à l\'auteur pour le notifier.'));
+
+        $this->redirectRoute('articles');
+    }
+
+
+    public function render()
+    {
+        return view('livewire.modals.declined-article');
+    }
+}
diff --git a/app/Notifications/SendApprovedArticle.php b/app/Notifications/SendApprovedArticle.php
index d460e3d9..96dd8de7 100644
--- a/app/Notifications/SendApprovedArticle.php
+++ b/app/Notifications/SendApprovedArticle.php
@@ -6,11 +6,10 @@
 
 use App\Models\Article;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 
-final class SendApprovedArticle extends Notification implements ShouldQueue
+final class SendApprovedArticle extends Notification
 {
     use Queueable;
 
diff --git a/app/Notifications/SendDeclinedArticle.php b/app/Notifications/SendDeclinedArticle.php
new file mode 100644
index 00000000..044fa949
--- /dev/null
+++ b/app/Notifications/SendDeclinedArticle.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Notifications;
+
+use App\Models\Article;
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+final class SendDeclinedArticle extends Notification
+{
+    use Queueable;
+
+    public function __construct(public Article $article, public array $data)
+    {
+    }
+
+    public function via(object $notifiable): array
+    {
+        return ['mail'];
+    }
+
+    public function toMail(object $notifiable): MailMessage
+    {
+        return (new MailMessage())
+            ->subject(__('Article Décliné ❌.'))
+            ->greeting(__('Article Décliné : '.$this->data['raison']))
+            ->line(__('Nous avons le regret de vous informer que votre article a été décliné.'))
+            ->line($this->data['description'])
+            ->action(__('Voir mon article'), route('articles.show', $this->article))
+            ->line(__('Merci d\'avoir utilisé Laravel Cameroun.!'));
+    }
+}
diff --git a/resources/views/articles/show.blade.php b/resources/views/articles/show.blade.php
index b6d45894..769bea21 100644
--- a/resources/views/articles/show.blade.php
+++ b/resources/views/articles/show.blade.php
@@ -11,14 +11,14 @@
     @endphp
 
     <article class="relative lg:grid lg:grid-cols-9 lg:gap-10" xmlns:livewire="http://www.w3.org/1999/html">
-        <div class="hidden relative lg:block lg:col-span-2">
-            <x-sticky-content class="divide-y divide-skin-base space-y-6">
+        <div class="relative hidden lg:block lg:col-span-2">
+            <x-sticky-content class="space-y-6 divide-y divide-skin-base">
                 <div>
-                    <h4 class="text-xs text-skin-base font-medium leading-4 tracking-wide uppercase font-heading">
+                    <h4 class="text-xs font-medium leading-4 tracking-wide uppercase text-skin-base font-heading">
                         {{ __('A propos de l’auteur') }}
                     </h4>
                     <div class="mt-6 space-y-4">
-                        <a href="{{ route('profile', $user->username) }}" class="shrink-0 block">
+                        <a href="{{ route('profile', $user->username) }}" class="block shrink-0">
                             <div class="flex items-center">
                                 <div class="shrink-0">
                                     <x-user.avatar :user="$user" class="h-9 w-9" />
@@ -34,28 +34,28 @@
                             </div>
                         </a>
                         @if($user->bio)
-                            <p class="text-sm text-skin-base leading-5">{{ $user->bio }}</p>
+                            <p class="text-sm leading-5 text-skin-base">{{ $user->bio }}</p>
                         @endif
                         <div class="flex space-x-3">
 
                             @if($user->twitter())
                                 <a href="https://twitter.com/{{ $user->twitter() }}" class="text-skin-muted hover:text-skin-base">
                                     <span class="sr-only">Twitter</span>
-                                    <x-icon.twitter class="h-6 w-6"/>
+                                    <x-icon.twitter class="w-6 h-6"/>
                                 </a>
                             @endif
 
                             @if($user->linkedin())
                                 <a href="https://linkedin.com/in/{{ $user->linkedin() }}" class="text-skin-muted hover:text-skin-base">
                                     <span class="sr-only">LinkedIn</span>
-                                    <x-icon.linkedin class="h-6 w-6"/>
+                                    <x-icon.linkedin class="w-6 h-6"/>
                                 </a>
                             @endif
 
                             @if($user->githubUsername())
                                 <a href="https://github.com/{{ $user->githubUsername() }}" class="text-skin-muted hover:text-skin-base">
                                     <span class="sr-only">GitHub</span>
-                                    <x-icon.github class="h-6 w-6"/>
+                                    <x-icon.github class="w-6 h-6"/>
                                 </a>
                             @endif
 
@@ -67,9 +67,9 @@
                     <div class="pt-6 space-y-6">
                         @if($next)
                             <div>
-                                <h2 class="text-xs leading-5 font-medium tracking-wide uppercase text-skin-base">Article suivant</h2>
-                                <a href="{{ route('articles.show', $next) }}" class="mt-3 flex items-start space-x-2">
-                                    <img class="h-8 w-8 object-cover shadow-lg rounded-md" src="{{ $next->getFirstMediaUrl('media') }}" alt="{{ $next->slug }}">
+                                <h2 class="text-xs font-medium leading-5 tracking-wide uppercase text-skin-base">Article suivant</h2>
+                                <a href="{{ route('articles.show', $next) }}" class="flex items-start mt-3 space-x-2">
+                                    <img class="object-cover w-8 h-8 rounded-md shadow-lg" src="{{ $next->getFirstMediaUrl('media') }}" alt="{{ $next->slug }}">
                                     <span class="text-sm font-medium leading-4 text-skin-inverted hover:text-skin-primary-hover line-clamp-2">{{ $next->title }}</span>
                                 </a>
                             </div>
@@ -77,9 +77,9 @@
 
                         @if($previous)
                             <div>
-                                <h2 class="text-xs leading-5 font-medium tracking-wide uppercase text-skin-base">Article précédent</h2>
-                                <a href="{{ route('articles.show', $previous) }}" class="mt-3 flex items-start space-x-2">
-                                    <img class="h-8 w-8 object-cover shadow-lg rounded-md" src="{{ $previous->getFirstMediaUrl('media') }}" alt="{{ $previous->slug }}">
+                                <h2 class="text-xs font-medium leading-5 tracking-wide uppercase text-skin-base">Article précédent</h2>
+                                <a href="{{ route('articles.show', $previous) }}" class="flex items-start mt-3 space-x-2">
+                                    <img class="object-cover w-8 h-8 rounded-md shadow-lg" src="{{ $previous->getFirstMediaUrl('media') }}" alt="{{ $previous->slug }}">
                                     <span class="text-sm font-medium leading-4 text-skin-inverted hover:text-skin-primary-hover line-clamp-2">{{ $previous->title }}</span>
                                 </a>
                             </div>
@@ -106,7 +106,7 @@
                         <x-articles.sponsored :isSponsored="$article->isSponsored()" />
                     </div>
 
-                    <div class="mt-2 flex space-x-1 text-sm text-skin-base sm:mt-0">
+                    <div class="flex mt-2 space-x-1 text-sm text-skin-base sm:mt-0">
                         <time class="capitalize" datetime="{{ $article->publishedAt()->format('Y-m-d') }}">{{ $article->publishedAt()->isoFormat('LL') }}</time>
                         <span aria-hidden="true">&middot;</span>
                         <span>{{ __(':time min de lecture', ['time' => $article->readTime()]) }}</span>
@@ -117,10 +117,10 @@
                 <h1 class="text-2xl font-extrabold text-skin-inverted tracking-tight font-heading sm:text-3xl sm:leading-10 md:text-4xl lg:text-5xl lg:leading-[3.5rem]">
                     {{ $article->title }}
                 </h1>
-                <a href="{{ route('profile', $article->user->username) }}" class="mt-3 shrink-0 group block lg:hidden">
+                <a href="{{ route('profile', $article->user->username) }}" class="block mt-3 shrink-0 group lg:hidden">
                     <div class="flex items-center">
                         <div>
-                            <img class="inline-block h-8 w-8 rounded-full" src="{{ $article->user->profile_photo_url }}" alt="{{ $article->user->username }}">
+                            <img class="inline-block w-8 h-8 rounded-full" src="{{ $article->user->profile_photo_url }}" alt="{{ $article->user->username }}">
                         </div>
                         <div class="ml-3">
                             <p class="text-sm font-medium text-skin-inverted">
@@ -135,23 +135,23 @@
             </header>
 
             @if($media = $article->getFirstMediaUrl('media'))
-                <div class="mt-6 aspect-w-4 aspect-h-2 sm:mt-8 mx-auto">
-                    <img class="object-cover shadow-lg rounded-lg group-hover:opacity-75" src="{{ $media }}" alt="{{ $article->title }}" />
+                <div class="mx-auto mt-6 aspect-w-4 aspect-h-2 sm:mt-8">
+                    <img class="object-cover rounded-lg shadow-lg group-hover:opacity-75" src="{{ $media }}" alt="{{ $article->title }}" />
                 </div>
             @endif
 
             <x-markdown-content
                 id="content"
-                class="mt-8 prose prose-lg prose-green text-skin-base mx-auto overflow-x-hidden md:prose-xl lg:max-w-none"
+                class="mx-auto mt-8 overflow-x-hidden prose prose-lg prose-green text-skin-base md:prose-xl lg:max-w-none"
                 :content="$article->body"
             />
 
-            <div class="mt-6 pt-5 border-t border-skin-base sm:hidden">
+            <div class="pt-5 mt-6 border-t border-skin-base sm:hidden">
                 <div class="space-y-4">
-                    <a href="{{ route('profile', $user->username) }}" class="shrink-0 block">
+                    <a href="{{ route('profile', $user->username) }}" class="block shrink-0">
                         <div class="flex items-center">
                             <div>
-                                <img class="inline-block h-9 w-9 rounded-full" src="{{ $user->profile_photo_url }}" alt="{{ $user->username }}">
+                                <img class="inline-block rounded-full h-9 w-9" src="{{ $user->profile_photo_url }}" alt="{{ $user->username }}">
                             </div>
                             <div class="ml-3">
                                 <p class="text-sm font-medium text-skin-inverted">
@@ -164,28 +164,28 @@ class="mt-8 prose prose-lg prose-green text-skin-base mx-auto overflow-x-hidden
                         </div>
                     </a>
                     @if($user->bio)
-                        <p class="text-sm text-skin-base leading-5">{{ $user->bio }}</p>
+                        <p class="text-sm leading-5 text-skin-base">{{ $user->bio }}</p>
                     @endif
                     <div class="flex space-x-3">
 
                         @if($user->twitter())
                             <a href="https://twitter.com/{{ $user->twitter() }}" class="text-skin-muted hover:text-skin-base">
                                 <span class="sr-only">{{ __('Twitter') }}</span>
-                                <x-icon.twitter class="h-6 w-6"/>
+                                <x-icon.twitter class="w-6 h-6"/>
                             </a>
                         @endif
 
                         @if($user->linkedin())
                             <a href="https://linkedin.com/in/{{ $user->linkedin() }}" class="text-skin-muted hover:text-skin-base">
                                 <span class="sr-only">{{ __('LinkedIn') }}</span>
-                                <x-icon.linkedin class="h-6 w-6"/>
+                                <x-icon.linkedin class="w-6 h-6"/>
                             </a>
                         @endif
 
                         @if($user->githubUsername())
                             <a href="https://github.com/{{ $user->githubUsername() }}" class="text-skin-muted hover:text-skin-base">
                                 <span class="sr-only">{{ __('GitHub') }}</span>
-                                <x-icon.github class="h-6 w-6"/>
+                                <x-icon.github class="w-6 h-6"/>
                             </a>
                         @endif
 
@@ -194,51 +194,59 @@ class="mt-8 prose prose-lg prose-green text-skin-base mx-auto overflow-x-hidden
             </div>
 
             <div class="py-6">
-                <p class="text-base text-skin-base font-normal">
+                <p class="text-base font-normal text-skin-base">
                     {{ __('Vous aimez cet article ? Faite le savoir en partageant') }}
                 </p>
                 <div class="mt-4 space-y-4 sm:flex sm:items-center sm:space-y-0 sm:space-x-4">
                     <a href="https://twitter.com/share?text={{ urlencode('"'.$article->title.'" par '. ($article->user->twitter() ? '@'.$article->user->twitter() : $article->user->name) . ' #caparledev - ') }}&url={{ urlencode(route('articles.show', $article)) }}"
-                       class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md shadow-sm bg-skin-button text-sm leading-5 font-normal text-skin-base hover:bg-skin-button-hover focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-body focus:ring-green-500">
+                       class="inline-flex items-center px-4 py-2 text-sm font-normal leading-5 border rounded-md shadow-sm border-skin-base bg-skin-button text-skin-base hover:bg-skin-button-hover focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-body focus:ring-green-500">
                         <x-icon.twitter class="h-5 w-5 mr-1.5" />
                         {{ __('Twitter') }}
                     </a>
                     <a href="https://www.facebook.com/sharer/sharer.php?u={{ urlencode(route('articles.show', $article)) }}&quote={{ urlencode('"'.$article->title.'" par '.$article->user->name.' - ') }}"
-                       class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md shadow-sm bg-skin-button text-sm leading-5 font-normal text-skin-base hover:bg-skin-button-hover focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-body focus:ring-green-500">
+                       class="inline-flex items-center px-4 py-2 text-sm font-normal leading-5 border rounded-md shadow-sm border-skin-base bg-skin-button text-skin-base hover:bg-skin-button-hover focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-body focus:ring-green-500">
                         <x-icon.facebook class="h-5 w-5 mr-1.5" />
                         {{ __('Facebook') }}
                     </a>
                     <a href="https://www.linkedin.com/shareArticle?mini=true&url={{ urlencode(route('articles.show', $article)) }}&title={{ urlencode('"'.$article->title.'" par '.$article->user->name.' - ') }}"
-                       class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md shadow-sm bg-skin-button text-sm leading-5 font-normal text-skin-base hover:bg-skin-button-hover focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-body focus:ring-green-500">
+                       class="inline-flex items-center px-4 py-2 text-sm font-normal leading-5 border rounded-md shadow-sm border-skin-base bg-skin-button text-skin-base hover:bg-skin-button-hover focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-body focus:ring-green-500">
                         <x-icon.linkedin class="h-5 w-5 mr-1.5" />
                         {{ __('LinkedIn') }}
                     </a>
                 </div>
             </div>
 
-            @canany([App\Policies\ArticlePolicy::UPDATE, App\Policies\ArticlePolicy::DELETE], $article)
+            @canany([App\Policies\ArticlePolicy::UPDATE, App\Policies\ArticlePolicy::DELETE, App\Policies\ArticlePolicy::DISAPPROVE], $article)
                 <div class="relative mt-10">
                     <div class="absolute inset-0 flex items-center" aria-hidden="true">
                         <div class="w-full border-t border-skin-base"></div>
                     </div>
                     <div class="relative flex justify-center">
-                        <span class="relative z-0 inline-flex shadow-sm rounded-md -space-x-px">
-                            <a href="{{ route('articles.edit', $article) }}" class="relative inline-flex items-center px-4 py-2 rounded-l-md border border-skin-base bg-skin-card text-sm font-medium text-skin-inverted-muted hover:bg-skin-card-muted focus:z-10 focus:outline-none focus:ring-1 focus:ring-green-500 focus:border-green-500 focus:ring-offset-body">
+                        <span class="relative z-0 inline-flex -space-x-px rounded-md shadow-sm">
+                            <a href="{{ route('articles.edit', $article) }}" class="relative inline-flex items-center px-4 py-2 text-sm font-medium border rounded-l-md border-skin-base bg-skin-card text-skin-inverted-muted hover:bg-skin-card-muted focus:z-10 focus:outline-none focus:ring-1 focus:ring-green-500 focus:border-green-500 focus:ring-offset-body">
                                 <span class="sr-only">{{ __('Éditer') }}</span>
-                                <x-heroicon-s-pencil class="h-5 w-5" />
+                                <x-heroicon-s-pencil class="w-5 h-5" />
                             </a>
                             @if($article->isNotApproved())
                                 @hasanyrole('admin|moderator')
-                                    <button onclick="Livewire.emit('openModal', 'modals.approved-article', {{ json_encode([$article->id]) }})" type="button" class="-ml-px relative inline-flex items-center px-4 py-2 border border-skin-base bg-skin-card text-sm font-medium text-green-500 hover:bg-skin-card-muted focus:z-10 focus:outline-none focus:ring-1 focus:ring-green-500 focus:border-green-500 focus:border-green-500 focus:ring-offset-body">
+                                    <button onclick="Livewire.emit('openModal', 'modals.approved-article', {{ json_encode([$article->id]) }})" type="button" class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-green-500 border border-skin-base bg-skin-card hover:bg-skin-card-muted focus:z-10 focus:outline-none focus:ring-1 focus:ring-green-500 focus:border-green-500 focus:ring-offset-body">
                                         <span class="sr-only">{{ __('Approuver') }}</span>
-                                        <x-untitledui-check-verified-02 class="h-5 w-5" />
+                                        <x-untitledui-check-verified-02 class="w-5 h-5" />
                                     </button>
                                 @endhasanyrole
                             @endif
-                            <button onclick="Livewire.emit('openModal', 'modals.delete-article', {{ json_encode([$article->id]) }})" type="button" class="relative inline-flex items-center px-4 py-2 rounded-r-md border border-skin-base bg-skin-card text-sm font-medium text-skin-inverted-muted hover:bg-skin-card-muted focus:z-10 focus:outline-none focus:ring-1 focus:ring-green-500 focus:border-green-500 focus:ring-offset-body">
+                            <button onclick="Livewire.emit('openModal', 'modals.delete-article', {{ json_encode([$article->id]) }})" type="button" class="relative inline-flex items-center px-4 py-2 text-sm font-medium border rounded-r-md border-skin-base bg-skin-card text-skin-inverted-muted hover:bg-skin-card-muted focus:z-10 focus:outline-none focus:ring-1 focus:ring-green-500 focus:border-green-500 focus:ring-offset-body">
                                 <span class="sr-only">{{ __('Supprimer') }}</span>
-                                <x-untitledui-trash-03 class="h-5 w-5" />
+                                <x-untitledui-trash-03 class="w-5 h-5" />
                             </button>
+                            @if($article->isNotDeclined())
+                                @hasanyrole('admin|moderator')
+                                    <button onclick="Livewire.emit('openModal', 'modals.declined-article', {{ json_encode([$article->id]) }})" type="button" class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium border text-danger-500 border-skin-base bg-skin-card hover:bg-skin-card-muted focus:z-10 focus:outline-none focus:ring-1 focus:ring-green-500 focus:border-green-500 focus:ring-offset-body">
+                                        <span class="sr-only">{{ __('Decliner') }}</span>
+                                        <x-untitledui-check-verified-02 class="w-5 h-5" />
+                                    </button>
+                                @endhasanyrole
+                            @endif
                         </span>
                     </div>
                 </div>
@@ -246,12 +254,12 @@ class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md sha
 
             @if($next || $previous)
                 <footer class="mt-10 border-t border-skin-light lg:hidden">
-                    <div class="space-y-8 py-8 sm:flex sm:items-center sm:justify-between sm:space-y-0">
+                    <div class="py-8 space-y-8 sm:flex sm:items-center sm:justify-between sm:space-y-0">
                         @if($next)
                             <div>
                                 <h2 class="text-xs leading-5 tracking-wide uppercase text-skin-base">{{ __('Article suivant') }}</h2>
-                                <div class="mt-3 flex items-start space-x-2">
-                                    <img class="h-10 w-10 object-cover shadow-lg rounded-md" src="{{ $next->getFirstMediaUrl('media') ?? asset('images/socialcard.png') }}" alt="{{ $next->slug }}">
+                                <div class="flex items-start mt-3 space-x-2">
+                                    <img class="object-cover w-10 h-10 rounded-md shadow-lg" src="{{ $next->getFirstMediaUrl('media') ?? asset('images/socialcard.png') }}" alt="{{ $next->slug }}">
                                     <div class="flex flex-col space-y-1">
                                         <a class="text-base font-medium leading-4 text-skin-inverted hover:text-skin-primary-hover line-clamp-2" href="{{ route('articles.show', $next) }}">{{ $next->title }}</a>
                                         <span class="text-sm text-skin-muted">{{ __(':time min de lecture', ['time' => $next->readTime()]) }}</span>
@@ -263,8 +271,8 @@ class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md sha
                         @if($previous)
                             <div>
                                 <h2 class="text-xs leading-5 tracking-wide uppercase text-skin-base">{{ __('Article précédent') }}</h2>
-                                <div class="mt-3 flex items-start space-x-2">
-                                    <img class="h-10 w-10 object-cover shadow-lg rounded-md" src="{{ $previous->getFirstMediaUrl('media') ?? asset('images/socialcard.png') }}" alt="{{ $previous->slug }}">
+                                <div class="flex items-start mt-3 space-x-2">
+                                    <img class="object-cover w-10 h-10 rounded-md shadow-lg" src="{{ $previous->getFirstMediaUrl('media') ?? asset('images/socialcard.png') }}" alt="{{ $previous->slug }}">
                                     <div class="flex flex-col space-y-1">
                                         <a class="text-base font-medium leading-4 text-skin-inverted hover:text-skin-primary-hover line-clamp-2" href="{{ route('articles.show', $previous) }}">{{ $previous->title }}</a>
                                         <span class="text-sm text-skin-muted">{{ __(':time min de lecture', ['time' => $previous->readTime()]) }}</span>
@@ -276,13 +284,13 @@ class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md sha
                 </footer>
             @endif
         </div>
-        <div class="hidden relative lg:block lg:col-span-2">
+        <div class="relative hidden lg:block lg:col-span-2">
             <x-sticky-content class="space-y-10">
                 <x-sponsors />
 
                 @if($article->showToc())
-                    <div class="bg-skin-card px-4 py-6 rounded-lg shadow-lg">
-                        <h4 class="text-sm text-skin-inverted font-semibold leading-tight tracking-widest uppercase">{{ __('Table des matières') }}</h4>
+                    <div class="px-4 py-6 rounded-lg shadow-lg bg-skin-card">
+                        <h4 class="text-sm font-semibold leading-tight tracking-widest uppercase text-skin-inverted">{{ __('Table des matières') }}</h4>
                         <x-toc class="mt-4 toc" id="toc">{!! $article->body !!}</x-toc>
                     </div>
                 @endif
@@ -320,7 +328,7 @@ class="fixed inset-0 z-50 overflow-hidden"
             >
                 <div class="absolute inset-0 overflow-hidden">
                     <div class="absolute inset-0" @click="openTOC = false" aria-hidden="true">
-                        <div class="fixed inset-y-0 right-0 pl-10 mt-16 max-w-full flex">
+                        <div class="fixed inset-y-0 right-0 flex max-w-full pl-10 mt-16">
                             <div x-show="openTOC"
                                  x-transition:enter="transform transition ease-in-out duration-500 sm:duration-700"
                                  x-transition:enter-start="translate-x-full"
@@ -334,15 +342,15 @@ class="w-screen max-w-xs"
                                     <div class="px-4 sm:px-6">
                                         <div class="flex items-start justify-between">
                                             <h2 class="text-lg font-medium text-skin-inverted" id="slide-over-title">{{ __('Table des Matières') }}</h2>
-                                            <div class="ml-3 h-7 flex items-center">
-                                                <button type="button" class="bg-skin-card rounded-md text-skin-muted hover:text-skin-base focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-green-500" @click="openTOC = false">
+                                            <div class="flex items-center ml-3 h-7">
+                                                <button type="button" class="rounded-md bg-skin-card text-skin-muted hover:text-skin-base focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-green-500" @click="openTOC = false">
                                                     <span class="sr-only">{{ __('Fermer') }}</span>
-                                                    <x-untitledui-x class="h-6 w-6" />
+                                                    <x-untitledui-x class="w-6 h-6" />
                                                 </button>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="mt-6 relative flex-1 px-4 sm:px-6">
+                                    <div class="relative flex-1 px-4 mt-6 sm:px-6">
                                         <x-toc class="toc" id="toc">{!! $article->body !!}</x-toc>
                                     </div>
                                 </div>
diff --git a/resources/views/components/danger-button.blade.php b/resources/views/components/danger-button.blade.php
index bd9d17ca..d2e2c99a 100644
--- a/resources/views/components/danger-button.blade.php
+++ b/resources/views/components/danger-button.blade.php
@@ -1,3 +1,3 @@
-<button {{ $attributes->merge(['class' => 'inline-flex justify-center w-full rounded-md border border-transparent px-4 py-2 bg-negative-600 text-base leading-6 font-medium text-white shadow-sm hover:bg-negative-500 focus:outline-none focus:border-negative-700 sm:text-sm sm:leading-5 focus:ring-2 focus:ring-offset-2 focus:ring-offset-body focus:ring-negative-500']) }}>
+<button {{ $attributes->merge(['class' => 'button inline-flex items-center justify-center rounded-md border border-transparent px-4 py-2 bg-danger-600 text-base leading-6 font-medium text-white shadow-sm hover:bg-danger-500 focus:outline-none focus:border-danger-700 sm:text-sm sm:leading-5 focus:ring-2 focus:ring-offset-2 focus:ring-offset-body focus:ring-danger-500']) }}>
     {{ $slot }}
 </button>
diff --git a/resources/views/components/forms/address-form.blade.php b/resources/views/components/forms/address-form.blade.php
new file mode 100755
index 00000000..21b725ab
--- /dev/null
+++ b/resources/views/components/forms/address-form.blade.php
@@ -0,0 +1,122 @@
+<x-modal
+    header-classes="p-4 border-b border-gray-100 sm:px-6 sm:py-4"
+    content-classes="relative p-4 flex-1 sm:max-h-[500px] sm:px-6 sm:px-5"
+    footer-classes="px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse"
+    form-action="save"
+>
+    <x-slot name="title">
+        {{ $title }}
+    </x-slot>
+
+    <div class="space-y-4 pb-5">
+        <div class="grid grid-cols-2 gap-4">
+            <div class="space-y-2">
+                <x-forms.label for="first_name" :value="__('First name')" required />
+                <x-forms.input wire:model="first_name" id="first_name" name="first_name" type="text"/>
+                <x-forms.errors :messages="$errors->get('first_name')" />
+            </div>
+
+            <div class="space-y-2">
+                <x-forms.label for="last_name" :value="__('Last name')" required />
+                <x-forms.input wire:model="last_name" id="last_name" name="last_name" type="text"/>
+                <x-forms.errors :messages="$errors->get('last_name')" />
+            </div>
+        </div>
+
+        <div class="space-y-2">
+            <x-forms.label for="street_address" :value="__('Street Address')" required />
+            <x-forms.input
+                wire:model="street_address"
+                id="street_address"
+                placeholder="Akwa Avenue 34"
+                class="w-full"
+                name="street_address"
+                type="text"
+            />
+            <x-forms.errors :messages="$errors->get('street_address')" />
+        </div>
+
+        <div class="space-y-2">
+            <x-forms.label for="street_address_plus" :value="__('Apartment, suite, etc.')" />
+            <x-forms.input
+                wire:model="street_address_plus"
+                class="w-full"
+                id="street_address_plus"
+                name="street_address_plus"
+                type="text"
+            />
+            <x-forms.errors :messages="$errors->get('street_address_plus')" />
+        </div>
+
+        <div class="grid grid-cols-2 gap-4">
+            <div class="space-y-2">
+                <x-forms.label for="city" :value="__('City')" required/>
+                <x-forms.input wire:model="city" id="city" name="city" type="text" />
+                <x-forms.errors :messages="$errors->get('city')" class="mt-2" />
+            </div>
+
+            <div class="space-y-2">
+                <x-forms.label for="postal_code" :value="__('Postal / Zip code')" required />
+                <x-forms.input wire:model="postal_code" id="postal_code" name="postal_code" type="text"/>
+                <x-forms.errors :messages="$errors->get('postal_code')" class="mt-2" />
+            </div>
+
+        </div>
+
+        <div class="space-y-2">
+            <x-forms.label for="country_id" :value="__('Country')" required />
+            <x-forms.select wire:model="country_id" id="country_id" class="w-full">
+                @foreach ($countries as $key => $country)
+                    <option value="{{ $key }}">{{ $country }}</option>
+                @endforeach
+            </x-forms.select>
+            <x-forms.errors :messages="$errors->get('country_id')" />
+        </div>
+
+        <div class="space-y-2">
+            <x-forms.label for="phone_number" :value="__('Phone Number')" />
+            <x-forms.input wire:model="phone_number" class="w-full" id="phone_number" name="phone_number" type="text" />
+            <x-forms.errors :messages="$errors->get('phone_number')" />
+        </div>
+
+        <div class="grid gap-y-2 sm:grid-cols-3 sm:gap-x-4 sm:items-start">
+            <div class="flex items-center justify-between gap-x-3 ">
+                <x-forms.label for="adress_type" :value="__('Address type')" />
+            </div>
+
+            <div class="grid auto-cols-fr gap-y-2 sm:col-span-2">
+                <div class="columns-[--cols-default] fi-fo-radio gap-4 flex flex-wrap">
+                    <div>
+                        <x-forms.label class="flex items-center gap-3">
+                            <x-forms.radio id="type-billing" name="type" value="billing" wire:model="type"/>
+                            {{ __('Billing address') }}
+                        </x-forms.label>
+                    </div>
+
+                    <div>
+                        <x-forms.label class="flex items-center gap-3">
+                            <x-forms.radio id="type-shipping" name="type" value="shipping" wire:model="type"/>
+                            {{ __('Shipping address') }}
+                        </x-forms.label>
+                    </div>
+                </div>
+            </div>
+            <x-forms.errors :messages="$errors->get('type')" class="mt-2" />
+        </div>
+    </div>
+
+    <x-slot name="buttons">
+        <x-buttons.submit
+            :title="__('shopper::forms.actions.save')"
+            wire:loading.attr="data-loading"
+            class="w-full sm:ml-3 sm:w-auto"
+        />
+        <x-buttons.default
+            type="button"
+            wire:click="$dispatch('closeModal')"
+            class="w-full px-4 py-2 mt-3 text-sm sm:mt-0 sm:w-auto"
+        >
+            {{ __('shopper::forms.actions.cancel') }}
+        </x-buttons.default>
+    </x-slot>
+</x-modal>
diff --git a/resources/views/components/forms/errors.blade.php b/resources/views/components/forms/errors.blade.php
new file mode 100755
index 00000000..024e8a85
--- /dev/null
+++ b/resources/views/components/forms/errors.blade.php
@@ -0,0 +1,9 @@
+@props(['messages'])
+
+@if ($messages)
+    <ul {{ $attributes->merge(['class' => 'text-sm text-danger-600 space-y-1']) }}>
+        @foreach ((array) $messages as $message)
+            <li>{{ $message }}</li>
+        @endforeach
+    </ul>
+@endif
diff --git a/resources/views/components/forms/input.blade.php b/resources/views/components/forms/input.blade.php
new file mode 100755
index 00000000..52a0de25
--- /dev/null
+++ b/resources/views/components/forms/input.blade.php
@@ -0,0 +1,3 @@
+@props(['disabled' => false])
+
+<input {{ $disabled ? 'disabled' : '' }} {!! $attributes->merge(['class' => 'inline-flex w-full py-2 rounded-lg placeholder-gray-500 border-gray-200 focus:ring-primary-500 focus:ring-2 focus:border-transparent focus:outline-none sm:text-sm']) !!}>
diff --git a/resources/views/components/forms/label.blade.php b/resources/views/components/forms/label.blade.php
new file mode 100755
index 00000000..5e420f20
--- /dev/null
+++ b/resources/views/components/forms/label.blade.php
@@ -0,0 +1,8 @@
+@props(['value', 'required'])
+
+<label {{ $attributes->merge(['class' => 'block font-medium text-sm text-gray-700']) }}>
+    {{ $value ?? $slot }}
+    @if(isset($required))
+        <span class="text-red-600">*</span>
+    @endif
+</label>
diff --git a/resources/views/components/forms/textarea.blade.php b/resources/views/components/forms/textarea.blade.php
new file mode 100755
index 00000000..340e5946
--- /dev/null
+++ b/resources/views/components/forms/textarea.blade.php
@@ -0,0 +1,3 @@
+@props(['disabled' => false])
+
+<textarea {{ $disabled ? 'disabled' : '' }} {!! $attributes->merge(['class' => 'block p-2.5 w-full text-sm placeholder-gray-500 bg-gray-50 rounded-lg border border-gray-200  focus:ring-primary-500 focus:border-primary-500']) !!}>{{ $slot }}</textarea>
diff --git a/resources/views/livewire/modals/declined-article.blade.php b/resources/views/livewire/modals/declined-article.blade.php
new file mode 100644
index 00000000..69ce6a79
--- /dev/null
+++ b/resources/views/livewire/modals/declined-article.blade.php
@@ -0,0 +1,28 @@
+<x-modal footerClasses="px-4 pb-5 sm:px-4 sm:flex sm:flex-row-reverse">
+    <x-slot name="content" class="space-y-4">
+        <div class="space-y-2">
+            <x-forms.label for="raison" :value="__('Motif du rejet')"  required/>
+            <x-forms.input wire:model="raison" id="raison" name="raison" type="text"/>
+            <x-forms.errors :messages="$errors->get('raison')" />
+        </div>
+        <div class="space-y-2">
+            <x-forms.label for='description' :value="__('Description')" required />
+            <x-forms.textarea id='description' rows='4' wire:model='description' placeholder='Descrition du rejet' name="description"></x-forms.textarea>
+            <x-forms.errors :messages="$errors->get('description')" />
+        </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="declined" type="button">
+                <x-loader class="text-white" wire:loading wire:target="declined" />
+                {{ __('Decliner') }}
+            </x-danger-button>
+        </span>
+        <span class="flex w-full mt-3 rounded-md shadow-sm sm:mt-0 sm:w-auto">
+            <x-default-button wire:click="$emit('closeModal')" type="button">
+                {{ __('Annuler') }}
+            </x-default-button>
+        </span>
+    </x-slot>
+</x-modal>

From dd152cefb7a2d37fba92edfd6a82cd963d2fc209 Mon Sep 17 00:00:00 2001
From: cybersoldattech <cybersoldattech@users.noreply.github.com>
Date: Mon, 14 Oct 2024 16:33:55 +0000
Subject: [PATCH 2/5] Fix code styling

---
 app/Http/Kernel.php                           | 16 +++++-----
 app/Http/Livewire/Modals/DeclinedArticle.php  |  5 +--
 app/Models/Thread.php                         |  2 +-
 app/Models/User.php                           |  2 +-
 app/helpers.php                               |  4 +--
 config/gamify.php                             |  2 +-
 config/livewire-ui-spotlight.php              | 22 ++++++-------
 config/permission.php                         |  2 +-
 ..._09_14_172248_create_permission_tables.php |  6 ++--
 .../2021_11_04_094343_create_views_table.php  |  2 +-
 helpers/ModelHelper.php                       | 32 +++++++++----------
 11 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 394a4eeb..07ef4dae 100644
--- a/app/Http/Kernel.php
+++ b/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,
diff --git a/app/Http/Livewire/Modals/DeclinedArticle.php b/app/Http/Livewire/Modals/DeclinedArticle.php
index 3b5cf412..634437d2 100644
--- a/app/Http/Livewire/Modals/DeclinedArticle.php
+++ b/app/Http/Livewire/Modals/DeclinedArticle.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Livewire\Modals;
+declare(strict_types=1);
 
+namespace App\Http\Livewire\Modals;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use App\Notifications\SendDeclinedArticle;
@@ -10,7 +11,7 @@
 use App\Policies\ArticlePolicy;
 use App\Models\Article;
 
-class DeclinedArticle extends ModalComponent
+final class DeclinedArticle extends ModalComponent
 {
     use AuthorizesRequests;
 
diff --git a/app/Models/Thread.php b/app/Models/Thread.php
index 23b5291d..ec019ea6 100644
--- a/app/Models/Thread.php
+++ b/app/Models/Thread.php
@@ -191,7 +191,7 @@ public function scopeUnresolved(Builder $query): Builder
      * Scope for filtering threads.
      *
      * @param  Builder<Thread>  $builder
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
      * @param  string[]  $filters
      * @return Builder<Thread>
      */
diff --git a/app/Models/User.php b/app/Models/User.php
index 52ac0fcd..a9342149 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -353,7 +353,7 @@ public function scopeHasActivity(Builder $query): Builder
     /**
      * Route notifications for the Slack channel.
      *
-     * @param  \Illuminate\Notifications\Notification  $notification
+     * @param  Notification  $notification
      * @return string
      */
     public function routeNotificationForSlack(Notification $notification): string
diff --git a/app/helpers.php b/app/helpers.php
index 3e885f3b..8d84d948 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -91,12 +91,12 @@ function getFilter(string $key, array $filters = [], string $default = 'recent')
     /**
      * Returns the route for the replyAble.
      *
-     * @param  \App\Models\Thread|\App\Models\Discussion  $replyAble
+     * @param  App\Models\Thread|App\Models\Discussion  $replyAble
      * @return string
      */
     function route_to_reply_able(mixed $replyAble): string
     {
-        return $replyAble instanceof \App\Models\Thread ?
+        return $replyAble instanceof App\Models\Thread ?
             route('forum.show', $replyAble->slug()) :
             route('discussions.show', $replyAble->slug());
     }
diff --git a/config/gamify.php b/config/gamify.php
index 20c42df5..012306b6 100644
--- a/config/gamify.php
+++ b/config/gamify.php
@@ -4,7 +4,7 @@
 
 return [
     // Model which will be having points, generally it will be User
-    'payee_model' => \App\Models\User::class,
+    'payee_model' => App\Models\User::class,
 
     // Reputation model
     'reputation_model' => '\QCod\Gamify\Reputation',
diff --git a/config/livewire-ui-spotlight.php b/config/livewire-ui-spotlight.php
index afb0289f..4ede002c 100644
--- a/config/livewire-ui-spotlight.php
+++ b/config/livewire-ui-spotlight.php
@@ -31,17 +31,17 @@
     */
 
     'commands' => [
-        \App\Spotlight\Article::class,
-        \App\Spotlight\Articles::class,
-        \App\Spotlight\Discussion::class,
-        \App\Spotlight\Discussions::class,
-        \App\Spotlight\FAQs::class,
-        \App\Spotlight\Forum::class,
-        \App\Spotlight\Guides::class,
-        \App\Spotlight\Slack::class,
-        \App\Spotlight\Sujet::class,
-        \App\Spotlight\Telegram::class,
-        \App\Spotlight\User::class,
+        App\Spotlight\Article::class,
+        App\Spotlight\Articles::class,
+        App\Spotlight\Discussion::class,
+        App\Spotlight\Discussions::class,
+        App\Spotlight\FAQs::class,
+        App\Spotlight\Forum::class,
+        App\Spotlight\Guides::class,
+        App\Spotlight\Slack::class,
+        App\Spotlight\Sujet::class,
+        App\Spotlight\Telegram::class,
+        App\Spotlight\User::class,
     ],
 
     /*
diff --git a/config/permission.php b/config/permission.php
index 2570dbaa..0ed2706b 100644
--- a/config/permission.php
+++ b/config/permission.php
@@ -137,7 +137,7 @@
          * When permissions or roles are updated the cache is flushed automatically.
          */
 
-        'expiration_time' => \DateInterval::createFromDateString('24 hours'),
+        'expiration_time' => DateInterval::createFromDateString('24 hours'),
 
         /*
          * The cache key used to store all permissions.
diff --git a/database/migrations/2021_09_14_172248_create_permission_tables.php b/database/migrations/2021_09_14_172248_create_permission_tables.php
index 47f05484..ff110e84 100644
--- a/database/migrations/2021_09_14_172248_create_permission_tables.php
+++ b/database/migrations/2021_09_14_172248_create_permission_tables.php
@@ -16,10 +16,10 @@ public function up(): void
         $teams = config('permission.teams');
 
         if (empty($tableNames)) {
-            throw new \Exception('Error: config/permission.php not loaded. Run [php artisan config:clear] and try again.');
+            throw new Exception('Error: config/permission.php not loaded. Run [php artisan config:clear] and try again.');
         }
         if ($teams && empty($columnNames['team_foreign_key'] ?? null)) {
-            throw new \Exception('Error: team_foreign_key on config/permission.php not loaded. Run [php artisan config:clear] and try again.');
+            throw new Exception('Error: team_foreign_key on config/permission.php not loaded. Run [php artisan config:clear] and try again.');
         }
 
         Schema::create($tableNames['permissions'], function (Blueprint $table): void {
@@ -128,7 +128,7 @@ public function down(): void
         $tableNames = config('permission.table_names');
 
         if (empty($tableNames)) {
-            throw new \Exception('Error: config/permission.php not found and defaults could not be merged. Please publish the package configuration before proceeding, or drop the tables manually.');
+            throw new Exception('Error: config/permission.php not found and defaults could not be merged. Please publish the package configuration before proceeding, or drop the tables manually.');
         }
 
         Schema::drop($tableNames['role_has_permissions']);
diff --git a/database/migrations/2021_11_04_094343_create_views_table.php b/database/migrations/2021_11_04_094343_create_views_table.php
index 5b9b9a88..f468a7bf 100644
--- a/database/migrations/2021_11_04_094343_create_views_table.php
+++ b/database/migrations/2021_11_04_094343_create_views_table.php
@@ -11,7 +11,7 @@ final class CreateViewsTable extends Migration
     /**
      * The database schema.
      *
-     * @var \Illuminate\Support\Facades\Schema
+     * @var Schema
      */
     protected $schema;
 
diff --git a/helpers/ModelHelper.php b/helpers/ModelHelper.php
index dfa15fdc..f2b524ef 100644
--- a/helpers/ModelHelper.php
+++ b/helpers/ModelHelper.php
@@ -24,7 +24,7 @@
      * @property \Illuminate\Support\Carbon|null $created_at
      * @property \Illuminate\Support\Carbon|null $updated_at
      * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $subject
-     * @property-read \App\Models\User $user
+     * @property-read User $user
      * @method static \Database\Factories\ActivityFactory factory($count = null, $state = [])
      * @method static \Illuminate\Database\Eloquent\Builder|Activity newModelQuery()
      * @method static \Illuminate\Database\Eloquent\Builder|Activity newQuery()
@@ -74,7 +74,7 @@ final class IdeHelperActivity
      * @property-read int|null $reactions_count
      * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Tag> $tags
      * @property-read int|null $tags_count
-     * @property-read \App\Models\User $user
+     * @property-read User $user
      * @property-read \Illuminate\Database\Eloquent\Collection<int, \CyrildeWit\EloquentViewable\View> $views
      * @property-read int|null $views_count
      * @method static \Illuminate\Database\Eloquent\Builder|Article approved()
@@ -176,7 +176,7 @@ final class IdeHelperChannel
      * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activity
      * @property-read int|null $activity_count
      * @property-read int $count_all_replies_with_child
-     * @property-read \App\Models\Reply|null $latestReply
+     * @property-read Reply|null $latestReply
      * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Reaction> $reactions
      * @property-read int|null $reactions_count
      * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Reply> $replies
@@ -185,7 +185,7 @@ final class IdeHelperChannel
      * @property-read int|null $subscribes_count
      * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Tag> $tags
      * @property-read int|null $tags_count
-     * @property-read \App\Models\User $user
+     * @property-read User $user
      * @property-read \Illuminate\Database\Eloquent\Collection<int, \CyrildeWit\EloquentViewable\View> $views
      * @property-read int|null $views_count
      * @method static \Illuminate\Database\Eloquent\Builder|Discussion active()
@@ -241,7 +241,7 @@ final class IdeHelperDiscussion
      * @property \Illuminate\Support\Carbon|null $updated_at
      * @property-read \Spatie\MediaLibrary\MediaCollections\Models\Collections\MediaCollection<int, \Spatie\MediaLibrary\MediaCollections\Models\Media> $media
      * @property-read int|null $media_count
-     * @property-read \App\Models\User $owner
+     * @property-read User $owner
      * @method static \Illuminate\Database\Eloquent\Builder|Enterprise certified()
      * @method static \Database\Factories\EnterpriseFactory factory($count = null, $state = [])
      * @method static \Illuminate\Database\Eloquent\Builder|Enterprise featured()
@@ -491,8 +491,8 @@ final class IdeHelperSubscription
      * @property \Illuminate\Support\Carbon|null $created_at
      * @property \Illuminate\Support\Carbon|null $updated_at
      * @property \Illuminate\Support\Carbon|null $deleted_at
-     * @property-read \App\Models\Premium\Feature $feature
-     * @property-read \App\Models\Premium\Subscription $subscription
+     * @property-read Feature $feature
+     * @property-read Subscription $subscription
      * @method static \Illuminate\Database\Eloquent\Builder|PlanSubscriptionUsage byFeatureSlug(string $featureSlug)
      * @method static \Illuminate\Database\Eloquent\Builder|SubscriptionUsage newModelQuery()
      * @method static \Illuminate\Database\Eloquent\Builder|SubscriptionUsage newQuery()
@@ -559,8 +559,8 @@ final class IdeHelperReaction
      * @property-read \Illuminate\Database\Eloquent\Collection<int, Reply> $replies
      * @property-read int|null $replies_count
      * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $replyAble
-     * @property-read \App\Models\Thread|null $solutionTo
-     * @property-read \App\Models\User $user
+     * @property-read Thread|null $solutionTo
+     * @property-read User $user
      * @method static \Database\Factories\ReplyFactory factory($count = null, $state = [])
      * @method static \Illuminate\Database\Eloquent\Builder|Reply isSolution()
      * @method static \Illuminate\Database\Eloquent\Builder|Reply newModelQuery()
@@ -621,7 +621,7 @@ final class IdeHelperSocialAccount
      * @property \Illuminate\Support\Carbon|null $created_at
      * @property \Illuminate\Support\Carbon|null $updated_at
      * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $subscribeAble
-     * @property-read \App\Models\User $user
+     * @property-read User $user
      * @method static \Illuminate\Database\Eloquent\Builder|Subscribe newModelQuery()
      * @method static \Illuminate\Database\Eloquent\Builder|Subscribe newQuery()
      * @method static \Illuminate\Database\Eloquent\Builder|Subscribe query()
@@ -684,18 +684,18 @@ final class IdeHelperTag
      * @property-read int|null $activity_count
      * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Channel> $channels
      * @property-read int|null $channels_count
-     * @property-read \App\Models\Reply|null $latestReply
+     * @property-read Reply|null $latestReply
      * @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
      * @property-read int|null $notifications_count
      * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Reaction> $reactions
      * @property-read int|null $reactions_count
      * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Reply> $replies
      * @property-read int|null $replies_count
-     * @property-read \App\Models\User|null $resolvedBy
-     * @property-read \App\Models\Reply|null $solutionReply
+     * @property-read User|null $resolvedBy
+     * @property-read Reply|null $solutionReply
      * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Subscribe> $subscribes
      * @property-read int|null $subscribes_count
-     * @property-read \App\Models\User $user
+     * @property-read User $user
      * @property-read \Illuminate\Database\Eloquent\Collection<int, \CyrildeWit\EloquentViewable\View> $views
      * @property-read int|null $views_count
      * @method static \Illuminate\Database\Eloquent\Builder|Thread active()
@@ -744,7 +744,7 @@ final class IdeHelperThread
      * @property array|null $metadata
      * @property \Illuminate\Support\Carbon|null $created_at
      * @property \Illuminate\Support\Carbon|null $updated_at
-     * @property-read \App\Models\User $user
+     * @property-read User $user
      * @method static \Illuminate\Database\Eloquent\Builder|Transaction complete()
      * @method static \Illuminate\Database\Eloquent\Builder|Transaction newModelQuery()
      * @method static \Illuminate\Database\Eloquent\Builder|Transaction newQuery()
@@ -803,7 +803,7 @@ final class IdeHelperTransaction
      * @property-read int|null $badges_count
      * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Discussion> $discussions
      * @property-read int|null $discussions_count
-     * @property-read \App\Models\Enterprise|null $enterprise
+     * @property-read Enterprise|null $enterprise
      * @property-read \Illuminate\Database\Eloquent\Collection<int, \LaravelFeature\Model\Feature> $features
      * @property-read int|null $features_count
      * @property-read bool $is_sponsor

From 07500c1a1ca1fbfeb2a50151c1dfa0b77d4a2782 Mon Sep 17 00:00:00 2001
From: Chri$ <chris@learn.edu>
Date: Mon, 14 Oct 2024 18:38:57 +0200
Subject: [PATCH 3/5] fix: LAR-60 remove unsused file

---
 .../components/forms/address-form.blade.php   | 122 ------------------
 1 file changed, 122 deletions(-)
 delete mode 100755 resources/views/components/forms/address-form.blade.php

diff --git a/resources/views/components/forms/address-form.blade.php b/resources/views/components/forms/address-form.blade.php
deleted file mode 100755
index 21b725ab..00000000
--- a/resources/views/components/forms/address-form.blade.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<x-modal
-    header-classes="p-4 border-b border-gray-100 sm:px-6 sm:py-4"
-    content-classes="relative p-4 flex-1 sm:max-h-[500px] sm:px-6 sm:px-5"
-    footer-classes="px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse"
-    form-action="save"
->
-    <x-slot name="title">
-        {{ $title }}
-    </x-slot>
-
-    <div class="space-y-4 pb-5">
-        <div class="grid grid-cols-2 gap-4">
-            <div class="space-y-2">
-                <x-forms.label for="first_name" :value="__('First name')" required />
-                <x-forms.input wire:model="first_name" id="first_name" name="first_name" type="text"/>
-                <x-forms.errors :messages="$errors->get('first_name')" />
-            </div>
-
-            <div class="space-y-2">
-                <x-forms.label for="last_name" :value="__('Last name')" required />
-                <x-forms.input wire:model="last_name" id="last_name" name="last_name" type="text"/>
-                <x-forms.errors :messages="$errors->get('last_name')" />
-            </div>
-        </div>
-
-        <div class="space-y-2">
-            <x-forms.label for="street_address" :value="__('Street Address')" required />
-            <x-forms.input
-                wire:model="street_address"
-                id="street_address"
-                placeholder="Akwa Avenue 34"
-                class="w-full"
-                name="street_address"
-                type="text"
-            />
-            <x-forms.errors :messages="$errors->get('street_address')" />
-        </div>
-
-        <div class="space-y-2">
-            <x-forms.label for="street_address_plus" :value="__('Apartment, suite, etc.')" />
-            <x-forms.input
-                wire:model="street_address_plus"
-                class="w-full"
-                id="street_address_plus"
-                name="street_address_plus"
-                type="text"
-            />
-            <x-forms.errors :messages="$errors->get('street_address_plus')" />
-        </div>
-
-        <div class="grid grid-cols-2 gap-4">
-            <div class="space-y-2">
-                <x-forms.label for="city" :value="__('City')" required/>
-                <x-forms.input wire:model="city" id="city" name="city" type="text" />
-                <x-forms.errors :messages="$errors->get('city')" class="mt-2" />
-            </div>
-
-            <div class="space-y-2">
-                <x-forms.label for="postal_code" :value="__('Postal / Zip code')" required />
-                <x-forms.input wire:model="postal_code" id="postal_code" name="postal_code" type="text"/>
-                <x-forms.errors :messages="$errors->get('postal_code')" class="mt-2" />
-            </div>
-
-        </div>
-
-        <div class="space-y-2">
-            <x-forms.label for="country_id" :value="__('Country')" required />
-            <x-forms.select wire:model="country_id" id="country_id" class="w-full">
-                @foreach ($countries as $key => $country)
-                    <option value="{{ $key }}">{{ $country }}</option>
-                @endforeach
-            </x-forms.select>
-            <x-forms.errors :messages="$errors->get('country_id')" />
-        </div>
-
-        <div class="space-y-2">
-            <x-forms.label for="phone_number" :value="__('Phone Number')" />
-            <x-forms.input wire:model="phone_number" class="w-full" id="phone_number" name="phone_number" type="text" />
-            <x-forms.errors :messages="$errors->get('phone_number')" />
-        </div>
-
-        <div class="grid gap-y-2 sm:grid-cols-3 sm:gap-x-4 sm:items-start">
-            <div class="flex items-center justify-between gap-x-3 ">
-                <x-forms.label for="adress_type" :value="__('Address type')" />
-            </div>
-
-            <div class="grid auto-cols-fr gap-y-2 sm:col-span-2">
-                <div class="columns-[--cols-default] fi-fo-radio gap-4 flex flex-wrap">
-                    <div>
-                        <x-forms.label class="flex items-center gap-3">
-                            <x-forms.radio id="type-billing" name="type" value="billing" wire:model="type"/>
-                            {{ __('Billing address') }}
-                        </x-forms.label>
-                    </div>
-
-                    <div>
-                        <x-forms.label class="flex items-center gap-3">
-                            <x-forms.radio id="type-shipping" name="type" value="shipping" wire:model="type"/>
-                            {{ __('Shipping address') }}
-                        </x-forms.label>
-                    </div>
-                </div>
-            </div>
-            <x-forms.errors :messages="$errors->get('type')" class="mt-2" />
-        </div>
-    </div>
-
-    <x-slot name="buttons">
-        <x-buttons.submit
-            :title="__('shopper::forms.actions.save')"
-            wire:loading.attr="data-loading"
-            class="w-full sm:ml-3 sm:w-auto"
-        />
-        <x-buttons.default
-            type="button"
-            wire:click="$dispatch('closeModal')"
-            class="w-full px-4 py-2 mt-3 text-sm sm:mt-0 sm:w-auto"
-        >
-            {{ __('shopper::forms.actions.cancel') }}
-        </x-buttons.default>
-    </x-slot>
-</x-modal>

From cddc7a01c0fc708fd23d5f0290d56e92e71f5258 Mon Sep 17 00:00:00 2001
From: Chri$ <chris@learn.edu>
Date: Mon, 14 Oct 2024 20:50:52 +0200
Subject: [PATCH 4/5] Test:[LAR-60] Add feature test for declined article

---
 app/Http/Livewire/Modals/DeclinedArticle.php  |  6 ++-
 .../Livewire/Modal/DeclinedArticleTest.php    | 44 +++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 tests/Feature/Livewire/Modal/DeclinedArticleTest.php

diff --git a/app/Http/Livewire/Modals/DeclinedArticle.php b/app/Http/Livewire/Modals/DeclinedArticle.php
index 634437d2..6b96965b 100644
--- a/app/Http/Livewire/Modals/DeclinedArticle.php
+++ b/app/Http/Livewire/Modals/DeclinedArticle.php
@@ -7,10 +7,12 @@
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use App\Notifications\SendDeclinedArticle;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\View\View;
 use LivewireUI\Modal\ModalComponent;
 use App\Policies\ArticlePolicy;
 use App\Models\Article;
 
+
 final class DeclinedArticle extends ModalComponent
 {
     use AuthorizesRequests;
@@ -21,7 +23,7 @@ final class DeclinedArticle extends ModalComponent
 
     public ?Article $article = null;
 
-    protected $rules = [
+    protected array $rules = [
         'raison' => 'required|string|min:6',
         'description' => 'required|string',
     ];
@@ -54,7 +56,7 @@ public function declined(): void
     }
 
 
-    public function render()
+    public function render(): View
     {
         return view('livewire.modals.declined-article');
     }
diff --git a/tests/Feature/Livewire/Modal/DeclinedArticleTest.php b/tests/Feature/Livewire/Modal/DeclinedArticleTest.php
new file mode 100644
index 00000000..9577fb7c
--- /dev/null
+++ b/tests/Feature/Livewire/Modal/DeclinedArticleTest.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Http\Livewire\Modals\DeclinedArticle;
+use Illuminate\Support\Facades\Notification;
+use App\Notifications\SendDeclinedArticle;
+use Spatie\Permission\Models\Role;
+use App\Models\Article;
+use App\Models\User;
+use Livewire\Livewire;
+
+beforeEach(function (): void {
+    $this->moderatorUser = User::factory()->create();
+    Role::create(['name' => 'moderator']);
+    $this->moderatorUser->assignRole('moderator');
+    $this->article =Article::factory()->create();
+
+    $this->actingAs($this->moderatorUser);
+});
+
+describe(DeclinedArticle::class, function (): void {
+    it('Admin or moderator can declined article', function (): void {
+        Notification::fake();
+        expect($this->article->declined_at)
+            ->toBe(null);
+
+        Livewire::actingAs($this->moderatorUser)
+            ->test(DeclinedArticle::class, [(int) $this->article->id])
+            ->set('raison', 'Manque d\'originalité')
+            ->set('description', 'Malheureusement, après une étude approfondie, nous regrettons de vous informer que votre article n\'a pas été sélectionné pour publication dans notre liste d\'article.')
+            ->call('declined');
+
+        Notification::assertSentTo(
+            [$this->article->user], SendDeclinedArticle::class
+        );
+
+
+        expect(Article::findOrFail($this->article->id)->declined_at)
+            ->not
+            ->toBe(null);
+    });
+})
+    ->group('address');

From c867d2736e1c847848756a1b8156814cad0c6be2 Mon Sep 17 00:00:00 2001
From: cybersoldattech <cybersoldattech@users.noreply.github.com>
Date: Mon, 14 Oct 2024 18:52:20 +0000
Subject: [PATCH 5/5] Fix code styling

---
 app/Http/Livewire/Modals/DeclinedArticle.php         | 1 -
 tests/Feature/Livewire/Modal/DeclinedArticleTest.php | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Livewire/Modals/DeclinedArticle.php b/app/Http/Livewire/Modals/DeclinedArticle.php
index 6b96965b..2c6dbf72 100644
--- a/app/Http/Livewire/Modals/DeclinedArticle.php
+++ b/app/Http/Livewire/Modals/DeclinedArticle.php
@@ -12,7 +12,6 @@
 use App\Policies\ArticlePolicy;
 use App\Models\Article;
 
-
 final class DeclinedArticle extends ModalComponent
 {
     use AuthorizesRequests;
diff --git a/tests/Feature/Livewire/Modal/DeclinedArticleTest.php b/tests/Feature/Livewire/Modal/DeclinedArticleTest.php
index 9577fb7c..07a07938 100644
--- a/tests/Feature/Livewire/Modal/DeclinedArticleTest.php
+++ b/tests/Feature/Livewire/Modal/DeclinedArticleTest.php
@@ -14,7 +14,7 @@
     $this->moderatorUser = User::factory()->create();
     Role::create(['name' => 'moderator']);
     $this->moderatorUser->assignRole('moderator');
-    $this->article =Article::factory()->create();
+    $this->article = Article::factory()->create();
 
     $this->actingAs($this->moderatorUser);
 });
@@ -32,7 +32,8 @@
             ->call('declined');
 
         Notification::assertSentTo(
-            [$this->article->user], SendDeclinedArticle::class
+            [$this->article->user],
+            SendDeclinedArticle::class
         );