From f5ed21f5677a0353a5c8adbfcf499e36f6d52662 Mon Sep 17 00:00:00 2001
From: Arthur Monney <monneylobe@gmail.com>
Date: Fri, 10 Mar 2023 14:26:19 +0100
Subject: [PATCH 1/2] fix bug on display discussion created at date

---
 .../components/discussions/overview.blade.php      |  2 +-
 .../views/discussions/_contributions.blade.php     | 12 ++++++------
 .../views/livewire/discussions/browse.blade.php    | 14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/views/components/discussions/overview.blade.php b/resources/views/components/discussions/overview.blade.php
index 1c685619..df0ae4c1 100644
--- a/resources/views/components/discussions/overview.blade.php
+++ b/resources/views/components/discussions/overview.blade.php
@@ -26,7 +26,7 @@
                 <img class="h-6 w-6 object-cover rounded-full" src="{{ $discussion->author->profile_photo_url }}" alt="{{ $discussion->author->name }}">
             </a>
             <span class="ml-2 pr-1">{{ __('Posté par') }}</span>
-            <div class="flex items-center space-x-1">
+            <div class="flex items-center space-x-1" wire:ignore>
                 <a href="{{ route('profile', $discussion->author->username) }}" class="text-skin-inverted hover:underline">{{ $discussion->author->name }}</a>
                 <span aria-hidden="true">&middot;</span>
                 <time-ago time="{{ $discussion->created_at->getTimestamp() }}"/>
diff --git a/resources/views/discussions/_contributions.blade.php b/resources/views/discussions/_contributions.blade.php
index a02dff1b..f93cf22f 100644
--- a/resources/views/discussions/_contributions.blade.php
+++ b/resources/views/discussions/_contributions.blade.php
@@ -1,14 +1,14 @@
 <x-sticky-content class="space-y-12">
     <div>
-        <h4 class="text-lg font-semibold text-skin-inverted font-sans leading-6">Top Contributeurs</h4>
-        <p class="mt-3 font-normal text-skin-base text-sm">Les personnes qui ont lancé le plus de discussions sur le site.</p>
+        <h4 class="text-lg font-semibold text-skin-inverted font-sans leading-6">{{ __('Top Contributeurs') }}</h4>
+        <p class="mt-3 font-normal text-skin-base text-sm">{{ __('Les personnes qui ont lancé le plus de discussions sur le site.') }}</p>
         <div class="mt-6">
             <ul role="list" class="divide-y divide-skin-base">
                 @foreach($topContributors as $contributor)
                     <li class="py-4">
                         <div class="flex items-center space-x-4">
                             <div class="shrink-0">
-                                <img class="h-8 w-8 object-cover rounded-full" src="{{ $contributor->profile_photo_url }}" alt="">
+                                <img class="h-8 w-8 object-cover rounded-full" src="{{ $contributor->profile_photo_url }}" alt="{{ $contributor->name }}">
                             </div>
                             <div class="flex-1 min-w-0 font-sans">
                                 <p class="text-sm font-medium text-skin-inverted truncate">
@@ -34,8 +34,8 @@
     </div>
 
     <div>
-        <h4 class="text-lg font-semibold text-skin-inverted font-sans leading-6">Discussions sans commentaires</h4>
-        <p class="mt-3 font-normal text-skin-base text-sm">Les discussions/sujets qui n’ont pas encore eu de commentaires. Soyez le premier à apporter votre contribution.</p>
+        <h4 class="text-lg font-semibold text-skin-inverted font-sans leading-6">{{ __('Discussions sans commentaires') }}</h4>
+        <p class="mt-3 font-normal text-skin-base text-sm">{{ __('Les discussions/sujets qui n’ont pas encore eu de commentaires. Soyez le premier à apporter votre contribution.') }}</p>
 
         <div class="mt-6">
             <ul role="list" class="divide-y divide-skin-base">
@@ -50,7 +50,7 @@
                                     </h3>
                                     <p class="text-xs text-skin-muted font-normal truncate"><time-ago time="{{ $discussion->created_at->getTimestamp() }}" /></p>
                                 </div>
-                                <a href="{{ route('discussions.show', $discussion) }}" class="inline-flex text-sm text-skin-base font-normal hover:text-skin-primary leading-5">{{ $discussion->title }}</a>
+                                <a href="{{ route('discussions.show', $discussion) }}" class="inline-flex text-sm text-skin-base font-normal hover:text-skin-inverted leading-5">{{ $discussion->title }}</a>
                             </div>
                         </div>
                     </li>
