Skip to content

Commit ee7705d

Browse files
mckenzieartsmckenziearts
authored
Fix display date on discussion (#87)
* fix bug on display discussion created at date * 🎨 add link to user profile
1 parent 5a3f812 commit ee7705d

File tree

4 files changed

+44
-40
lines changed

4 files changed

+44
-40
lines changed

‎resources/views/components/discussions/overview.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<img class="h-6 w-6 object-cover rounded-full" src="{{ $discussion->author->profile_photo_url }}" alt="{{ $discussion->author->name }}">
2727
</a>
2828
<span class="ml-2 pr-1">{{ __('Posté par') }}</span>
29-
<div class="flex items-center space-x-1">
29+
<div class="flex items-center space-x-1" wire:ignore>
3030
<a href="{{ route('profile', $discussion->author->username) }}" class="text-skin-inverted hover:underline">{{ $discussion->author->name }}</a>
3131
<span aria-hidden="true">&middot;</span>
3232
<time-ago time="{{ $discussion->created_at->getTimestamp() }}"/>

‎resources/views/discussions/_contributions.blade.php

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
<x-sticky-content class="space-y-12">
22
<div>
3-
<h4 class="text-lg font-semibold text-skin-inverted font-sans leading-6">Top Contributeurs</h4>
4-
<p class="mt-3 font-normal text-skin-base text-sm">Les personnes qui ont lancé le plus de discussions sur le site.</p>
3+
<h4 class="text-lg font-semibold text-skin-inverted font-sans leading-6">{{ __('Top Contributeurs') }}</h4>
4+
<p class="mt-3 font-normal text-skin-base text-sm">{{ __('Les personnes qui ont lancé le plus de discussions sur le site.') }}</p>
55
<div class="mt-6">
66
<ul role="list" class="divide-y divide-skin-base">
77
@foreach($topContributors as $contributor)
88
<li class="py-4">
99
<div class="flex items-center space-x-4">
10-
<div class="shrink-0">
11-
<img class="h-8 w-8 object-cover rounded-full" src="{{ $contributor->profile_photo_url }}" alt="">
12-
</div>
13-
<div class="flex-1 min-w-0 font-sans">
14-
<p class="text-sm font-medium text-skin-inverted truncate">
15-
{{ $contributor->name }}
16-
</p>
17-
<p class="text-sm text-skin-base truncate">
18-
{{ '@' . $contributor->username }}
19-
</p>
20-
</div>
10+
<a href="{{ route('profile', $contributor->username) }}" class="flex items-center flex-1 min-w-0">
11+
<div class="shrink-0">
12+
<img class="h-8 w-8 object-cover rounded-full" src="{{ $contributor->profile_photo_url }}" alt="{{ $contributor->name }}">
13+
</div>
14+
<div class="ml-3.5 font-sans">
15+
<p class="text-sm font-medium text-skin-inverted truncate">
16+
{{ $contributor->name }}
17+
</p>
18+
<p class="text-sm text-skin-base truncate">
19+
{{ '@' . $contributor->username }}
20+
</p>
21+
</div>
22+
</a>
2123
<div>
2224
<span class="inline-flex items-center text-sm leading-5 font-medium text-skin-inverted">
2325
<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">
@@ -34,8 +36,8 @@
3436
</div>
3537

3638
<div>
37-
<h4 class="text-lg font-semibold text-skin-inverted font-sans leading-6">Discussions sans commentaires</h4>
38-
<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>
39+
<h4 class="text-lg font-semibold text-skin-inverted font-sans leading-6">{{ __('Discussions sans commentaires') }}</h4>
40+
<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>
3941

4042
<div class="mt-6">
4143
<ul role="list" class="divide-y divide-skin-base">
@@ -50,7 +52,7 @@
5052
</h3>
5153
<p class="text-xs text-skin-muted font-normal truncate"><time-ago time="{{ $discussion->created_at->getTimestamp() }}" /></p>
5254
</div>
53-
<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>
55+
<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>
5456
</div>
5557
</div>
5658
</li>

‎resources/views/discussions/show.blade.php

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,31 +34,33 @@
3434
</span>
3535
</div>
3636
<div class="ml-4 sm:hidden">
37-
<h4 class="inline-flex items-center text-sm text-skin-inverted font-medium">
38-
{{ $discussion->author->name }}
39-
@if($discussion->author->hasAnyRole('admin', 'moderator'))
40-
<x-user.status />
41-
@endif
42-
</h4>
37+
<a href="{{ route('profile', $discussion->author->username) }}">
38+
<h4 class="inline-flex items-center text-sm text-skin-inverted font-medium">
39+
{{ $discussion->author->name }}
40+
@if($discussion->author->hasAnyRole('admin', 'moderator'))
41+
<x-user.status />
42+
@endif
43+
</h4>
44+
</a>
4345
<div class="text-sm whitespace-nowrap text-skin-muted font-normal">
4446
<time class="sr-only" datetime="{{ $discussion->created_at->format('Y-m-d') }}">{{ $discussion->created_at->diffForHumans() }}</time>
45-
Crée
46-
<time-ago time="{{ $discussion->created_at->getTimestamp() }}"/>
47+
Crée <time-ago time="{{ $discussion->created_at->getTimestamp() }}"/>
4748
</div>
4849
</div>
4950
</div>
5051
<div class="min-w-0 flex-1">
5152
<div class="hidden sm:block">
52-
<h4 class="inline-flex items-center text-sm text-skin-inverted font-medium">
53-
{{ $discussion->author->name }}
54-
@if($discussion->author->hasAnyRole('admin', 'moderator'))
55-
<x-user.status />
56-
@endif
57-
</h4>
53+
<a href="{{ route('profile', $discussion->author->username) }}">
54+
<h4 class="inline-flex items-center text-sm text-skin-inverted font-medium">
55+
{{ $discussion->author->name }}
56+
@if($discussion->author->hasAnyRole('admin', 'moderator'))
57+
<x-user.status />
58+
@endif
59+
</h4>
60+
</a>
5861
<div class="text-sm whitespace-nowrap text-skin-muted font-normal">
5962
<time class="sr-only" datetime="{{ $discussion->created_at->format('Y-m-d') }}">{{ $discussion->created_at->diffForHumans() }}</time>
60-
Crée
61-
<time-ago time="{{ $discussion->created_at->getTimestamp() }}"/>
63+
Crée <time-ago time="{{ $discussion->created_at->getTimestamp() }}"/>
6264
</div>
6365
</div>
6466
<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" />

‎resources/views/livewire/discussions/browse.blade.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<svg class="mr-1.5 h-2 w-2 text-skin-base" fill="currentColor" viewBox="0 0 8 8">
77
<circle cx="4" cy="4" r="3" />
88
</svg>
9-
Toutes les catégories
9+
{{ __('Toutes les catégories') }}
1010
</span>
1111

1212
<x-tags :tags="$tags" :selected-tag="$selectedTag" />
1313
</div>
1414
@auth
1515
<div class="py-6 space-y-3">
16-
<h4 class="text-sm leading-5 font-sans text-skin-base">Vous avez un sujet passionnant ?</h4>
17-
<x-button :link="route('discussions.new')">Nouvelle discussion</x-button>
16+
<h4 class="text-sm leading-5 font-sans text-skin-base">{{ __('Vous avez un sujet passionnant ?') }}</h4>
17+
<x-button :link="route('discussions.new')">{{ __('Nouvelle discussion') }}</x-button>
1818
</div>
1919
@endauth
2020
</x-sticky-content>
@@ -42,7 +42,7 @@ class="w-full {{ $selectedSortBy === 'recent' ? 'text-skin-inverted': 'text-skin
4242
aria-current="{{ $selectedSortBy === 'popular' ? 'page' : 'false' }}"
4343
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"
4444
>
45-
<span>Populaire</span>
45+
<span>{{ __('Populaire') }}</span>
4646
<span aria-hidden="true" class="{{ $selectedSortBy === 'popular' ? 'bg-skin-primary': 'bg-transparent' }} absolute inset-x-0 bottom-0 h-0.5"></span>
4747
</button>
4848

@@ -52,7 +52,7 @@ class="w-full {{ $selectedSortBy === 'popular' ? 'text-skin-inverted': 'text-ski
5252
aria-current="{{ $selectedSortBy === 'active' ? 'page' : 'false' }}"
5353
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"
5454
>
55-
<span>Actif</span>
55+
<span>{{ __('Actif') }}</span>
5656
<span aria-hidden="true" class="{{ $selectedSortBy === 'active' ? 'bg-skin-primary': 'bg-transparent' }} absolute inset-x-0 bottom-0 h-0.5"></span>
5757
</button>
5858
</nav>
@@ -71,12 +71,12 @@ class="mt-5 flex justify-center"
7171
>
7272
<p class="flex items-center">
7373
<x-loader class="text-skin-primary" />
74-
Chargement...
74+
{{ __('Chargement...') }}
7575
</p>
7676
</div>
7777
@endif
7878
</div>
79-
<div class="hidden relative lg:block lg:col-span-3">
79+
<div wire:ignore class="hidden relative lg:block lg:col-span-3">
8080
@include('discussions._contributions')
8181
</div>
8282
</div>

0 commit comments

Comments
 (0)