From 8a9ae6ebdc0b69a67f6ed016118828f18a00fb0f Mon Sep 17 00:00:00 2001
From: Jiordi Viera <jiordikengne@gmail.com>
Date: Sat, 26 Oct 2024 15:54:02 +0100
Subject: [PATCH 1/5] initialize branch

---
 app/Http/Controllers/ArticlesController.php | 4 ++--
 resources/views/articles/show.blade.php     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/ArticlesController.php b/app/Http/Controllers/ArticlesController.php
index 7b2c0dc5..486365a3 100644
--- a/app/Http/Controllers/ArticlesController.php
+++ b/app/Http/Controllers/ArticlesController.php
@@ -28,7 +28,7 @@ public function show(Article $article): View
         /** @var User $user */
         $user = Auth::user();
 
-        views($article)->record();
+        views($article)->cooldown(now()->addHours(2))->record();
 
         /** @var Article $article */
         $article = Cache::remember('post-'.$article->id, now()->addHour(), fn () => $article);
@@ -66,4 +66,4 @@ public function edit(Article $article): View
 
         return view('articles.edit', compact('article'));
     }
-}
+}
\ No newline at end of file
diff --git a/resources/views/articles/show.blade.php b/resources/views/articles/show.blade.php
index b6d45894..36291c32 100644
--- a/resources/views/articles/show.blade.php
+++ b/resources/views/articles/show.blade.php
@@ -8,6 +8,7 @@
         $next = $article->nextArticle();
         $previous = $article->previousArticle();
         $user = $article->user;
+        
     @endphp
 
     <article class="relative lg:grid lg:grid-cols-9 lg:gap-10" xmlns:livewire="http://www.w3.org/1999/html">

From 5858a647f2f77016ca3438071846dad697e55da1 Mon Sep 17 00:00:00 2001
From: Jiordi Viera <jiordikengne@gmail.com>
Date: Sat, 26 Oct 2024 16:39:51 +0100
Subject: [PATCH 2/5] =?UTF-8?q?correction=20de=20l'erreur=20500=20afficher?=
 =?UTF-8?q?=20apres=20avoir=20comment=C3=A9=20une=20discussion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Livewire/Discussions/AddComment.php  |   4 +-
 app/helpers.php                               |  13 +++
 resources/views/articles/show.blade.php       | 103 +++++++++---------
 .../views/components/articles/card.blade.php  |  12 +-
 4 files changed, 72 insertions(+), 60 deletions(-)

diff --git a/app/Http/Livewire/Discussions/AddComment.php b/app/Http/Livewire/Discussions/AddComment.php
index f0eb5b4d..a04c8713 100644
--- a/app/Http/Livewire/Discussions/AddComment.php
+++ b/app/Http/Livewire/Discussions/AddComment.php
@@ -51,11 +51,11 @@ public function saveComment(): void
             ->duration(5000)
             ->send();
 
-        $this->reset();
+        $this->reset('body');
     }
 
     public function render(): View
     {
         return view('livewire.discussions.add-comment');
     }
-}
+}
\ No newline at end of file
diff --git a/app/helpers.php b/app/helpers.php
index 4aac8e3c..6691edd4 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -91,3 +91,16 @@ function route_to_reply_able(mixed $replyAble): string
             route('discussions.show', $replyAble->slug());
     }
 }
+
+if(! function_exists('getAvatar')) {
+	/**
+	 * @param $title
+	 * @param  bool  $rounded
+	 *
+	 * @return string
+	 */
+    function getAvatar($title,bool $rounded=false): string
+    {
+        return 'https://ui-avatars.com/api/?name=' . urlencode($title). '&background=random&bold=true&format=svg&size=512&rounded='.$rounded;
+    }
+}
\ No newline at end of file
diff --git a/resources/views/articles/show.blade.php b/resources/views/articles/show.blade.php
index 36291c32..5f4a1e18 100644
--- a/resources/views/articles/show.blade.php
+++ b/resources/views/articles/show.blade.php
@@ -8,18 +8,17 @@
         $next = $article->nextArticle();
         $previous = $article->previousArticle();
         $user = $article->user;
-        
     @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" />