diff --git a/resources/views/livewire/discussions/browse.blade.php b/resources/views/livewire/discussions/browse.blade.php
index baf85517..550ed808 100644
--- a/resources/views/livewire/discussions/browse.blade.php
+++ b/resources/views/livewire/discussions/browse.blade.php
@@ -6,15 +6,15 @@
                     <svg class="mr-1.5 h-2 w-2 text-skin-base" fill="currentColor" viewBox="0 0 8 8">
                         <circle cx="4" cy="4" r="3" />
                     </svg>
-                    Toutes les catégories
+                    {{ __('Toutes les catégories') }}
                 </span>
 
                 <x-tags :tags="$tags" :selected-tag="$selectedTag" />
             </div>
             @auth
                 <div class="py-6 space-y-3">
-                    <h4 class="text-sm leading-5 font-sans text-skin-base">Vous avez un sujet passionnant ?</h4>
-                    <x-button :link="route('discussions.new')">Nouvelle discussion</x-button>
+                    <h4 class="text-sm leading-5 font-sans text-skin-base">{{ __('Vous avez un sujet passionnant ?') }}</h4>
+                    <x-button :link="route('discussions.new')">{{ __('Nouvelle discussion') }}</x-button>
                 </div>
             @endauth
         </x-sticky-content>
@@ -42,7 +42,7 @@ class="w-full {{ $selectedSortBy === 'recent' ? 'text-skin-inverted': 'text-skin
                     aria-current="{{ $selectedSortBy === 'popular' ? 'page' : 'false' }}"
                     class="w-full {{ $selectedSortBy === 'popular' ? 'text-skin-inverted': 'text-skin-base hover:text-skin-inverted' }} group relative min-w-0 flex-1 overflow-hidden bg-skin-card py-4 px-6 text-sm font-medium text-center hover:bg-skin-card-muted focus:z-10"
                 >
-                    <span>Populaire</span>
+                    <span>{{ __('Populaire') }}</span>
                     <span aria-hidden="true" class="{{ $selectedSortBy === 'popular' ? 'bg-skin-primary': 'bg-transparent' }} absolute inset-x-0 bottom-0 h-0.5"></span>
                 </button>
 
@@ -52,7 +52,7 @@ class="w-full {{ $selectedSortBy === 'popular' ? 'text-skin-inverted': 'text-ski
                     aria-current="{{ $selectedSortBy === 'active' ? 'page' : 'false' }}"
                     class="w-full {{ $selectedSortBy === 'active' ? 'text-skin-inverted': 'text-skin-base hover:text-skin-inverted' }} rounded-r-lg group relative min-w-0 flex-1 overflow-hidden bg-skin-card py-4 px-6 text-sm font-medium text-center hover:bg-skin-card-muted focus:z-10"
                 >
-                    <span>Actif</span>
+                    <span>{{ __('Actif') }}</span>
                     <span aria-hidden="true" class="{{ $selectedSortBy === 'active' ? 'bg-skin-primary': 'bg-transparent' }} absolute inset-x-0 bottom-0 h-0.5"></span>
                 </button>
             </nav>
@@ -71,12 +71,12 @@ class="mt-5 flex justify-center"
             >
                 <p class="flex items-center">
                     <x-loader class="text-skin-primary" />
-                    Chargement...
+                    {{ __('Chargement...') }}
                 </p>
             </div>
         @endif
     </div>
-    <div class="hidden relative lg:block lg:col-span-3">
+    <div wire:ignore class="hidden relative lg:block lg:col-span-3">
         @include('discussions._contributions')
     </div>
 </div>

From 3936dfdf680fd5b2da769ecc95e288b641eb282e Mon Sep 17 00:00:00 2001
From: Arthur Monney <monneylobe@gmail.com>
Date: Fri, 10 Mar 2023 14:34:15 +0100
Subject: [PATCH 2/2] :art: add link to user profile

---
 .../discussions/_contributions.blade.php      | 24 +++++++------
 resources/views/discussions/show.blade.php    | 34 ++++++++++---------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/resources/views/discussions/_contributions.blade.php b/resources/views/discussions/_contributions.blade.php
index f93cf22f..0e22d999 100644
--- a/resources/views/discussions/_contributions.blade.php
+++ b/resources/views/discussions/_contributions.blade.php
@@ -7,17 +7,19 @@
                 @foreach($topContributors as $contributor)
                     <li class="py-4">
                         <div class="flex items-center space-x-4">
