Merge pull request #40 from laravelcm/39-update-articles-process

39 update articles process

Author: mckenziearts

app/Http/Controllers/ArticlesController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\Article;
+use App\Models\User;
 use App\Policies\ArticlePolicy;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
@@ -21,6 +22,7 @@ public function index()
 
     public function show(Article $article)
     {
+        /** @var User $user */
         $user = Auth::user();
 
         views($article)->record();

app/Http/Controllers/User/DashboardController.php

@@ -13,8 +13,8 @@ public function dashboard()
         return view('user.dashboard', [
             'user' => $user = User::scopes('withCounts')->find(Auth::id()),
             'articles' => $user->articles()
-                ->orderByDesc('submitted_at')
                 ->orderByDesc('created_at')
+                ->orderBy('submitted_at')
                 ->paginate(5),
         ]);
     }

app/Http/Livewire/Articles/Create.php

@@ -5,9 +5,12 @@
 use App\Gamify\Points\PostCreated;
 use App\Models\Article;
 use App\Models\Tag;
+use App\Models\User;
+use App\Notifications\SendSubmittedArticle;
 use App\Traits\WithArticleAttributes;
 use App\Traits\WithTagsAssociation;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Notification;
 use Livewire\Component;
 use Livewire\WithFileUploads;
 
@@ -19,9 +22,9 @@ class Create extends Component
 
     public function mount()
     {
+        /** @var User $user */
         $user = Auth::user();
 
-        $this->submitted = ! $user->hasAnyRole(['admin', 'moderator']);
         $this->submitted_at = $user->hasAnyRole(['admin', 'moderator']) ? now() : null;
         $this->approved_at = $user->hasAnyRole(['admin', 'moderator']) ? now() : null;
     }
@@ -37,23 +40,18 @@ public function submit()
         $this->store();
     }
 