@@ -35,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
 
@@ -68,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 }}" onerror="this.onerror=null;this.src='{{ getAvatar($next->title) }}'">
                                     <span class="text-sm font-medium leading-4 text-skin-inverted hover:text-skin-primary-hover line-clamp-2">{{ $next->title }}</span>
                                 </a>
                             </div>
@@ -78,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 }}" onerror="this.onerror=null;this.src='{{ getAvatar($previous->title) }}'">
                                     <span class="text-sm font-medium leading-4 text-skin-inverted hover:text-skin-primary-hover line-clamp-2">{{ $previous->title }}</span>
                                 </a>
                             </div>
@@ -107,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>
@@ -118,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 }}" onerror="this.onerror=null;this.src='{{ getAvatar($article->user->username) }}'">
                         </div>
                         <div class="ml-3">
                             <p class="text-sm font-medium text-skin-inverted">
@@ -136,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 }}" onerror="this.onerror=null;this.src='{{ getAvatar($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">
@@ -165,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
 
@@ -195,22 +194,22 @@ 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>
@@ -223,22 +222,22 @@ class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md sha
                         <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>
                         </span>
                     </div>
@@ -247,12 +246,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>
@@ -264,8 +263,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>
@@ -277,13 +276,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
@@ -321,7 +320,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"
@@ -335,15 +334,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/articles/card.blade.php b/resources/views/components/articles/card.blade.php
index ea07f90f..06151233 100644
--- a/resources/views/components/articles/card.blade.php
+++ b/resources/views/components/articles/card.blade.php
@@ -12,7 +12,7 @@
 >
     <a href="{{ route('articles.show', $article) }}" class="group">
         <div class="aspect-w-3 aspect-h-2">
-            <img class="object-cover shadow-lg rounded-lg group-hover:opacity-75" src="{{ $article->getFirstMediaUrl('media') }}" alt="{{ $article->title }}" />
+            <img class="object-cover rounded-lg shadow-lg group-hover:opacity-75" src="{{ $article->getFirstMediaUrl('media') }}" alt="{{ $article->title }}" onerror="this.onerror=null;this.src='{{ getAvatar($article->title) }}'" />
         </div>
     </a>
     <div
@@ -22,18 +22,18 @@
         ])
     >
         <div>
-            <time datetime="{{ $article->publishedAt()->format('Y-m-d') }}" class="font-sans text-sm leading-5 text-skin-base capitalize">
+            <time datetime="{{ $article->publishedAt()->format('Y-m-d') }}" class="font-sans text-sm leading-5 capitalize text-skin-base">
                 {{ $article->publishedAt()->isoFormat('LL') }}
             </time>
-            <a href="{{ route('articles.show', $article) }}" class="mt-2 flex items-center justify-between group">
-                <h4 class="text-lg leading-6 font-semibold font-sans text-skin-inverted group-hover:text-skin-primary">
+            <a href="{{ route('articles.show', $article) }}" class="flex items-center justify-between mt-2 group">
+                <h4 class="font-sans text-lg font-semibold leading-6 text-skin-inverted group-hover:text-skin-primary">
                     {{ $article->title }}
                 </h4>
                 @if($iconLink)
-                    <x-untitledui-link-external-01 class="ml-2 h-5 w-5 text-skin-base" />
+                    <x-untitledui-link-external-01 class="w-5 h-5 ml-2 text-skin-base" />
                 @endif
             </a>
-            <p class="mt-1 font-normal text-skin-base leading-6">
+            <p class="mt-1 font-normal leading-6 text-skin-base">
                 {!! $article->excerpt(150) !!}
             </p>
         </div>

From 38b996e95ea7859005e223b866e21f47baa67bb4 Mon Sep 17 00:00:00 2001
From: Jiordi Viera <jiordikengne@gmail.com>
Date: Sat, 26 Oct 2024 16:56:09 +0100
Subject: [PATCH 3/5] =?UTF-8?q?correction=20des=20probl=C3=A8mes=20avec=20?=
 =?UTF-8?q?le=20merge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/articles/show.blade.php       | 102 +++++++++---------
 .../views/components/articles/card.blade.php  |  12 +--
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/resources/views/articles/show.blade.php b/resources/views/articles/show.blade.php
index 5f4a1e18..1ab9f201 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="relative hidden lg:block lg:col-span-2">
-            <x-sticky-content class="space-y-6 divide-y divide-skin-base">
+        <div class="hidden relative lg:block lg:col-span-2">
+            <x-sticky-content class="divide-y divide-skin-base space-y-6">
                 <div>
