Skip to content
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

Jump to bottom

(merge)Recent Fixes on Release to Develop branch #1104

Merged
merged 3 commits into from
Nov 3, 2024
Merged

(merge)Recent Fixes on Release to Develop branch #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79397de
fix: improve user profile, character page row styling on smaller view…
liwoyadan Oct 29, 2024
9675699
fix(galleries): make some queries more efficient (#1098)
AW0005 Oct 29, 2024
e6675c0
Merge remote-tracking branch 'corowne/release/v3.0.0' into fixes-rele…
SpeedyD Oct 30, 2024
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 app/Http/Controllers/GalleryController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public function getGallery($id, Request $request) {
return view('galleries.gallery', [
'gallery' => $gallery,
'submissions' => $query->paginate(20)->appends($request->query()),
'prompts' => [0 => 'Any Prompt'] + Prompt::whereIn('id', GallerySubmission::where('gallery_id', $gallery->id)->visible(Auth::user() ?? null)->accepted()->whereNotNull('prompt_id')->pluck('prompt_id')->toArray())->orderBy('name')->pluck('name', 'id')->toArray(),
'prompts' => [0 => 'Any Prompt'] + Prompt::whereIn('id', GallerySubmission::where('gallery_id', $gallery->id)->visible(Auth::user() ?? null)->accepted()->whereNotNull('prompt_id')->select('prompt_id')->distinct()->pluck('prompt_id')->toArray())->orderBy('name')->pluck('name', 'id')->toArray(),
'childSubmissions' => GallerySubmission::whereIn('gallery_id', $gallery->children->pluck('id')->toArray())->where('is_visible', 1)->where('status', 'Accepted'),
'galleryPage' => true,
'sideGallery' => $gallery,
Expand Down
30 changes: 15 additions & 15 deletions resources/views/character/_image_info.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,27 +51,27 @@

{{-- Basic info --}}
<div class="tab-pane fade show active" id="info-{{ $image->id }}">
<div class="row">
<div class="col-lg-4 col-md-6 col-4">
<div class="row no-gutters">
<div class="col-lg-4 col-5">
<h5>Species</h5>
</div>
<div class="col-lg-8 col-md-6 col-8">{!! $image->species_id ? $image->species->displayName : 'None' !!}</div>
<div class="col-lg-8 col-7 pl-1">{!! $image->species_id ? $image->species->displayName : 'None' !!}</div>
</div>
@if (count($image->subtypes))
<div class="row">
<div class="col-lg-4 col-md-6 col-4">
<div class="row no-gutters">
<div class="col-lg-4 col-5">
<h5>Subtype{{ count($image->subtypes) > 1 ? 's' : '' }}</h5>
</div>
<div class="col-lg-8 col-md-6 col-8">
<div class="col-lg-8 col-7 pl-1">
{!! $image->displaySubtypes() !!}
</div>
</div>
@endif
<div class="row">
<div class="col-lg-4 col-md-6 col-4">
<div class="row no-gutters">
<div class="col-lg-4 col-5">
<h5>Rarity</h5>
</div>
<div class="col-lg-8 col-md-6 col-8">{!! $image->rarity_id ? $image->rarity->displayName : 'None' !!}</div>
<div class="col-lg-8 col-7 pl-1">{!! $image->rarity_id ? $image->rarity->displayName : 'None' !!}</div>
</div>

<div class="mb-3">
Expand Down Expand Up @@ -153,21 +153,21 @@
{{-- Image credits --}}
<div class="tab-pane fade" id="credits-{{ $image->id }}">

<div class="row mb-2">
<div class="col-lg-4 col-md-6 col-4">
<div class="row no-gutters mb-2">
<div class="col-lg-4 col-4">
<h5>Design</h5>
</div>
<div class="col-lg-8 col-md-6 col-8">
<div class="col-lg-8 col-8">
@foreach ($image->designers as $designer)
<div>{!! $designer->displayLink() !!}</div>
@endforeach
</div>
</div>
<div class="row">
<div class="col-lg-4 col-md-6 col-4">
<div class="row no-gutters">
<div class="col-lg-4 col-4">
<h5>Art</h5>
</div>
<div class="col-lg-8 col-md-6 col-8">
<div class="col-lg-8 col-8">
@foreach ($image->artists as $artist)
<div>{!! $artist->displayLink() !!}</div>
@endforeach
Expand Down
30 changes: 15 additions & 15 deletions resources/views/character/_tab_stats.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<div class="row">
<div class="col-lg-3 col-4">
<div class="row no-gutters">
<div class="col-lg-3 col-5">
<h5>Owner</h5>
</div>
<div class="col-lg-9 col-8">{!! $character->displayOwner !!}</div>
<div class="col-lg-9 col-7">{!! $character->displayOwner !!}</div>
</div>
@if (!$character->is_myo_slot)
<div class="row">
<div class="col-lg-3 col-4">
<div class="row no-gutters">
<div class="col-lg-3 col-5">
<h5>Category</h5>
</div>
<div class="col-lg-9 col-8">{!! $character->category->displayName !!}</div>
<div class="col-lg-9 col-7">{!! $character->category->displayName !!}</div>
</div>
@endif
<div class="row">
<div class="col-lg-3 col-4">
<div class="row no-gutters">
<div class="col-lg-3 col-5">
<h5 class="mb-0">Created</h5>
</div>
<div class="col-lg-9 col-8">{!! format_date($character->created_at) !!}</div>
<div class="col-lg-9 col-7">{!! format_date($character->created_at) !!}</div>
</div>

<hr />
Expand All @@ -32,21 +32,21 @@
<i class="text-{{ $character->is_sellable ? 'success far fa-circle' : 'danger fas fa-times' }} fa-fw mr-2"></i> {{ $character->is_sellable ? 'Can' : 'Cannot' }} be sold
</h5>
@if ($character->sale_value > 0)
<div class="row">
<div class="col-lg-3 col-4">
<div class="row no-gutters">
<div class="col-lg-3 col-5">
<h5>Sale Value</h5>
</div>
<div class="col-lg-9 col-8">
<div class="col-lg-9 col-7 pl-1">
{{ Config::get('lorekeeper.settings.currency_symbol') }}{{ $character->sale_value }}
</div>
</div>
@endif
@if ($character->transferrable_at && $character->transferrable_at->isFuture())
<div class="row">
<div class="col-lg-3 col-4">
<div class="row no-gutters">
<div class="col-lg-3 col-5">
<h5>Cooldown</h5>
</div>
<div class="col-lg-9 col-8">Cannot be transferred until {!! format_date($character->transferrable_at) !!}</div>
<div class="col-lg-9 col-7 pl-1">Cannot be transferred until {!! format_date($character->transferrable_at) !!}</div>
</div>
@endif
@if (Auth::check() && Auth::user()->hasPower('manage_characters'))
Expand Down
4 changes: 2 additions & 2 deletions resources/views/galleries/gallery.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</p>
@endif
<p>{!! $gallery->description !!}</p>
@if (!$gallery->submissions->count() && $gallery->children->count() && $childSubmissions->count())
@if (!$gallery->submissions()->count() && $gallery->children->count() && $childSubmissions->count())
<p>This gallery has no submissions; instead, displayed is a selection of the most recent submissions from its sub-galleries. Please navigate to one of the sub-galleries to view more.</p>
@endif

Expand Down Expand Up @@ -59,7 +59,7 @@
{!! Form::close() !!}
</div>

@if ($gallery->submissions->count())
@if ($gallery->submissions()->count())
{!! $submissions->render() !!}

<div class="d-flex align-content-around flex-wrap mb-2">
Expand Down
24 changes: 12 additions & 12 deletions resources/views/user/_profile_content.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@

<!-- User Information -->
<div class="row no-gutters">
<div class="row col-sm-5">
<div class="col-lg-2 col-md-3 col-4">
<div class="row no-gutters col-sm-5">
<div class="col-lg-3 col-md-3 col-4">
<h5>Alias</h5>
</div>
<div class="col-lg-10 col-md-9 col-8">
<div class="col-lg-9 col-md-9 col-8">
{!! $user->displayAlias !!}
@if (count($aliases) > 1 && config('lorekeeper.extensions.aliases_on_userpage'))
<a class="small collapse-toggle collapsed" href="#otherUserAliases" data-toggle="collapse">&nbsp;</a>
Expand All @@ -46,24 +46,24 @@
@endif
</div>
</div>
<div class="row col-sm-7">
<div class="col-md-3 col-4">
<div class="row no-gutters col-sm-7">
<div class="col-md-4 col-4">
<h5>Joined</h5>
</div>
<div class="col-md-9 col-8">{!! format_date($user->created_at, false) !!} ({{ $user->created_at->diffForHumans() }})</div>
<div class="col-md-8 col-8">{!! format_date($user->created_at, false) !!} ({{ $user->created_at->diffForHumans() }})</div>
</div>
<div class="row col-sm-5">
<div class="col-lg-2 col-md-3 col-4">
<div class="row no-gutters col-sm-5">
<div class="col-lg-3 col-md-3 col-4">
<h5>Rank</h5>
</div>
<div class="col-lg-10 col-md-9 col-8">{!! $user->rank->displayName !!} {!! add_help($user->rank->parsed_description) !!}</div>
<div class="col-lg-9 col-md-9 col-8">{!! $user->rank->displayName !!} {!! add_help($user->rank->parsed_description) !!}</div>
</div>
@if ($user->birthdayDisplay && isset($user->birthday))
<div class="row col-sm-7">
<div class="col-md-3 col-4">
<div class="row no-gutters col-sm-7">
<div class="col-md-4 col-4">
<h5>Birthday</h5>
</div>
<div class="col-md-9 col-8">{!! $user->birthdayDisplay !!}</div>
<div class="col-md-8 col-8">{!! $user->birthdayDisplay !!}</div>
</div>
@endif
</div>
Expand Down