From d0b11b6141d14f310009d7b7948dba92d1a260e8 Mon Sep 17 00:00:00 2001 From: moif <104588768+AW0005@users.noreply.github.com> Date: Sun, 25 Aug 2024 15:18:29 -0400 Subject: [PATCH 01/85] fix(comments): only get linked comment for permalink view (#1027) * Bug(Comments): Permalinks pull all comments into memory Permalinked comments were pulling all comments into memory before finding the comment actually linked to, which will eventually crash the page. * refactor: fix blade formatting --------- Co-authored-by: AW0005 --- app/Http/Controllers/PermalinkController.php | 2 +- package-lock.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/PermalinkController.php b/app/Http/Controllers/PermalinkController.php index 02dfb9de79..f27c7bc36a 100644 --- a/app/Http/Controllers/PermalinkController.php +++ b/app/Http/Controllers/PermalinkController.php @@ -16,7 +16,7 @@ class PermalinkController extends Controller { * @return \Illuminate\Contracts\Support\Renderable */ public function getComment($id) { - $comments = Comment::withTrashed()->get(); + $comments = Comment::withTrashed(); //$comments = $comments->sortByDesc('created_at'); $comment = $comments->find($id); diff --git a/package-lock.json b/package-lock.json index 4100ffe50f..66ccb03aea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "lorekeeper", + "name": "lorekeeper-extensions", "lockfileVersion": 2, "requires": true, "packages": { From 628dd60ee686c2f1bbb3852b3ed599a0c12a2b55 Mon Sep 17 00:00:00 2001 From: itinerare Date: Sun, 25 Aug 2024 19:22:10 +0000 Subject: [PATCH 02/85] refactor: fix blade formatting --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 66ccb03aea..4100ffe50f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "lorekeeper-extensions", + "name": "lorekeeper", "lockfileVersion": 2, "requires": true, "packages": { From 74ed3bfa8df2670adbfae23f9e47688abb41e50f Mon Sep 17 00:00:00 2001 From: Speedy Date: Wed, 28 Aug 2024 00:05:38 +0200 Subject: [PATCH 03/85] fix: convert additional admin area tables to bootstrap tables (#1026) * fix(admin): Sales index updated to bootstrap tables * refactor: fix blade formatting * fix(admin): 7 more * refactor: fix blade formatting * fix(admin): Uneven files index columns, thanks to @moif for pointing it out * fix(admin): Other fixes I should've done --------- Co-authored-by: SpeedyD --- resources/views/admin/files/index.blade.php | 48 +++-- resources/views/admin/logs.blade.php | 52 +++-- .../loot_tables/_roll_loot_table.blade.php | 44 ++-- .../views/admin/raffle/ticket_index.blade.php | 199 ++++++++++-------- resources/views/admin/sales/sales.blade.php | 74 ++++--- .../views/admin/settings/settings.blade.php | 61 +++--- .../admin/staff_reward_settings.blade.php | 61 +++--- .../admin/users/user_update_log.blade.php | 68 +++--- 8 files changed, 366 insertions(+), 241 deletions(-) diff --git a/resources/views/admin/files/index.blade.php b/resources/views/admin/files/index.blade.php index 172ef658d5..0c83b15966 100644 --- a/resources/views/admin/files/index.blade.php +++ b/resources/views/admin/files/index.blade.php @@ -33,28 +33,36 @@ @endif
Upload File
- - - - - - - - +
+
+
+
+
Files
+
+
+
+
+
+
+
@foreach ($files as $file) -
- - - +
+
+
+
{{ $file }}
+
+
+
+ Move + Rename + Delete +
+
+
+
@endforeach - -
Files
- {{ $file }} - - Move - Rename - Delete -
+ + @if ($folder && !count($files)) {!! $logs->render() !!} - - - - - - - - +
+
+
+
+
Staff
+
+
+
Action
+
+
+
Action Details
+
+
+
Date
+
+
+
+
@foreach ($logs as $log) -
- - - - - +
+
+
+
{!! $log->user->displayName !!}
+
+
+
{!! $log->action !!}
+
+
+
{!! $log->action_details !!}
+
+
+
{!! format_date($log->created_at) !!} ({!! pretty_date($log->created_at) !!})
+
+
+
@endforeach - -
StaffActionAction DetailsDate
{!! $log->user->displayName !!}{!! $log->action !!}{!! $log->action_details !!}{!! format_date($log->created_at) !!} ({!! pretty_date($log->created_at) !!})
+ + {!! $logs->render() !!} @endsection diff --git a/resources/views/admin/loot_tables/_roll_loot_table.blade.php b/resources/views/admin/loot_tables/_roll_loot_table.blade.php index b825ae47b0..9940e7d43a 100644 --- a/resources/views/admin/loot_tables/_roll_loot_table.blade.php +++ b/resources/views/admin/loot_tables/_roll_loot_table.blade.php @@ -1,25 +1,41 @@

You rolled {{ $quantity }} time{{ $quantity != 1 ? 's' : '' }} for the following:

- - - - - - - +
+
+
+
+
#
+
+
+
Reward
+
+
+
Quantity
+
+
+
+
@foreach ($results as $result) @foreach ($result as $type) @if (count($type)) @foreach ($type as $t) -
- - - - +
+
+
+
{{ $count++ }}
+
+
+
{!! $t['asset']->displayName !!}
+
+
+
{{ $t['quantity'] }}
+
+
+
@endforeach @endif @endforeach @endforeach - -
#RewardQuantity
{{ $count++ }}{!! $t['asset']->displayName !!}{{ $t['quantity'] }}
+ +

Note: "None" results are not shown in this table.

diff --git a/resources/views/admin/raffle/ticket_index.blade.php b/resources/views/admin/raffle/ticket_index.blade.php index a54f2afcc7..9639bb5229 100644 --- a/resources/views/admin/raffle/ticket_index.blade.php +++ b/resources/views/admin/raffle/ticket_index.blade.php @@ -35,20 +35,32 @@
Winner(s)
- - - - - - +
+
+
+
+
#
+
+
+
User
+
+
+
+
@foreach ($raffle->tickets()->winners()->get() as $winner) -
- - - +
+
+
+
{{ $winner->position }}
+
+
+
{!! $winner->displayHolderName !!}
+
+
+
@endforeach - -
#User
{{ $winner->position }}{!! $winner->displayHolderName !!}
+
+
@endif @@ -57,90 +69,105 @@
{!! $tickets->render() !!}
- - - - - @if ($raffle->is_active < 2) - - @endif - - - @foreach ($tickets as $count => $ticket) - - - - @if ($raffle->is_active < 2) - - @endif - - @endforeach - -
#User
{{ $page * 200 + $count + 1 }}{!! $ticket->displayHolderName !!}{!! Form::open(['url' => 'admin/raffles/view/ticket/delete/' . $ticket->id]) !!}{!! Form::submit('Delete', ['class' => 'btn btn-danger btn-sm']) !!}{!! Form::close() !!}
-
-
{!! $tickets->render() !!}
- - + {!! $logs->render() !!} @endsection From a5f40727785b543e628e8377cc68be3eee394e35 Mon Sep 17 00:00:00 2001 From: Newt Date: Wed, 28 Aug 2024 14:11:41 +0100 Subject: [PATCH 04/85] fix(characters): make character image size limit smaller, more consistent (#959) * fix: update image size validation to correctly be 2mb instead of approx. 20mb & add validation to admin reuploads * feat(nit): 2048(kb) -> 2mb & add to update rules (just in case!) * fix(myos): update rules for myos --- .../Admin/Characters/CharacterImageController.php | 1 + app/Models/Character/Character.php | 10 ++++++---- app/Models/Character/CharacterImage.php | 8 +++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Admin/Characters/CharacterImageController.php b/app/Http/Controllers/Admin/Characters/CharacterImageController.php index 391874a3fd..780fa305e7 100644 --- a/app/Http/Controllers/Admin/Characters/CharacterImageController.php +++ b/app/Http/Controllers/Admin/Characters/CharacterImageController.php @@ -249,6 +249,7 @@ public function getImageReupload($id) { * @return \Illuminate\Http\RedirectResponse */ public function postImageReupload(Request $request, CharacterManager $service, $id) { + $request->validate(['image' => CharacterImage::$createRules['image'], 'thumbnail' => CharacterImage::$createRules['thumbnail']]); $data = $request->only(['image', 'thumbnail', 'x0', 'x1', 'y0', 'y1', 'use_cropper']); $image = CharacterImage::find($id); if (!$image) { diff --git a/app/Models/Character/Character.php b/app/Models/Character/Character.php index 19352a8ea6..4420bf160d 100644 --- a/app/Models/Character/Character.php +++ b/app/Models/Character/Character.php @@ -78,8 +78,8 @@ class Character extends Model { 'slug' => 'required|alpha_dash', 'description' => 'nullable', 'sale_value' => 'nullable', - 'image' => 'required|mimes:jpeg,jpg,gif,png|max:20000', - 'thumbnail' => 'nullable|mimes:jpeg,jpg,gif,png|max:20000', + 'image' => 'required|mimes:jpeg,jpg,gif,png|max:2mb', + 'thumbnail' => 'nullable|mimes:jpeg,jpg,gif,png|max:2mb', 'owner_url' => 'url|nullable', ]; @@ -94,6 +94,8 @@ class Character extends Model { 'slug' => 'required', 'description' => 'nullable', 'sale_value' => 'nullable', + 'image' => 'nullable|mimes:jpeg,jpg,gif,png|max:2mb', + 'thumbnail' => 'nullable|mimes:jpeg,jpg,gif,png|max:2mb', ]; /** @@ -109,8 +111,8 @@ class Character extends Model { 'description' => 'nullable', 'sale_value' => 'nullable', 'name' => 'required', - 'image' => 'nullable|mimes:jpeg,gif,png|max:20000', - 'thumbnail' => 'nullable|mimes:jpeg,gif,png|max:20000', + 'image' => 'nullable|mimes:jpeg,gif,png|max:2mb', + 'thumbnail' => 'nullable|mimes:jpeg,gif,png|max:2mb', ]; /********************************************************************************************** diff --git a/app/Models/Character/CharacterImage.php b/app/Models/Character/CharacterImage.php index 84b6fc36ae..83bcf4b23c 100644 --- a/app/Models/Character/CharacterImage.php +++ b/app/Models/Character/CharacterImage.php @@ -47,8 +47,8 @@ class CharacterImage extends Model { public static $createRules = [ 'species_id' => 'required', 'rarity_id' => 'required', - 'image' => 'required|mimes:jpeg,jpg,gif,png,webp|max:20000', - 'thumbnail' => 'nullable|mimes:jpeg,jpg,gif,png,webp|max:20000', + 'image' => 'required|mimes:jpeg,jpg,gif,png,webp|max:2mb', + 'thumbnail' => 'nullable|mimes:jpeg,jpg,gif,png,webp|max:2mb', ]; /** @@ -62,6 +62,8 @@ class CharacterImage extends Model { 'species_id' => 'required', 'rarity_id' => 'required', 'description' => 'nullable', + 'image' => 'mimes:jpeg,jpg,gif,png,webp|max:2mb', + 'thumbnail' => 'nullable|mimes:jpeg,jpg,gif,png,webp|max:2mb', ]; /********************************************************************************************** @@ -225,7 +227,7 @@ public function getFullsizeUrlAttribute() { /** * Gets the file name of the model's fullsize image. * - * @param user + * @param User * @param mixed|null $user * * @return string From 46cafa3ec8750db7311b806a74f9b727327ed15a Mon Sep 17 00:00:00 2001 From: Speedy Date: Sun, 1 Sep 2024 21:03:15 +0200 Subject: [PATCH 05/85] fix(characters): temporary fix for image filesize validation issue (#1039) --- app/Models/Character/Character.php | 12 ++++++------ app/Models/Character/CharacterImage.php | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/Models/Character/Character.php b/app/Models/Character/Character.php index 4420bf160d..642d095865 100644 --- a/app/Models/Character/Character.php +++ b/app/Models/Character/Character.php @@ -78,8 +78,8 @@ class Character extends Model { 'slug' => 'required|alpha_dash', 'description' => 'nullable', 'sale_value' => 'nullable', - 'image' => 'required|mimes:jpeg,jpg,gif,png|max:2mb', - 'thumbnail' => 'nullable|mimes:jpeg,jpg,gif,png|max:2mb', + 'image' => 'required|mimes:jpeg,jpg,gif,png|max:2048', + 'thumbnail' => 'nullable|mimes:jpeg,jpg,gif,png|max:2048', 'owner_url' => 'url|nullable', ]; @@ -94,8 +94,8 @@ class Character extends Model { 'slug' => 'required', 'description' => 'nullable', 'sale_value' => 'nullable', - 'image' => 'nullable|mimes:jpeg,jpg,gif,png|max:2mb', - 'thumbnail' => 'nullable|mimes:jpeg,jpg,gif,png|max:2mb', + 'image' => 'nullable|mimes:jpeg,jpg,gif,png|max:2048', + 'thumbnail' => 'nullable|mimes:jpeg,jpg,gif,png|max:2048', ]; /** @@ -111,8 +111,8 @@ class Character extends Model { 'description' => 'nullable', 'sale_value' => 'nullable', 'name' => 'required', - 'image' => 'nullable|mimes:jpeg,gif,png|max:2mb', - 'thumbnail' => 'nullable|mimes:jpeg,gif,png|max:2mb', + 'image' => 'nullable|mimes:jpeg,gif,png|max:2048', + 'thumbnail' => 'nullable|mimes:jpeg,gif,png|max:2048', ]; /********************************************************************************************** diff --git a/app/Models/Character/CharacterImage.php b/app/Models/Character/CharacterImage.php index 83bcf4b23c..ad39130a78 100644 --- a/app/Models/Character/CharacterImage.php +++ b/app/Models/Character/CharacterImage.php @@ -47,8 +47,8 @@ class CharacterImage extends Model { public static $createRules = [ 'species_id' => 'required', 'rarity_id' => 'required', - 'image' => 'required|mimes:jpeg,jpg,gif,png,webp|max:2mb', - 'thumbnail' => 'nullable|mimes:jpeg,jpg,gif,png,webp|max:2mb', + 'image' => 'required|mimes:jpeg,jpg,gif,png,webp|max:2048', + 'thumbnail' => 'nullable|mimes:jpeg,jpg,gif,png,webp|max:2048', ]; /** @@ -62,8 +62,8 @@ class CharacterImage extends Model { 'species_id' => 'required', 'rarity_id' => 'required', 'description' => 'nullable', - 'image' => 'mimes:jpeg,jpg,gif,png,webp|max:2mb', - 'thumbnail' => 'nullable|mimes:jpeg,jpg,gif,png,webp|max:2mb', + 'image' => 'mimes:jpeg,jpg,gif,png,webp|max:2048', + 'thumbnail' => 'nullable|mimes:jpeg,jpg,gif,png,webp|max:2048', ]; /********************************************************************************************** From 03e12fea7a090b806169f6a29ea797dec1b4cf7a Mon Sep 17 00:00:00 2001 From: Speedy Date: Sat, 14 Sep 2024 15:03:19 +0200 Subject: [PATCH 06/85] fix: fix admin raffle table (#1059) * fix(admin): Raffle Table messup (Technically I should be cleaning up the indents but I'll let the automation catch that) * refactor: fix blade formatting --------- Co-authored-by: SpeedyD --- .../views/admin/raffle/ticket_index.blade.php | 141 +++++++++--------- 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/resources/views/admin/raffle/ticket_index.blade.php b/resources/views/admin/raffle/ticket_index.blade.php index 9639bb5229..4b7057355b 100644 --- a/resources/views/admin/raffle/ticket_index.blade.php +++ b/resources/views/admin/raffle/ticket_index.blade.php @@ -84,90 +84,91 @@ @endif -
- @foreach ($tickets as $count => $ticket) -
-
-
-
{{ $page * 200 + $count + 1 }}
-
-
-
{!! $ticket->displayHolderName !!}
-
- @if ($raffle->is_active < 2) -
-
{!! Form::open(['url' => 'admin/raffles/view/ticket/delete/' . $ticket->id]) !!}{!! Form::submit('Delete', ['class' => 'btn btn-danger btn-sm']) !!}{!! Form::close() !!}
-
- @endif +
+
+ @foreach ($tickets as $count => $ticket) +
+
+
+
{{ $page * 200 + $count + 1 }}
+
+
+
{!! $ticket->displayHolderName !!}
+ @if ($raffle->is_active < 2) +
+
{!! Form::open(['url' => 'admin/raffles/view/ticket/delete/' . $ticket->id]) !!}{!! Form::submit('Delete', ['class' => 'btn btn-danger btn-sm']) !!}{!! Form::close() !!}
+
+ @endif
- @endforeach -
+
+ @endforeach
-
{!! $tickets->render() !!}
+ +
{!! $tickets->render() !!}
-