-                    <h4 class="text-xs font-medium leading-4 tracking-wide uppercase text-skin-base font-heading">
+                    <h4 class="text-xs text-skin-base font-medium leading-4 tracking-wide uppercase font-heading">
                         {{ __('A propos de l’auteur') }}
                     </h4>
                     <div class="mt-6 space-y-4">
-                        <a href="{{ route('profile', $user->username) }}" class="block shrink-0">
+                        <a href="{{ route('profile', $user->username) }}" class="shrink-0 block">
                             <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 leading-5 text-skin-base">{{ $user->bio }}</p>
+                            <p class="text-sm text-skin-base leading-5">{{ $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="w-6 h-6"/>
+                                    <x-icon.twitter class="h-6 w-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="w-6 h-6"/>
+                                    <x-icon.linkedin class="h-6 w-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="w-6 h-6"/>
+                                    <x-icon.github class="h-6 w-6"/>
                                 </a>
                             @endif
 
@@ -67,9 +67,9 @@
                     <div class="pt-6 space-y-6">
                         @if($next)
                             <div>
-                                <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 }}" onerror="this.onerror=null;this.src='{{ getAvatar($next->title) }}'">
+                                <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 }}">
                                     <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 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 }}" onerror="this.onerror=null;this.src='{{ getAvatar($previous->title) }}'">
+                                <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 }}">
                                     <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="flex mt-2 space-x-1 text-sm text-skin-base sm:mt-0">
+                    <div class="mt-2 flex 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="block mt-3 shrink-0 group lg:hidden">
+                <a href="{{ route('profile', $article->user->username) }}" class="mt-3 shrink-0 group block lg:hidden">
                     <div class="flex items-center">
                         <div>
-                            <img class="inline-block w-8 h-8 rounded-full" src="{{ $article->user->profile_photo_url }}" alt="{{ $article->user->username }}" onerror="this.onerror=null;this.src='{{ getAvatar($article->user->username) }}'">
+                            <img class="inline-block h-8 w-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="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 }}" onerror="this.onerror=null;this.src='{{ getAvatar($article->title) }}'" />
+                <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>
             @endif
 
             <x-markdown-content
                 id="content"
-                class="mx-auto mt-8 overflow-x-hidden prose prose-lg prose-green text-skin-base md:prose-xl lg:max-w-none"
+                class="mt-8 prose prose-lg prose-green text-skin-base mx-auto overflow-x-hidden md:prose-xl lg:max-w-none"
                 :content="$article->body"
             />
 
-            <div class="pt-5 mt-6 border-t border-skin-base sm:hidden">
+            <div class="mt-6 pt-5 border-t border-skin-base sm:hidden">
                 <div class="space-y-4">
-                    <a href="{{ route('profile', $user->username) }}" class="block shrink-0">
+                    <a href="{{ route('profile', $user->username) }}" class="shrink-0 block">
                         <div class="flex items-center">
                             <div>
-                                <img class="inline-block rounded-full h-9 w-9" src="{{ $user->profile_photo_url }}" alt="{{ $user->username }}">
+                                <img class="inline-block h-9 w-9 rounded-full" 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="mx-auto mt-8 overflow-x-hidden prose prose-lg prose-green text-skin-base
                         </div>
                     </a>
                     @if($user->bio)
