Skip to content

Fix display date on discussion #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 10, 2023
Merged

Fix display date on discussion #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5ed21f
fix bug on display discussion created at date
mckenziearts Mar 10, 2023
3936dfd
:art: add link to user profile
mckenziearts Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/views/components/discussions/overview.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() }}"/>
Expand Down
34 changes: 18 additions & 16 deletions resources/views/discussions/_contributions.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
<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="">
</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">
Expand All @@ -34,8 +36,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">
Expand All @@ -50,7 +52,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>
Expand Down
34 changes: 18 additions & 16 deletions resources/views/discussions/show.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
14 changes: 7 additions & 7 deletions resources/views/livewire/discussions/browse.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand All @@ -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>
Expand All @@ -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>