Merge pull request #29 from laravelcm/update-forum-section

✨ ajout de la possibilite de retirer un thread comme resolu
laravelcm · Dec 6, 2021 · 6ba5c81 · 6ba5c81
2 parents d4e1853 + b4b9cae
commit 6ba5c81
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 16 deletions.
diff --git a/app/Http/Livewire/Forum/Reply.php b/app/Http/Livewire/Forum/Reply.php
@@ -59,6 +59,20 @@ public function edit()
         $this->emitSelf('refresh');
     }
 
+    public function UnMarkAsSolution(): void
+    {
+        $this->authorize(ThreadPolicy::UPDATE, $this->thread);
+
+        $this->thread->unmarkSolution();
+
+        $this->emitSelf('refresh');
+
+        $this->notification()->success(
+            'Réponse acceptée',
+            'Vous avez retiré cette réponse comme solution pour ce sujet.'
+        );
+    }
+
     public function markAsSolution(): void
     {
         $this->authorize(ThreadPolicy::UPDATE, $this->thread);

diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,4 +1,4 @@
 {
     "/js/app.js": "/js/app.js?id=9abd09e80a5426001802",
-    "/css/app.css": "/css/app.css?id=2d48602df6b458ee81ad"
+    "/css/app.css": "/css/app.css?id=29b070295883a7994af2"
 }
diff --git a/resources/views/components/forum/thread.blade.php b/resources/views/components/forum/thread.blade.php
@@ -62,6 +62,6 @@ class="origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg bg-skin-
         <x-markdown-content :content="$thread->body" />
     </div>
     <div class="mt-6">
-        <livewire:reactions wire:key="$thread->id" :model="$thread" :with-place-holder="false"/>
+        <livewire:reactions wire:key="$thread->id" :model="$thread" :with-place-holder="false" :with-background="false"/>
     </div>
 </div>
diff --git a/resources/views/livewire/forum/reply.blade.php b/resources/views/livewire/forum/reply.blade.php
@@ -2,7 +2,7 @@
 
 <li x-data="{ open: @entangle('isUpdating') }" @class(['sm:-mx-4 p-4 border border-green-500 rounded-md relative z-10' => $isSolution])>
     <div class="sm:flex sm:space-x-3" id="reply-{{ $reply->id }}">
-        <div class="flex items-center font-sans">
+        <div class="flex items-center font-sans sm:items-start">
             <div class="flex-shrink-0">
                 <img class="h-10 w-10 rounded-full" src="{{ $reply->author->profile_photo_url }}" alt="Avatar de {{ $reply->author->username }}">
             </div>
@@ -14,8 +14,8 @@
             </div>
         </div>
         <div x-show="!open" class="flex-1">
-            <div class="hidden sm:flex sm:items-start">
-                <div class="flex items-center flex-1 text-sm space-x-2 font-sans">
+            <div class="flex items-start">
+                <div class="hidden sm:flex sm:items-center flex-1 text-sm space-x-2 font-sans">
                     <a href="{{ route('profile', $reply->author->username) }}" class="font-medium text-skin-inverted">
                         {{ $reply->author->name }} <span class="inline-flex text-skin-muted">{{ '@' . $reply->author->username }}</span>
                     </a>
@@ -31,20 +31,30 @@
                         </div>
                     @endcan
                 </div>
-                @if ($isSolution)
-                    <span class="absolute -top-3 z-20 right-3 ml-4 inline-flex items-center px-3 py-0.5 rounded-full text-sm font-medium bg-green-500 text-green-900">
-                        <x-heroicon-o-check-circle class="h-4 w-4 mr-1.5" />
-                        Réponse acceptée
-                    </span>
-                @else
-                    @can(App\Policies\ThreadPolicy::UPDATE, $thread)
-                        <div class="ml-4">
+                @can(App\Policies\ThreadPolicy::UPDATE, $thread)
+                    @if ($isSolution)
+                        <div class="mt-2 flex items-center sm:mt-0 sm:ml-4 sm:-mt-3">
+                            <button wire:click="UnMarkAsSolution" type="button" class="inline-flex items-center justify-center p-2.5 bg-red-500 bg-opacity-10 text-red-600 text-sm leading-5 rounded-full focus:outline-none transform hover:scale-125 transition-all">
+                                <x-heroicon-s-x-circle class="w-6 h-6" />
+                            </button>
+                            <span class="ml-2 text-sm font-sans text-red-500 sm:hidden">Retirer comme solution</span>
+                        </div>
+                    @else
+                        <div class="mt-2 flex items-center sm:mt-0 sm:ml-4 sm:-mt-3">
                             <button wire:click="markAsSolution" type="button" class="inline-flex items-center justify-center p-2.5 bg-green-500 bg-opacity-10 text-green-600 text-sm leading-5 rounded-full focus:outline-none transform hover:scale-125 transition-all">
                                 <x-heroicon-s-check-circle class="w-6 h-6" />
                             </button>
+                            <span class="ml-2 text-sm font-sans text-green-500 sm:hidden">Marquer comme solution</span>
                         </div>
-                    @endcan
-                @endif
+                    @endif
+                @else
+                    @if($isSolution)
+                        <span class="absolute -top-3 z-20 right-3 ml-4 inline-flex items-center px-3 py-0.5 rounded-full text-sm font-medium bg-green-500 text-green-900">
+                            <x-heroicon-o-check-circle class="h-4 w-4 mr-1.5" />
+                            Réponse acceptée
+                        </span>
+                    @endif
+                @endcan
             </div>
             <div class="mt-1 font-normal prose sm:prose-base prose-green text-skin-base overflow-x-auto sm:max-w-none">
                 <x-markdown-content :content="$reply->body" />