-                        <p class="text-sm leading-5 text-skin-base">{{ $user->bio }}</p>
+                        <p class="text-sm text-skin-base leading-5">{{ $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="w-6 h-6"/>
+                                <x-icon.twitter class="h-6 w-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="w-6 h-6"/>
+                                <x-icon.linkedin class="h-6 w-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="w-6 h-6"/>
+                                <x-icon.github class="h-6 w-6"/>
                             </a>
                         @endif
 
@@ -194,22 +194,22 @@ class="mx-auto mt-8 overflow-x-hidden prose prose-lg prose-green text-skin-base
             </div>
 
             <div class="py-6">
-                <p class="text-base font-normal text-skin-base">
+                <p class="text-base text-skin-base font-normal">
                     {{ __('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 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">
+                       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">
                         <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 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">
+                       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">
                         <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 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">
+                       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">
                         <x-icon.linkedin class="h-5 w-5 mr-1.5" />
                         {{ __('LinkedIn') }}
                     </a>
@@ -222,22 +222,22 @@ class="inline-flex items-center px-4 py-2 text-sm font-normal leading-5 border r
                         <div class="w-full border-t border-skin-base"></div>
                     </div>
                     <div class="relative flex justify-center">
-                        <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="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="sr-only">{{ __('Éditer') }}</span>
-                                <x-heroicon-s-pencil class="w-5 h-5" />
+                                <x-heroicon-s-pencil class="h-5 w-5" />
                             </a>
                             @if($article->isNotApproved())
                                 @hasanyrole('admin|moderator')
-                                    <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">
+                                    <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">
                                         <span class="sr-only">{{ __('Approuver') }}</span>
-                                        <x-untitledui-check-verified-02 class="w-5 h-5" />
+                                        <x-untitledui-check-verified-02 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 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">
+                            <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-untitledui-trash-03 class="w-5 h-5" />
+                                <x-untitledui-trash-03 class="h-5 w-5" />
                             </button>
                         </span>
                     </div>
@@ -246,12 +246,12 @@ class="inline-flex items-center px-4 py-2 text-sm font-normal leading-5 border r
 
             @if($next || $previous)
                 <footer class="mt-10 border-t border-skin-light lg:hidden">
-                    <div class="py-8 space-y-8 sm:flex sm:items-center sm:justify-between sm:space-y-0">
+                    <div class="space-y-8 py-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="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="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 }}" onerror="this.onerror=null;this.src='{{ getAvatar($next->title) }}'">
                                     <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 +263,8 @@ class="inline-flex items-center px-4 py-2 text-sm font-normal leading-5 border r
                         @if($previous)
                             <div>
                                 <h2 class="text-xs leading-5 tracking-wide uppercase text-skin-base">{{ __('Article précédent') }}</h2>
-                                <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="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 }}" onerror="this.onerror=null;this.src='{{ getAvatar($previous->title) }}'">
                                     <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 +276,13 @@ class="inline-flex items-center px-4 py-2 text-sm font-normal leading-5 border r
                 </footer>
             @endif
         </div>
-        <div class="relative hidden lg:block lg:col-span-2">
+        <div class="hidden relative lg:block lg:col-span-2">
             <x-sticky-content class="space-y-10">
                 <x-sponsors />
 
                 @if($article->showToc())
-                    <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>
+                    <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>
                         <x-toc class="mt-4 toc" id="toc">{!! $article->body !!}</x-toc>
                     </div>
                 @endif
@@ -320,7 +320,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 flex max-w-full pl-10 mt-16">
+                        <div class="fixed inset-y-0 right-0 pl-10 mt-16 max-w-full flex">
                             <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 +334,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="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">
+                                            <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">
                                                     <span class="sr-only">{{ __('Fermer') }}</span>
-                                                    <x-untitledui-x class="w-6 h-6" />
+                                                    <x-untitledui-x class="h-6 w-6" />
                                                 </button>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="relative flex-1 px-4 mt-6 sm:px-6">
+                                    <div class="mt-6 relative flex-1 px-4 sm:px-6">
                                         <x-toc class="toc" id="toc">{!! $article->body !!}</x-toc>
                                     </div>
                                 </div>
diff --git a/resources/views/components/articles/card.blade.php b/resources/views/components/articles/card.blade.php
index 06151233..cbe82a7e 100644
--- a/resources/views/components/articles/card.blade.php
+++ b/resources/views/components/articles/card.blade.php
@@ -12,7 +12,7 @@
 >
     <a href="{{ route('articles.show', $article) }}" class="group">
         <div class="aspect-w-3 aspect-h-2">
-            <img class="object-cover rounded-lg shadow-lg group-hover:opacity-75" src="{{ $article->getFirstMediaUrl('media') }}" alt="{{ $article->title }}" onerror="this.onerror=null;this.src='{{ getAvatar($article->title) }}'" />
+            <img class="object-cover shadow-lg rounded-lg group-hover:opacity-75" src="{{ $article->getFirstMediaUrl('media') }}" alt="{{ $article->title }}" onerror="this.onerror=null;this.src='{{ getAvatar($article->title) }}'"  />
         </div>
     </a>
     <div
@@ -22,18 +22,18 @@
         ])
     >
         <div>
-            <time datetime="{{ $article->publishedAt()->format('Y-m-d') }}" class="font-sans text-sm leading-5 capitalize text-skin-base">
+            <time datetime="{{ $article->publishedAt()->format('Y-m-d') }}" class="font-sans text-sm leading-5 text-skin-base capitalize">
                 {{ $article->publishedAt()->isoFormat('LL') }}
             </time>
-            <a href="{{ route('articles.show', $article) }}" class="flex items-center justify-between mt-2 group">
-                <h4 class="font-sans text-lg font-semibold leading-6 text-skin-inverted group-hover:text-skin-primary">
+            <a href="{{ route('articles.show', $article) }}" class="mt-2 flex items-center justify-between group">
+                <h4 class="text-lg leading-6 font-semibold font-sans text-skin-inverted group-hover:text-skin-primary">
                     {{ $article->title }}
                 </h4>
                 @if($iconLink)
-                    <x-untitledui-link-external-01 class="w-5 h-5 ml-2 text-skin-base" />
+                    <x-untitledui-link-external-01 class="ml-2 h-5 w-5 text-skin-base" />
                 @endif
             </a>
-            <p class="mt-1 font-normal leading-6 text-skin-base">
+            <p class="mt-1 font-normal text-skin-base leading-6">
                 {!! $article->excerpt(150) !!}
             </p>
         </div>

From 002b161dc3a8aea47bc962ae2b2dd398fa2e6917 Mon Sep 17 00:00:00 2001
From: Jiordi Viera <jiordikengne@gmail.com>
Date: Thu, 31 Oct 2024 09:15:57 +0100
Subject: [PATCH 4/5] file preview fix

---
 app/helpers.php                                     | 13 -------------
 resources/views/articles/show.blade.php             | 10 +++++-----
 .../components/articles/card-with-author.blade.php  |  2 +-
 resources/views/components/articles/card.blade.php  |  2 +-
 .../views/components/articles/overview.blade.php    |  2 +-
 .../views/components/forms/single-upload.blade.php  |  2 +-
 resources/views/livewire/articles/_form.blade.php   |  4 ++--
 7 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index 6691edd4..4aac8e3c 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -91,16 +91,3 @@ function route_to_reply_able(mixed $replyAble): string
             route('discussions.show', $replyAble->slug());
     }
 }
-
-if(! function_exists('getAvatar')) {
-	/**
-	 * @param $title
-	 * @param  bool  $rounded
-	 *
-	 * @return string
-	 */
-    function getAvatar($title,bool $rounded=false): string
-    {
-        return 'https://ui-avatars.com/api/?name=' . urlencode($title). '&background=random&bold=true&format=svg&size=512&rounded='.$rounded;
-    }
-}
\ No newline at end of file
diff --git a/resources/views/articles/show.blade.php b/resources/views/articles/show.blade.php
index 1ab9f201..2431f2ce 100644
--- a/resources/views/articles/show.blade.php
+++ b/resources/views/articles/show.blade.php
@@ -69,7 +69,7 @@
                             <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 }}">