-                            <div class="shrink-0">
-                                <img class="h-8 w-8 object-cover rounded-full" src="{{ $contributor->profile_photo_url }}" alt="{{ $contributor->name }}">
-                            </div>
-                            <div class="flex-1 min-w-0 font-sans">
-                                <p class="text-sm font-medium text-skin-inverted truncate">
-                                    {{ $contributor->name }}
-                                </p>
-                                <p class="text-sm text-skin-base truncate">
-                                    {{ '@' . $contributor->username }}
-                                </p>
-                            </div>
+                            <a href="{{ route('profile', $contributor->username) }}" class="flex items-center flex-1 min-w-0">
+                                <div class="shrink-0">
+                                    <img class="h-8 w-8 object-cover rounded-full" src="{{ $contributor->profile_photo_url }}" alt="{{ $contributor->name }}">
+                                </div>
+                                <div class="ml-3.5 font-sans">
+                                    <p class="text-sm font-medium text-skin-inverted truncate">
+                                        {{ $contributor->name }}
+                                    </p>
+                                    <p class="text-sm text-skin-base truncate">
+                                        {{ '@' . $contributor->username }}
+                                    </p>
+                                </div>
+                            </a>
                             <div>
                                 <span class="inline-flex items-center text-sm leading-5 font-medium text-skin-inverted">
                                     <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="h-5 w-5 mr-1 text-skin-muted">
diff --git a/resources/views/discussions/show.blade.php b/resources/views/discussions/show.blade.php
index 8e478b7e..0db908ed 100644
--- a/resources/views/discussions/show.blade.php
+++ b/resources/views/discussions/show.blade.php
@@ -34,31 +34,33 @@
                                 </span>
                             </div>
                             <div class="ml-4 sm:hidden">
-                                <h4 class="inline-flex items-center text-sm text-skin-inverted font-medium">
-                                    {{ $discussion->author->name }}
-                                    @if($discussion->author->hasAnyRole('admin', 'moderator'))
-                                        <x-user.status />
-                                    @endif
-                                </h4>
+                                <a href="{{ route('profile', $discussion->author->username) }}">
+                                    <h4 class="inline-flex items-center text-sm text-skin-inverted font-medium">
+                                        {{ $discussion->author->name }}
+                                        @if($discussion->author->hasAnyRole('admin', 'moderator'))
+                                            <x-user.status />
+                                        @endif
+                                    </h4>
+                                </a>
                                 <div class="text-sm whitespace-nowrap text-skin-muted font-normal">
                                     <time class="sr-only" datetime="{{ $discussion->created_at->format('Y-m-d') }}">{{ $discussion->created_at->diffForHumans() }}</time>
-                                    Crée
-                                    <time-ago time="{{ $discussion->created_at->getTimestamp() }}"/>
+                                    Crée <time-ago time="{{ $discussion->created_at->getTimestamp() }}"/>
                                 </div>
                             </div>
                         </div>
                         <div class="min-w-0 flex-1">
                             <div class="hidden sm:block">
-                                <h4 class="inline-flex items-center text-sm text-skin-inverted font-medium">
-                                    {{ $discussion->author->name }}
-                                    @if($discussion->author->hasAnyRole('admin', 'moderator'))
-                                        <x-user.status />
-                                    @endif
-                                </h4>
+                                <a href="{{ route('profile', $discussion->author->username) }}">
+                                    <h4 class="inline-flex items-center text-sm text-skin-inverted font-medium">
+                                        {{ $discussion->author->name }}
+                                        @if($discussion->author->hasAnyRole('admin', 'moderator'))
+                                            <x-user.status />
+                                        @endif
+                                    </h4>
+                                </a>
                                 <div class="text-sm whitespace-nowrap text-skin-muted font-normal">
                                     <time class="sr-only" datetime="{{ $discussion->created_at->format('Y-m-d') }}">{{ $discussion->created_at->diffForHumans() }}</time>
-                                    Crée
-                                    <time-ago time="{{ $discussion->created_at->getTimestamp() }}"/>
+                                    Crée <time-ago time="{{ $discussion->created_at->getTimestamp() }}"/>
                                 </div>
                             </div>
                             <x-markdown-content class="mt-3 text-sm prose md:prose-lg prose-green text-skin-base mx-auto max-w-none" :content="$discussion->body" />