3 Commits

Author SHA1 Message Date
a989f3e92b fix: fixes artwork count on podcasts index page (#6)
Reviewed-on: #6
Co-authored-by: Paul Couture <paul@paulcouture.com>
Co-committed-by: Paul Couture <paul@paulcouture.com>
2024-01-13 11:46:38 -06:00
b8d1a164f1 Merge pull request 'fix: limit episode art to approved arworks' (#5) from fix/episode_filter_unapproved into master
Reviewed-on: #5
2024-01-13 11:32:21 -06:00
37d496bbca fix: limit episode art to approved arworks 2024-01-13 11:30:38 -06:00
5 changed files with 12 additions and 7 deletions

View File

@@ -52,10 +52,9 @@ class EpisodeController extends Controller
{
$user = auth()->user();
$episode = Episode::where('slug', $slug)
->with('artworks')
->with('approvedArtworks')
->with('artwork')
->with('podcast')
->whereNotNull('artworks.approved_by')
->firstOrFail();
$podcasts = Podcast::where('published', true)->with('episodes', function ($query) {
$query->orderBy('episode_number', 'desc');
@@ -67,6 +66,7 @@ class EpisodeController extends Controller
'pageTitle' => '"' . $episode->title . '" ' . $episode->podcast->name . ' Episode ' . number_format($episode->episode_number + 0),
'podcast' => $episode->podcast,
'episode' => $episode,
'artworks' => $episode->approvedArtworks,
'podcasts' => $podcasts,
]);
}

View File

@@ -21,7 +21,7 @@ class PodcastController extends Controller
$episodes = Episode::where('published', true)
->whereNotNull('artwork_id')
->with('artwork')
->with('artworks')
->with('approvedArtworks')
->where('podcast_id', $podcast->id)
->orderBy('episode_number', 'desc')->paginate(100);
$podcasts = Podcast::where('published', true)->with('episodes')->get();

View File

@@ -31,6 +31,11 @@ class Episode extends Model
return $this->hasOne(Artwork::class, 'id', 'artwork_id');
}
public function approvedArtworks()
{
return $this->hasMany(Artwork::class)->whereNotNull('artworks.approved_by');
}
public function artworks()
{
return $this->hasMany(Artwork::class);

View File

@@ -44,7 +44,7 @@
{{ $episode->episode_date->format('Y') }}</h4>
<h4 class="mb-4">Artwork By: <a href="/artist/{{ $episode->artwork->artist->slug }}">{{ $episode->artwork->artist->name }}</a></h4>
<p class="subtitle">
{{ number_format($episode->artworks->count()) }} Artworks Submitted.
{{ number_format($artworks->count()) }} Artworks Submitted.
</p>
<div class="container">
<div class="row">
@@ -88,14 +88,14 @@
<div class="container">
<div class="section-title">
<span class="subtitle">Other Submitted Artworks</span>
<h3>{{ number_format($episode->artworks->count() - 1) }} other art pieces submitted</h3>
<h3>{{ number_format($artworks->count() - 1) }} other art pieces submitted</h3>
</div>
</div>
<div class="container">
{{-- End .section-title --}}
<div class="grid-filter-wrapper masonry-list">
<div class="resizer"></div>
@foreach ($episode->artworks as $recent)
@foreach ($artworks as $recent)
@if ($recent->id != $episode->artwork_id)
@php
$thisArtwork = $recent;

View File

@@ -70,7 +70,7 @@
</span>
</div>
<div class="action-wrapper py-1 mb-1 d-flex-between">
<span class="bid-owner">{{ number_format($episode->artworks->count()) }} Artworks Submitted</span>
<span class="bid-owner">{{ number_format($episode->approvedArtworks->count()) }} Artworks Submitted</span>
</span>
</div>
</div>