+                                    <img class="h-8 w-8 object-cover shadow-lg rounded-md" src="{{ $next->getFirstMediaUrl('media') }}" alt="{{ $next->slug }}" onerror="this.onerror=null;this.src='{{ asset('images/socialcard.png') }}'">
                                     <span class="text-sm font-medium leading-4 text-skin-inverted hover:text-skin-primary-hover line-clamp-2">{{ $next->title }}</span>
                                 </a>
                             </div>
@@ -79,7 +79,7 @@
                             <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 }}">
+                                    <img class="h-8 w-8 object-cover shadow-lg rounded-md" src="{{ $previous->getFirstMediaUrl('media') }}" alt="{{ $previous->slug }}" onerror="this.onerror=null;this.src='{{ asset('images/socialcard.png') }}'">
                                     <span class="text-sm font-medium leading-4 text-skin-inverted hover:text-skin-primary-hover line-clamp-2">{{ $previous->title }}</span>
                                 </a>
                             </div>
@@ -229,7 +229,7 @@ class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md sha
                             </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="-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:ring-offset-body">
                                         <span class="sr-only">{{ __('Approuver') }}</span>
                                         <x-untitledui-check-verified-02 class="h-5 w-5" />
                                     </button>
@@ -251,7 +251,7 @@ class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md sha
                             <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 }}" onerror="this.onerror=null;this.src='{{ getAvatar($next->title) }}'">