-    public function draft()
-    {
-        $this->submitted = false;
-        $this->store();
-    }
-
     public function store()
     {
         $this->validate();
 
+        /** @var User $user */
         $user = Auth::user();
 
+        /** @var Article $article */
         $article = Article::create([
             'title' => $this->title,
             'slug' => $this->slug,
             'body' => $this->body,
-            'submitted' => $this->submitted,
             'submitted_at' => $this->submitted_at,
             'approved_at' => $this->approved_at,
             'show_toc' => $this->show_toc,
@@ -69,8 +67,11 @@ public function store()
             $article->addMedia($this->file->getRealPath())->toMediaCollection('media');
         }
 
-        if ($this->submitted) {
-            // Envoi du mail a l'admin pour la validation de l'article
+        if ($article->submitted_at) {
+            // Envoi du mail à l'admin pour la validation de l'article.
+            $admin = User::findByEmailAddress('monneylobe@gmail.com');
+            Notification::send($admin, new SendSubmittedArticle($article));
+
             session()->flash('status', 'Merci d\'avoir soumis votre article. Vous aurez des nouvelles que lorsque nous accepterons votre article.');
         }
 

app/Http/Livewire/Articles/Edit.php

@@ -4,8 +4,13 @@
 
 use App\Models\Article;
 use App\Models\Tag;
+use App\Models\User;
+use App\Notifications\SendSubmittedArticle;
 use App\Traits\WithArticleAttributes;
 use App\Traits\WithTagsAssociation;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Notification;
 use Livewire\Component;
 use Livewire\WithFileUploads;
 
@@ -15,6 +20,7 @@ class Edit extends Component
 
     public Article $article;
     public ?string $preview = null;
+    public bool $alreadySubmitted = false;
 
     protected $listeners = ['markdown-x:update' => 'onMarkdownUpdate'];
 
@@ -25,6 +31,7 @@ public function mount(Article $article)
         $this->body = $article->body;
         $this->slug = $article->slug;
         $this->show_toc = $article->show_toc;
+        $this->submitted_at = $article->submitted_at;
         $this->canonical_url = $article->originalUrl();
         $this->preview = $article->getFirstMediaUrl('media');
         $this->associateTags = $this->tags_selected = old('tags', $article->tags()->pluck('id')->toArray());
@@ -35,6 +42,13 @@ public function onMarkdownUpdate(string $content)
         $this->body = $content;
     }
 
+    public function submit()
+    {
+        $this->alreadySubmitted = $this->article->submitted_at !== null;
+        $this->submitted_at = $this->article->submitted_at ?? now();
+        $this->store();
+    }
+
     public function store()
     {
         $this->save();
@@ -44,12 +58,16 @@ public function save()
     {
         $this->validate();
 
+        /** @var User $user */
+        $user = Auth::user();
+
         $this->article->update([
             'title' => $this->title,
             'slug' => $this->slug,
             'body' => $this->body,
             'show_toc' => $this->show_toc,
             'canonical_url' => $this->canonical_url,
+            'submitted_at' => $this->submitted_at,
         ]);
 
         $this->article->syncTags($this->associateTags);
@@ -58,7 +76,19 @@ public function save()
             $this->article->addMedia($this->file->getRealPath())->toMediaCollection('media');
         }
 
-        $this->redirectRoute('articles.show', $this->article);
+        if (! $this->alreadySubmitted) {
+            // Envoi du mail a l'admin pour la validation de l'article
+            $admin = User::findByEmailAddress('monneylobe@gmail.com');
+            Notification::send($admin, new SendSubmittedArticle($this->article));
+
+            session()->flash('status', 'Merci d\'avoir soumis votre article. Vous aurez des nouvelles uniquement quand nous accepterons votre article.');
+        }
+
+        Cache::forget('post-' . $this->article->id);
+
+        $user->hasRole('user') ?
+            $this->redirectRoute('dashboard') :
+            $this->redirectRoute('articles.show', $this->article);
     }
 
     public function render()

app/Http/Livewire/Modals/ApprovedArticle.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Http\Livewire\Modals;
+
+use App\Gamify\Points\PostCreated;
+use App\Models\Article;
+use App\Notifications\SendApprovedArticle;
+use App\Policies\ArticlePolicy;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Support\Facades\Cache;
+use LivewireUI\Modal\ModalComponent;
+
+class ApprovedArticle extends ModalComponent
+{
+    use AuthorizesRequests;
+
+    public ?Article $article = null;
+
+    public function mount(int $id)
+    {
+        $this->article = Article::find($id);
+    }
+
+    public static function modalMaxWidth(): string
+    {
+        return 'xl';
+    }
+
+    public function approved()
+    {
+        $this->authorize(ArticlePolicy::UPDATE, $this->article);
+
+        $this->article->update(['approved_at' => now()]);
+
+        givePoint(new PostCreated($this->article));
+
+        Cache::forget('post-' . $this->article->id);
+
+        $this->article->author->notify(new SendApprovedArticle($this->article));
+
+        session()->flash('status', 'L\'article a été approuvé et le mail a été envoyé à l\'auteur pour le notifier.');
+
+        $this->redirectRoute('articles');
+    }
+
+    public function render()
+    {
+        return view('livewire.modals.approved-article');
+    }
+}

app/Http/Middleware/HttpsProtocol.php

@@ -9,7 +9,7 @@ class HttpsProtocol
 {
     public function handle(Request $request, Closure $next)
     {
-        if (! $request->isSecure() && app()->environment('production')) {
+        if (app()->environment('production') && ! $request->isSecure()) {
             return redirect()->secure($request->getRequestUri());
         }
 

app/Models/Article.php

@@ -73,6 +73,7 @@ class Article extends Model implements ReactableInterface, HasMedia, Viewable
      */
     protected $with = [
         'author',
+        'media',
     ];
 
     protected $removeViewsOnDelete = true;

app/Notifications/SendApprovedArticle.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Notifications;
+
+use App\Models\Article;
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class SendApprovedArticle extends Notification
+{
+    use Queueable;
+
+    public function __construct(public Article $article)
+    {
+    }
+
+    public function via($notifiable): array
+    {
+        return ['mail'];
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        return (new MailMessage)
+                    ->subject('Article Approuvé 🎉.')
+                    ->greeting('Article Approuvé 🎉.')
+                    ->line('Merci d\'avoir soumis votre article pour créer du contenu au sein de Laravel Cameroun.')
+                    ->action('Voir mon article', route('articles.show', $this->article))
+                    ->line('Merci d\'avoir utilisé Laravel Cameroun.!');
+    }
+}

app/Notifications/SendEMailToDeletedUser.php

@@ -35,6 +35,6 @@ public function toMail($notifiable)
                     ->line('Pour des raisons de validité et d\'authenticité de votre adresse email')
                     ->line('Nous avons supprimé votre compte après 10 jours d\'inscription sans validation de votre adresse email.')
                     ->line('Nous ne pouvons donc pas authentifier que cette adresse email est belle et bien utilisée.')
-                    ->line('Merci d\'avoir utilise Laravel Cameroun!');
+                    ->line('Merci d\'avoir utilisé Laravel Cameroun!');
     }
 }

app/Notifications/SendSubmittedArticle.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Notifications;
+
+use App\Models\Article;
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class SendSubmittedArticle extends Notification
+{
+    use Queueable;
+
+    public function __construct(public Article $article)
+    {
+    }
+
+    public function via($notifiable): array
+    {
+        return ['mail'];
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        return (new MailMessage)
+                    ->subject('Nouvelle soumission d\'article')
+                    ->greeting('Bonjour Admin!')
+                    ->line("Un nouvel article a été soumis par {$this->article->author->name}")
+                    ->action('Afficher l\'article', route('articles.show', $this->article))
+                    ->line('Merci d\'avoir utilisé Laravel Cameroun!');
+    }
+}

app/Traits/HasProfilePhoto.php

@@ -15,7 +15,7 @@ public function getProfilePhotoUrlAttribute(): string
             return $this->getFirstMediaUrl('avatar');
         }
 
-        $social_avatar = $this->providers()->where('provider', $this->avatar_type)->first();
+        $social_avatar = $this->providers->where('provider', $this->avatar_type)->first();
 
         if ($social_avatar && strlen($social_avatar->avatar)) {
             return $social_avatar->avatar;

app/Traits/WithArticleAttributes.php

@@ -10,15 +10,14 @@ trait WithArticleAttributes
     public ?string $slug = null;
     public string $body = '';
     public ?string $canonical_url = null;
-    public bool $show_toc = true;
-    public bool $submitted = true;
+    public bool $show_toc = false;
     public ?string $submitted_at = null;
     public ?string $approved_at = null;
     public $file;
 
     protected $rules = [
-        'title' => ['required', 'max:150'],
-        'body' => ['required'],
+        'title' => 'required|max:150',
+        'body' => 'required',
         'tags_selected' => 'nullable|array',
         'canonical_url' => 'nullable|url',
         'file' => 'nullable|image|max:2048', // 1MB Max

package.json

@@ -21,9 +21,7 @@
     "lodash": "^4.17.19",
     "postcss": "^8.4.5",
     "postcss-loader": "^6.2.1",
-    "postcss-preset-env": "^7.0.1",
-    "prettier": "^2.3.1",
-    "prettier-standard": "^16.4.1"
+    "postcss-preset-env": "^7.0.1"
   },
   "dependencies": {
     "@alpinejs/intersect": "^3.6.1",

public/css/app.css

@@ -1,4 +1,4 @@
 {
-    "/js/app.js": "/js/app.js?id=c897f885ae4994f36dfc",
-    "/css/app.css": "/css/app.css?id=84c90922f73faacd4564"
+    "/js/app.js": "/js/app.js?id=1d8832a55a90910e91ad",
+    "/css/app.css": "/css/app.css?id=543449437fc1da0337d7"
 }

public/js/app.js

@@ -211,11 +211,18 @@ class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md sha
                     </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-gray-400 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">
+                            <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="sr-only">Éditer</span>
                                 <x-heroicon-s-pencil class="h-5 w-5" />
                             </a>
-                            <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-gray-400 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">
+                            @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">
+                                        <x-heroicon-s-badge-check class="h-5 w-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">
                                 <span class="sr-only">Supprimer</span>
                                 <x-heroicon-s-trash class="h-5 w-5" />
                             </button>

public/mix-manifest.json

@@ -0,0 +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']) }}>
+    {{ $slot }}
+</button>