+                                    <img class="h-10 w-10 object-cover shadow-lg rounded-md" src="{{ $next->getFirstMediaUrl('media') ?? asset('images/socialcard.png') }}" alt="{{ $next->slug }}" onerror="this.onerror=null;this.src='{{ asset('images/socialcard.png') }}'">
                                     <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>
@@ -264,7 +264,7 @@ class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md sha
                             <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 }}" onerror="this.onerror=null;this.src='{{ getAvatar($previous->title) }}'">
+                                    <img class="h-10 w-10 object-cover shadow-lg rounded-md" src="{{ $previous->getFirstMediaUrl('media') ?? asset('images/socialcard.png') }}" alt="{{ $previous->slug }}" onerror="this.onerror=null; this.src='{{ asset('images/socialcard.png') }}'">
                                     <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>
diff --git a/resources/views/components/articles/card-with-author.blade.php b/resources/views/components/articles/card-with-author.blade.php
index d209e790..4bb3aafe 100644
--- a/resources/views/components/articles/card-with-author.blade.php
+++ b/resources/views/components/articles/card-with-author.blade.php
@@ -24,7 +24,7 @@
             {!! $article->excerpt(175) !!}
         </p>
         <div class="relative h-96 overflow-hidden">
-            <img class="w-full h-full object-cover shadow-lg rounded-lg group-hover:opacity-75" src="{{ $article->getFirstMediaUrl('media') }}" alt="{{ $article->title }}" />
+            <img class="w-full h-full object-cover shadow-lg rounded-lg group-hover:opacity-75" src="{{ $article->getFirstMediaUrl('media') }}" alt="{{ $article->title }}" onerror="this.src='{{ asset('images/socialcard.png') }}'" />
         </div>
         <div class="flex justify-between space-x-8">
             <div class="flex space-x-6">
diff --git a/resources/views/components/articles/card.blade.php b/resources/views/components/articles/card.blade.php
index cbe82a7e..1cb4efce 100644
--- a/resources/views/components/articles/card.blade.php
+++ b/resources/views/components/articles/card.blade.php
@@ -12,7 +12,7 @@
 >
     <a href="{{ route('articles.show', $article) }}" class="group">
         <div class="aspect-w-3 aspect-h-2">
-            <img class="object-cover shadow-lg rounded-lg group-hover:opacity-75" src="{{ $article->getFirstMediaUrl('media') }}" alt="{{ $article->title }}" onerror="this.onerror=null;this.src='{{ getAvatar($article->title) }}'"  />
+            <img class="object-cover shadow-lg rounded-lg group-hover:opacity-75" src="{{ $article->getFirstMediaUrl('media') }}" alt="{{ $article->title }}" onerror="this.onerror=null;this.src='{{ asset('images/socialcard.png') }}'"  />
         </div>
     </a>
     <div
diff --git a/resources/views/components/articles/overview.blade.php b/resources/views/components/articles/overview.blade.php
index 893bd6f6..ba895830 100644
--- a/resources/views/components/articles/overview.blade.php
+++ b/resources/views/components/articles/overview.blade.php
@@ -5,7 +5,7 @@
         <div class="aspect-w-3 aspect-h-2">
             <img class="object-cover shadow-lg rounded-lg group-hover:opacity-75"
                  src="{{ $article->getFirstMediaUrl('media') }}"
-                 alt="{{ $article->title }}"
+                 alt="{{ $article->title }}" onerror="this.src='{{ asset('images/socialcard.png') }}'"
             />
         </div>
     </a>
diff --git a/resources/views/components/forms/single-upload.blade.php b/resources/views/components/forms/single-upload.blade.php
index e600b797..596d78cb 100644
--- a/resources/views/components/forms/single-upload.blade.php
+++ b/resources/views/components/forms/single-upload.blade.php
@@ -32,7 +32,7 @@
                 <p class="mt-1 text-xs text-skin-muted">
                     {{ __('PNG, JPG, GIF up to 1MB') }}
                 </p>
-                <input @focus="focused = true" @blur="focused = false" class="sr-only" type="file" {{ $attributes }} />
+                <input @focus="focused = true" @blur="focused = false" class="sr-only" type="file" accept="image/jpg, image/jpeg, image/png" {{ $attributes }} />
             </div>
             <div class="w-full h-full hidden flex items-center justify-center" wire:loading.class.remove="hidden" wire:target="file">
                 <x-loader wire:loading wire:target="file" class="text-green-600" />
diff --git a/resources/views/livewire/articles/_form.blade.php b/resources/views/livewire/articles/_form.blade.php
index e243a5fe..51b8ffb3 100644
--- a/resources/views/livewire/articles/_form.blade.php
+++ b/resources/views/livewire/articles/_form.blade.php
@@ -22,7 +22,7 @@
                             {{ __('Enregistrer') }}
                         </button>
                         <span x-data="{ open: false }" @keydown.escape.stop="open = false;" @click.away="open = false" class="-ml-px relative block">
-                            <button type="button" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-transparent text-sm font-medium text-white text-white bg-green-600 hover:bg-green-700 focus:z-10 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-body focus:ring-green-500"
+                            <button type="button" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-transparent text-sm font-medium text-white bg-green-600 hover:bg-green-700 focus:z-10 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-body focus:ring-green-500"
                                     id="option-menu-button"
                                     x-ref="button"
                                     @click="open = !open"
@@ -253,7 +253,7 @@ class="flex items-center justify-center text-sm leading-none text-center rounded
                 wire:model="title"
                 name="title"
                 id="title"
-                class="block w-full h-auto px-0 py-4 text-3xl sm:text-4xl font-bold placeholder-skin-input focus:placeholder-skin-input-focus font-normal text-skin-inverted bg-transparent border-0 leading-normal border-0 appearance-none focus:ring-0 shadow-none"
+                class="block w-full h-auto px-0 py-4 text-3xl sm:text-4xl font-bold placeholder-skin-input focus:placeholder-skin-input-focus font-normal text-skin-inverted bg-transparent leading-normal border-0 appearance-none focus:ring-0 shadow-none"
                 placeholder="Titre de votre article..."
                 autofocus
                 autocomplete="off"

From a8324e2e20a099b6e71416ca06e01a45e741ce59 Mon Sep 17 00:00:00 2001
From: Jiordi Viera <jiordikengne@gmail.com>
Date: Fri, 1 Nov 2024 07:46:27 +0100
Subject: [PATCH 5/5] correction du merge

---
 resources/views/articles/show.blade.php                   | 8 ++++----
 .../views/components/articles/card-with-author.blade.php  | 2 +-
 resources/views/components/articles/card.blade.php        | 2 +-
 resources/views/components/articles/overview.blade.php    | 3 +--
 resources/views/components/forms/single-upload.blade.php  | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/resources/views/articles/show.blade.php b/resources/views/articles/show.blade.php
index 2431f2ce..6372f3fd 100644
--- a/resources/views/articles/show.blade.php
+++ b/resources/views/articles/show.blade.php
@@ -79,7 +79,7 @@
                             <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 }}" onerror="this.onerror=null;this.src='{{ asset('images/socialcard.png') }}'">
+                                    <img class="h-8 w-8 object-cover shadow-lg rounded-md" 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>
@@ -229,7 +229,7 @@ class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md sha
                             </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:ring-offset-body">
+                                    <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">
                                         <span class="sr-only">{{ __('Approuver') }}</span>
                                         <x-untitledui-check-verified-02 class="h-5 w-5" />
                                     </button>
@@ -251,7 +251,7 @@ class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md sha
                             <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 }}" onerror="this.onerror=null;this.src='{{ asset('images/socialcard.png') }}'">
+                                    <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 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>
@@ -264,7 +264,7 @@ class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md sha
                             <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 }}" onerror="this.onerror=null; this.src='{{ asset('images/socialcard.png') }}'">
+                                    <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 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>
diff --git a/resources/views/components/articles/card-with-author.blade.php b/resources/views/components/articles/card-with-author.blade.php
index 4bb3aafe..fc93b046 100644
--- a/resources/views/components/articles/card-with-author.blade.php
+++ b/resources/views/components/articles/card-with-author.blade.php
@@ -24,7 +24,7 @@
             {!! $article->excerpt(175) !!}
         </p>
         <div class="relative h-96 overflow-hidden">
-            <img class="w-full h-full object-cover shadow-lg rounded-lg group-hover:opacity-75" src="{{ $article->getFirstMediaUrl('media') }}" alt="{{ $article->title }}" onerror="this.src='{{ asset('images/socialcard.png') }}'" />
+            <img class="w-full h-full object-cover shadow-lg rounded-lg group-hover:opacity-75" src="{{ $article->getFirstMediaUrl('media') }}" alt="{{ $article->title }}">
         </div>
         <div class="flex justify-between space-x-8">
             <div class="flex space-x-6">
diff --git a/resources/views/components/articles/card.blade.php b/resources/views/components/articles/card.blade.php
index 1cb4efce..3ed6b712 100644
--- a/resources/views/components/articles/card.blade.php
+++ b/resources/views/components/articles/card.blade.php
@@ -12,7 +12,7 @@
 >
     <a href="{{ route('articles.show', $article) }}" class="group">
         <div class="aspect-w-3 aspect-h-2">
-            <img class="object-cover shadow-lg rounded-lg group-hover:opacity-75" src="{{ $article->getFirstMediaUrl('media') }}" alt="{{ $article->title }}" onerror="this.onerror=null;this.src='{{ asset('images/socialcard.png') }}'"  />
+            <img class="object-cover shadow-lg rounded-lg group-hover:opacity-75" src="{{ $article->getFirstMediaUrl('media') }}" alt="{{ $article->title }}">
         </div>
     </a>
     <div
diff --git a/resources/views/components/articles/overview.blade.php b/resources/views/components/articles/overview.blade.php
index ba895830..a23dcb24 100644
--- a/resources/views/components/articles/overview.blade.php
+++ b/resources/views/components/articles/overview.blade.php
@@ -5,8 +5,7 @@
         <div class="aspect-w-3 aspect-h-2">
             <img class="object-cover shadow-lg rounded-lg group-hover:opacity-75"
                  src="{{ $article->getFirstMediaUrl('media') }}"
-                 alt="{{ $article->title }}" onerror="this.src='{{ asset('images/socialcard.png') }}'"
-            />
+                 alt="{{ $article->title }}">
         </div>
     </a>
     <div class="sm:col-span-2">
diff --git a/resources/views/components/forms/single-upload.blade.php b/resources/views/components/forms/single-upload.blade.php
index 596d78cb..e600b797 100644
--- a/resources/views/components/forms/single-upload.blade.php
+++ b/resources/views/components/forms/single-upload.blade.php
@@ -32,7 +32,7 @@
                 <p class="mt-1 text-xs text-skin-muted">
                     {{ __('PNG, JPG, GIF up to 1MB') }}
                 </p>
-                <input @focus="focused = true" @blur="focused = false" class="sr-only" type="file" accept="image/jpg, image/jpeg, image/png" {{ $attributes }} />
+                <input @focus="focused = true" @blur="focused = false" class="sr-only" type="file" {{ $attributes }} />
             </div>
             <div class="w-full h-full hidden flex items-center justify-center" wire:loading.class.remove="hidden" wire:target="file">
                 <x-loader wire:loading wire:target="file" class="text-green-600" />