From 735d028bb2a29974a0b48de1ea202443c2ea1fea Mon Sep 17 00:00:00 2001 From: itinerare Date: Thu, 28 May 2020 10:41:12 -0400 Subject: [PATCH 01/43] Turn HTMLPurifier caching off for testing purposes --- app/Helpers/Helpers.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Helpers/Helpers.php b/app/Helpers/Helpers.php index 558aa0e676..bfae15b475 100644 --- a/app/Helpers/Helpers.php +++ b/app/Helpers/Helpers.php @@ -97,6 +97,7 @@ function parse($text, &$pings = null) { $config->set('Attr.EnableID', true); $config->set('HTML.DefinitionID', 'include'); $config->set('HTML.DefinitionRev', 2); + $config->set('Cache.DefinitionImpl', null); // TODO: remove this later! if ($def = $config->maybeGetRawHTMLDefinition()) { $def->addElement('include', 'Block', 'Empty', 'Common', array('file*' => 'URI', 'height' => 'Text', 'width' => 'Text')); $def->addAttribute('a', 'data-toggle', 'Enum#collapse'); From 7c6fce9ca6a697b1bdf6cdabdb439c4c15ea5cfa Mon Sep 17 00:00:00 2001 From: itinerare Date: Thu, 28 May 2020 11:02:14 -0400 Subject: [PATCH 02/43] Pushing precisely the version of the config where it works, apparently --- app/Helpers/Helpers.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Helpers/Helpers.php b/app/Helpers/Helpers.php index bfae15b475..1a2511a575 100644 --- a/app/Helpers/Helpers.php +++ b/app/Helpers/Helpers.php @@ -102,6 +102,7 @@ function parse($text, &$pings = null) { $def->addElement('include', 'Block', 'Empty', 'Common', array('file*' => 'URI', 'height' => 'Text', 'width' => 'Text')); $def->addAttribute('a', 'data-toggle', 'Enum#collapse'); $def->addAttribute('a', 'aria-expanded', 'Enum#true,false'); + } $purifier = new HTMLPurifier($config); From 80c16c82a7b01e8ff749457beb6f4393c226a331 Mon Sep 17 00:00:00 2001 From: itinerare Date: Thu, 28 May 2020 11:27:43 -0400 Subject: [PATCH 03/43] Add accordion support. --- app/Helpers/Helpers.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Helpers/Helpers.php b/app/Helpers/Helpers.php index 1a2511a575..1003dc8434 100644 --- a/app/Helpers/Helpers.php +++ b/app/Helpers/Helpers.php @@ -102,6 +102,8 @@ function parse($text, &$pings = null) { $def->addElement('include', 'Block', 'Empty', 'Common', array('file*' => 'URI', 'height' => 'Text', 'width' => 'Text')); $def->addAttribute('a', 'data-toggle', 'Enum#collapse'); $def->addAttribute('a', 'aria-expanded', 'Enum#true,false'); + $def->addAttribute('a', 'data-target', 'Text'); + $def->addAttribute('div', 'data-parent', 'Text'); } From aaec1bbd577d89291e8c2c6831d5ea8225a560cf Mon Sep 17 00:00:00 2001 From: itinerare Date: Thu, 28 May 2020 11:37:20 -0400 Subject: [PATCH 04/43] Add tab --- app/Helpers/Helpers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Helpers/Helpers.php b/app/Helpers/Helpers.php index 1003dc8434..348b989265 100644 --- a/app/Helpers/Helpers.php +++ b/app/Helpers/Helpers.php @@ -100,7 +100,7 @@ function parse($text, &$pings = null) { $config->set('Cache.DefinitionImpl', null); // TODO: remove this later! if ($def = $config->maybeGetRawHTMLDefinition()) { $def->addElement('include', 'Block', 'Empty', 'Common', array('file*' => 'URI', 'height' => 'Text', 'width' => 'Text')); - $def->addAttribute('a', 'data-toggle', 'Enum#collapse'); + $def->addAttribute('a', 'data-toggle', 'Enum#collapse,tab'); $def->addAttribute('a', 'aria-expanded', 'Enum#true,false'); $def->addAttribute('a', 'data-target', 'Text'); $def->addAttribute('div', 'data-parent', 'Text'); From 5fecd50fbdcf520bdb8c8acd48d68eeebe7d8bd4 Mon Sep 17 00:00:00 2001 From: itinerare Date: Wed, 10 Jun 2020 17:31:46 -0400 Subject: [PATCH 05/43] Fix for bug around editing character desc/notes and then trying to open a modal --- resources/views/character/_image_js.blade.php | 46 ++++++++++++++++--- 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/resources/views/character/_image_js.blade.php b/resources/views/character/_image_js.blade.php index 678dc833f1..425b5a7000 100644 --- a/resources/views/character/_image_js.blade.php +++ b/resources/views/character/_image_js.blade.php @@ -6,10 +6,27 @@ }); $('.edit-notes').on('click', function(e) { e.preventDefault(); - $( "div.imagenoteseditingparse" ).load("{{ url('admin/character/image') }}/"+$(this).data('id')+"/notes", 'Edit Image Notes'); - $( "div.imagenoteseditingparse" ).attr('id', 'modal'); + $( "div.imagenoteseditingparse" ).load("{{ url('admin/character/image') }}/"+$(this).data('id')+"/notes", function() { + tinymce.init({ + selector: '.imagenoteseditingparse .wysiwyg', + height: 500, + menubar: false, + convert_urls: false, + plugins: [ + 'advlist autolink lists link image charmap print preview anchor', + 'searchreplace visualblocks code fullscreen spoiler', + 'insertdatetime media table paste code help wordcount' + ], + toolbar: 'undo redo | formatselect | bold italic backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | spoiler-add spoiler-remove | removeformat | code', + content_css: [ + '{{ asset('css/app.css') }}', + '{{ asset('css/lorekeeper.css') }}' + ], + spoiler_caption: 'Toggle Spoiler', + target_list: false + }); + }); $( ".edit-notes" ).remove(); - //loadModal("{{ url('admin/character/image') }}/"+$(this).data('id')+"/notes", 'Edit Image Notes'); }); $('.edit-credits').on('click', function(e) { e.preventDefault(); @@ -37,10 +54,27 @@ }); $('.edit-description').on('click', function(e) { e.preventDefault(); - $( "div.descriptioneditingparse" ).load("{{ url($character->is_myo_slot ? 'admin/myo/' : 'admin/character/') }}/"+$(this).data('{{ $character->is_myo_slot ? 'id' : 'slug' }}')+"/description", 'Edit Description'); - $( "div.descriptioneditingparse" ).attr('id', 'modal'); + $( "div.descriptioneditingparse" ).load("{{ url($character->is_myo_slot ? 'admin/myo/' : 'admin/character/') }}/"+$(this).data('{{ $character->is_myo_slot ? 'id' : 'slug' }}')+"/description", function() { + tinymce.init({ + selector: '.descriptioneditingparse .wysiwyg', + height: 500, + menubar: false, + convert_urls: false, + plugins: [ + 'advlist autolink lists link image charmap print preview anchor', + 'searchreplace visualblocks code fullscreen spoiler', + 'insertdatetime media table paste code help wordcount' + ], + toolbar: 'undo redo | formatselect | bold italic backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | spoiler-add spoiler-remove | removeformat | code', + content_css: [ + '{{ asset('css/app.css') }}', + '{{ asset('css/lorekeeper.css') }}' + ], + spoiler_caption: 'Toggle Spoiler', + target_list: false + }); + }); $( ".edit-description" ).remove(); - //loadModal("{{ url($character->is_myo_slot ? 'admin/myo/' : 'admin/character/') }}/"+$(this).data('{{ $character->is_myo_slot ? 'id' : 'slug' }}')+"/description", 'Edit Description'); }); $('.delete-character').on('click', function(e) { e.preventDefault(); From 1d26649bdb1cc9de610a952a5250bc19b9633cd6 Mon Sep 17 00:00:00 2001 From: itinerare Date: Sun, 14 Jun 2020 15:06:31 -0400 Subject: [PATCH 06/43] Adjust dashboard timestamp mobile css slightly --- public/css/lorekeeper.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/css/lorekeeper.css b/public/css/lorekeeper.css index f645ada896..c32522e2f5 100644 --- a/public/css/lorekeeper.css +++ b/public/css/lorekeeper.css @@ -180,6 +180,11 @@ main > .row { @media (max-width: 767px) { .site-mobile-header { top: 54px !important; + } + + .timestamp { + margin-left: 1rem!important; + margin-right: 1rem!important; } } @@ -258,11 +263,6 @@ main > .row { .site-footer .navbar .navbar-nav { flex-wrap: wrap; justify-content: center; } - - .timestamp { - margin-left: 1rem!important; - margin-right: 1rem!important; - } } /* Footer */ From f907c7fe68efedfa4349634703f153507b337470 Mon Sep 17 00:00:00 2001 From: itinerare Date: Tue, 23 Jun 2020 22:29:13 -0400 Subject: [PATCH 07/43] Add meta tags for social media, discord, etc previews. --- config/lorekeeper/settings.php | 12 ++++++++++++ public/images/meta-image.png | Bin 0 -> 21619 bytes resources/views/layouts/app.blade.php | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 public/images/meta-image.png diff --git a/config/lorekeeper/settings.php b/config/lorekeeper/settings.php index 1adb85423a..214de62f6b 100644 --- a/config/lorekeeper/settings.php +++ b/config/lorekeeper/settings.php @@ -26,6 +26,18 @@ | */ 'site_name' => 'Lorekeeper', + + /* + |-------------------------------------------------------------------------- + | Site Description + |-------------------------------------------------------------------------- + | + | This is the description used for the site in meta tags-- previews + | displayed on various social media sites, discord, and the like. + | It is not, however, displayed on the site itself. This should be kept short and snappy! + | + */ + 'site_desc' => 'A Lorekeeper ARPG', /* |-------------------------------------------------------------------------- diff --git a/public/images/meta-image.png b/public/images/meta-image.png new file mode 100644 index 0000000000000000000000000000000000000000..72d8d8a2f7ff5350be08602c4ba5790ab4826c25 GIT binary patch literal 21619 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 config('lorekeeper.settings.site_name', 'Lorekeeper') }} - @yield('title') + + + + + + + + + + + + + + + + + + From 7572de3c3903dc0fb5cd0d1cf37985f69cee4d66 Mon Sep 17 00:00:00 2001 From: itinerare Date: Tue, 23 Jun 2020 22:37:03 -0400 Subject: [PATCH 08/43] Tweak on account of bug/in case of large character images --- resources/views/layouts/app.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index db54228634..abbf6614da 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -16,14 +16,14 @@ - + - + From 797518a72af3a7bbfdcb22432536692eb718a2ba Mon Sep 17 00:00:00 2001 From: itinerare Date: Tue, 23 Jun 2020 23:17:00 -0400 Subject: [PATCH 09/43] Fix for bug re displaying character images when a user profile is linked, switch to character thumbs for character link previews --- resources/views/layouts/app.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index abbf6614da..3452cde7ef 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -16,14 +16,14 @@ - + - + From 1db6abc723fab8ddcd586c1812004fdc4c7564bf Mon Sep 17 00:00:00 2001 From: itinerare Date: Wed, 24 Jun 2020 20:11:05 -0400 Subject: [PATCH 10/43] Collapse character and user profile page titles into one line for the sake of meta tags --- resources/views/character/layout.blade.php | 5 +---- resources/views/user/layout.blade.php | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/resources/views/character/layout.blade.php b/resources/views/character/layout.blade.php index 805779e22d..ccd40bf80b 100644 --- a/resources/views/character/layout.blade.php +++ b/resources/views/character/layout.blade.php @@ -1,9 +1,6 @@ @extends('layouts.app') -@section('title') - Character :: - @yield('profile-title') -@endsection +@section('title') Character :: @yield('profile-title') @endsection @section('sidebar') @include('character.'.($isMyo ? 'myo.' : '').'_sidebar') diff --git a/resources/views/user/layout.blade.php b/resources/views/user/layout.blade.php index 9d5ff6b527..1c92537c95 100644 --- a/resources/views/user/layout.blade.php +++ b/resources/views/user/layout.blade.php @@ -1,9 +1,6 @@ @extends('layouts.app') -@section('title') - User :: - @yield('profile-title') -@endsection +@section('title') User :: @yield('profile-title') @endsection @section('sidebar') @include('user._sidebar') From dbe462ed3f195577148cf5c430e836e3117a3280 Mon Sep 17 00:00:00 2001 From: itinerare Date: Wed, 24 Jun 2020 20:20:47 -0400 Subject: [PATCH 11/43] Remove extra spaces in user and character page titles. --- resources/views/character/layout.blade.php | 2 +- resources/views/user/layout.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/character/layout.blade.php b/resources/views/character/layout.blade.php index ccd40bf80b..31f52a6371 100644 --- a/resources/views/character/layout.blade.php +++ b/resources/views/character/layout.blade.php @@ -1,6 +1,6 @@ @extends('layouts.app') -@section('title') Character :: @yield('profile-title') @endsection +@section('title')Character ::@yield('profile-title')@endsection @section('sidebar') @include('character.'.($isMyo ? 'myo.' : '').'_sidebar') diff --git a/resources/views/user/layout.blade.php b/resources/views/user/layout.blade.php index 1c92537c95..a9c33336f4 100644 --- a/resources/views/user/layout.blade.php +++ b/resources/views/user/layout.blade.php @@ -1,6 +1,6 @@ @extends('layouts.app') -@section('title') User :: @yield('profile-title') @endsection +@section('title')User ::@yield('profile-title')@endsection @section('sidebar') @include('user._sidebar') From 0403283cc5a94edc753a727ef9e3379efb57c364 Mon Sep 17 00:00:00 2001 From: itinerare Date: Wed, 24 Jun 2020 20:32:13 -0400 Subject: [PATCH 12/43] Remove extra space present in all page titles --- resources/views/character/layout.blade.php | 2 +- resources/views/layouts/app.blade.php | 2 +- resources/views/user/layout.blade.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/character/layout.blade.php b/resources/views/character/layout.blade.php index 31f52a6371..13d8b8f4e3 100644 --- a/resources/views/character/layout.blade.php +++ b/resources/views/character/layout.blade.php @@ -1,6 +1,6 @@ @extends('layouts.app') -@section('title')Character ::@yield('profile-title')@endsection +@section('title') Character ::@yield('profile-title')@endsection @section('sidebar') @include('character.'.($isMyo ? 'myo.' : '').'_sidebar') diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 3452cde7ef..77bc0a26ac 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -10,7 +10,7 @@ {{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} - @yield('title') - + diff --git a/resources/views/user/layout.blade.php b/resources/views/user/layout.blade.php index a9c33336f4..97bdc0644e 100644 --- a/resources/views/user/layout.blade.php +++ b/resources/views/user/layout.blade.php @@ -1,6 +1,6 @@ @extends('layouts.app') -@section('title')User ::@yield('profile-title')@endsection +@section('title') User ::@yield('profile-title')@endsection @section('sidebar') @include('user._sidebar') From f0648d8695a9975535f40112b60cf6ddd8035f8e Mon Sep 17 00:00:00 2001 From: itinerare Date: Wed, 24 Jun 2020 20:47:37 -0400 Subject: [PATCH 13/43] Add meta tag image to site images admin panel. --- config/lorekeeper/image_files.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/lorekeeper/image_files.php b/config/lorekeeper/image_files.php index 7c3982e0e8..da52e42a14 100644 --- a/config/lorekeeper/image_files.php +++ b/config/lorekeeper/image_files.php @@ -46,5 +46,10 @@ 'name' => 'MYO Default Image (Thumbnail)', 'description' => 'The default masterlist thumbnail used for MYO slots when no image is uploaded. PNG format, size of masterlist thumbnails.', 'filename' => 'myo-th.png' + ], + 'meta-image' => [ + 'name' => 'Meta Tag Image', + 'description' => 'The image displayed in meta tag previews on social media, discord, and the like. PNG format, no size restriction.', + 'filename' => 'meta-image.png' ] ]; From d94101e2814c45028bb9af27fcb410800953e326 Mon Sep 17 00:00:00 2001 From: itinerare Date: Wed, 24 Jun 2020 23:43:06 -0400 Subject: [PATCH 14/43] Remove extra space from page title, meta tag title --- resources/views/layouts/app.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 77bc0a26ac..0140413cef 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -7,7 +7,7 @@ - {{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} - @yield('title') + {{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} -@yield('title') @@ -17,14 +17,14 @@ - + - + From f09f78552d8f339bc0f8b90b6b1655d48e0c2993 Mon Sep 17 00:00:00 2001 From: itinerare Date: Sat, 27 Jun 2020 11:54:33 -0400 Subject: [PATCH 15/43] Change to cleaner and more extensible way of populating meta tag info per page if desired --- resources/views/character/bank.blade.php | 2 ++ resources/views/character/character.blade.php | 2 ++ resources/views/character/character_logs.blade.php | 2 ++ resources/views/character/currency_logs.blade.php | 2 ++ resources/views/character/edit_profile.blade.php | 2 ++ resources/views/character/images.blade.php | 2 ++ resources/views/character/ownership_logs.blade.php | 2 ++ resources/views/character/profile.blade.php | 2 ++ resources/views/character/submission_logs.blade.php | 2 ++ resources/views/character/transfer.blade.php | 2 ++ resources/views/character/update_form.blade.php | 2 ++ resources/views/layouts/app.blade.php | 10 +++++----- 12 files changed, 27 insertions(+), 5 deletions(-) diff --git a/resources/views/character/bank.blade.php b/resources/views/character/bank.blade.php index fbd1400152..c0110f5c08 100644 --- a/resources/views/character/bank.blade.php +++ b/resources/views/character/bank.blade.php @@ -2,6 +2,8 @@ @section('profile-title') {{ $character->fullName }}'s Bank @endsection +@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection + @section('profile-content') {!! breadcrumbs([($character->is_myo_slot ? 'MYO Slot Masterlist' : 'Character Masterlist') => ($character->is_myo_slot ? 'myos' : 'masterlist'), $character->fullName => $character->url, "Bank" => $character->url.'/bank']) !!} diff --git a/resources/views/character/character.blade.php b/resources/views/character/character.blade.php index a4f73edb7d..2fd9aeae07 100644 --- a/resources/views/character/character.blade.php +++ b/resources/views/character/character.blade.php @@ -2,6 +2,8 @@ @section('profile-title') {{ $character->fullName }} @endsection +@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection + @section('profile-content') {!! breadcrumbs([($character->is_myo_slot ? 'MYO Slot Masterlist' : 'Character Masterlist') => ($character->is_myo_slot ? 'myos' : 'masterlist'), $character->fullName => $character->url]) !!} diff --git a/resources/views/character/character_logs.blade.php b/resources/views/character/character_logs.blade.php index b058b9c48b..6b616df5f4 100644 --- a/resources/views/character/character_logs.blade.php +++ b/resources/views/character/character_logs.blade.php @@ -2,6 +2,8 @@ @section('profile-title') {{ $character->fullName }}'s Change Log @endsection +@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection + @section('profile-content') {!! breadcrumbs([($character->is_myo_slot ? 'MYO Slot Masterlist' : 'Character Masterlist') => ($character->is_myo_slot ? 'myos' : 'masterlist'), $character->fullName => $character->url, 'Change Log' => $character->url.'/change-log']) !!} diff --git a/resources/views/character/currency_logs.blade.php b/resources/views/character/currency_logs.blade.php index 2829d1a069..1d4c4bbb93 100644 --- a/resources/views/character/currency_logs.blade.php +++ b/resources/views/character/currency_logs.blade.php @@ -2,6 +2,8 @@ @section('profile-title') {{ $character->fullName }}'s Currency Logs @endsection +@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection + @section('profile-content') {!! breadcrumbs([($character->is_myo_slot ? 'MYO Slot Masterlist' : 'Character Masterlist') => ($character->is_myo_slot ? 'myos' : 'masterlist'), $character->fullName => $character->url, "Bank" => $character->url.'/bank', 'Logs' => $character->url.'/currency-logs']) !!} diff --git a/resources/views/character/edit_profile.blade.php b/resources/views/character/edit_profile.blade.php index e53181f6c9..25be48180e 100644 --- a/resources/views/character/edit_profile.blade.php +++ b/resources/views/character/edit_profile.blade.php @@ -2,6 +2,8 @@ @section('profile-title') Editing {{ $character->fullName }}'s Profile @endsection +@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection + @section('profile-content') {!! breadcrumbs([($character->is_myo_slot ? 'MYO Slot Masterlist' : 'Character Masterlist') => ($character->is_myo_slot ? 'myos' : 'masterlist'), $character->fullName => $character->url, 'Editing Profile' => $character->url . '/profile/edit']) !!} diff --git a/resources/views/character/images.blade.php b/resources/views/character/images.blade.php index 26f1bd0b02..7db905479d 100644 --- a/resources/views/character/images.blade.php +++ b/resources/views/character/images.blade.php @@ -2,6 +2,8 @@ @section('profile-title') {{ $character->fullName }}'s Images @endsection +@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection + @section('profile-content') {!! breadcrumbs([($character->is_myo_slot ? 'MYO Slot Masterlist' : 'Character Masterlist') => ($character->is_myo_slot ? 'myos' : 'masterlist'), $character->fullName => $character->url, 'Images' => $character->url . '/images']) !!} diff --git a/resources/views/character/ownership_logs.blade.php b/resources/views/character/ownership_logs.blade.php index df0ad7a885..537f8bc1a9 100644 --- a/resources/views/character/ownership_logs.blade.php +++ b/resources/views/character/ownership_logs.blade.php @@ -2,6 +2,8 @@ @section('profile-title') {{ $character->fullName }}'s Ownership History @endsection +@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection + @section('profile-content') {!! breadcrumbs([($character->is_myo_slot ? 'MYO Slot Masterlist' : 'Character Masterlist') => ($character->is_myo_slot ? 'myos' : 'masterlist'), $character->fullName => $character->url, 'Ownership History' => $character->url.'/ownership']) !!} diff --git a/resources/views/character/profile.blade.php b/resources/views/character/profile.blade.php index 49513ca886..ac90f6e7cf 100644 --- a/resources/views/character/profile.blade.php +++ b/resources/views/character/profile.blade.php @@ -2,6 +2,8 @@ @section('profile-title') {{ $character->fullName }}'s Profile @endsection +@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection + @section('profile-content') {!! breadcrumbs([($character->is_myo_slot ? 'MYO Slot Masterlist' : 'Character Masterlist') => ($character->is_myo_slot ? 'myos' : 'masterlist'), $character->fullName => $character->url, 'Profile' => $character->url . '/profile']) !!} diff --git a/resources/views/character/submission_logs.blade.php b/resources/views/character/submission_logs.blade.php index 652324c23e..72ed903101 100644 --- a/resources/views/character/submission_logs.blade.php +++ b/resources/views/character/submission_logs.blade.php @@ -2,6 +2,8 @@ @section('profile-title') {{ $character->fullName }}'s Submissions @endsection +@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection + @section('profile-content') {!! breadcrumbs([($character->is_myo_slot ? 'MYO Slot Masterlist' : 'Character Masterlist') => ($character->is_myo_slot ? 'myos' : 'masterlist'), $character->fullName => $character->url, 'Submissions' => $character->url.'/submissions']) !!} diff --git a/resources/views/character/transfer.blade.php b/resources/views/character/transfer.blade.php index a35c3f3863..15795102c0 100644 --- a/resources/views/character/transfer.blade.php +++ b/resources/views/character/transfer.blade.php @@ -2,6 +2,8 @@ @section('profile-title') Transferring {{ $character->fullName }} @endsection +@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection + @section('profile-content') {!! breadcrumbs([($character->is_myo_slot ? 'MYO Slot Masterlist' : 'Character Masterlist') => ($character->is_myo_slot ? 'myos' : 'masterlist'), $character->fullName => $character->url, 'Transfer' => $character->url . '/transfer']) !!} diff --git a/resources/views/character/update_form.blade.php b/resources/views/character/update_form.blade.php index efe0464772..8b3db257f8 100644 --- a/resources/views/character/update_form.blade.php +++ b/resources/views/character/update_form.blade.php @@ -2,6 +2,8 @@ @section('profile-title') {{ $character->is_myo_slot ? 'MYO Approval' : 'Design Update' }} for {{ $character->fullName }} @endsection +@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection + @section('profile-content') {!! breadcrumbs([($character->is_myo_slot ? 'MYO Slot Masterlist' : 'Character Masterlist') => ($character->is_myo_slot ? 'myos' : 'masterlist'), $character->fullName => $character->url, ($character->is_myo_slot ? 'MYO Approval' : 'Design Update') => $character->url.'/approval']) !!} diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 0140413cef..ffb833df01 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -11,21 +11,21 @@ - + - + - + - + - + From 81d1f6a006352005172387cf80bbc9adfc45071f Mon Sep 17 00:00:00 2001 From: itinerare Date: Fri, 31 Jul 2020 14:46:26 -0400 Subject: [PATCH 16/43] Fix for bug with subtypes pre-assigned to MYOs being absent after approval --- app/Services/CharacterManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/CharacterManager.php b/app/Services/CharacterManager.php index 1d25f8c563..5e55ec7036 100644 --- a/app/Services/CharacterManager.php +++ b/app/Services/CharacterManager.php @@ -1805,7 +1805,7 @@ public function approveRequest($data, $request, $user) 'y0' => $request->y0, 'y1' => $request->y1, 'species_id' => $request->species_id, - 'subtype_id' => $request->subtype_id, + 'subtype_id' => ($request->character->is_myo_slot && isset($request->character->image->subtype_id)) ? $request->character->image->subtype_id : $request->subtype_id, 'rarity_id' => $request->rarity_id, 'sort' => 0, ]); From e64d4ed83f5ec07427e0817e0cc7bd99f054569e Mon Sep 17 00:00:00 2001 From: itinerare Date: Fri, 31 Jul 2020 15:57:00 -0400 Subject: [PATCH 17/43] Fix for bug with approved MYO submissions being listed as approved design updates. Not retroactive. --- .../Character/CharacterDesignUpdate.php | 6 ++-- app/Services/CharacterManager.php | 12 ++++++- ...7_31_185640_add_type_to_design_updates.php | 34 +++++++++++++++++++ ..._31_193235_set_design_update_type_null.php | 30 ++++++++++++++++ 4 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 database/migrations/2020_07_31_185640_add_type_to_design_updates.php create mode 100644 database/migrations/2020_07_31_193235_set_design_update_type_null.php diff --git a/app/Models/Character/CharacterDesignUpdate.php b/app/Models/Character/CharacterDesignUpdate.php index 47ddf2f939..86401d25b6 100644 --- a/app/Models/Character/CharacterDesignUpdate.php +++ b/app/Models/Character/CharacterDesignUpdate.php @@ -24,7 +24,7 @@ class CharacterDesignupdate extends Model 'use_cropper', 'x0', 'x1', 'y0', 'y1', 'hash', 'species_id', 'subtype_id', 'rarity_id', 'has_comments', 'has_image', 'has_addons', 'has_features', - 'submitted_at' + 'submitted_at', 'update_type' ]; /** @@ -173,7 +173,7 @@ public function scopeActive($query) */ public function scopeMyos($query) { - $query->select('design_updates.*')->join('characters', 'design_updates.character_id', 'characters.id')->where('characters.is_myo_slot', 1); + $query->select('design_updates.*')->where('update_type', 'MYO'); } /** @@ -184,7 +184,7 @@ public function scopeMyos($query) */ public function scopeCharacters($query) { - $query->select('design_updates.*')->join('characters', 'design_updates.character_id', 'characters.id')->where('characters.is_myo_slot', 0); + $query->select('design_updates.*')->where('update_type', 'Character'); } /********************************************************************************************** diff --git a/app/Services/CharacterManager.php b/app/Services/CharacterManager.php index 5e55ec7036..b1246e781b 100644 --- a/app/Services/CharacterManager.php +++ b/app/Services/CharacterManager.php @@ -1427,6 +1427,7 @@ public function createDesignUpdateRequest($character, $user) 'character_id' => $character->id, 'status' => 'Draft', 'hash' => randomString(10), + 'update_type' => $character->is_myo_slot ? 'MYO' : 'Character', // Set some data based on the character's existing stats 'rarity_id' => $character->image->rarity_id, @@ -1434,7 +1435,6 @@ public function createDesignUpdateRequest($character, $user) 'subtype_id' => $character->image->subtype_id ]; - $request = CharacterDesignUpdate::create($data); // If the character is not a MYO slot, make a copy of the previous image's traits @@ -1728,6 +1728,10 @@ public function submitRequest($request) try { if($request->status != 'Draft') throw new \Exception("This request cannot be resubmitted to the queue."); + // Recheck and set update type, as insurance/in case of pre-existing drafts + if($request->character->is_myo_slot) + $request->update_type = 'MYO'; + else $request->update_type = 'Character'; // We've done validation and all section by section, // so it's safe to simply set the status to Pending here $request->status = 'Pending'; @@ -1862,6 +1866,12 @@ public function approveRequest($data, $request, $user) // Add a log for the character and user $this->createLog($user->id, null, $request->character->user_id, $request->character->user->alias, $request->character->id, $request->character->is_myo_slot ? 'MYO Design Approved' : 'Character Design Updated', '[#'.$image->id.']', 'character'); $this->createLog($user->id, null, $request->character->user_id, $request->character->user->alias, $request->character->id, $request->character->is_myo_slot ? 'MYO Design Approved' : 'Character Design Updated', '[#'.$image->id.']', 'user'); + + // Final recheck and setting of update type, as insurance + if($request->character->is_myo_slot) + $request->update_type = 'MYO'; + else $request->update_type = 'Character'; + $request->save(); // If this is for a MYO, set user's FTO status and the MYO status of the slot if($request->character->is_myo_slot) diff --git a/database/migrations/2020_07_31_185640_add_type_to_design_updates.php b/database/migrations/2020_07_31_185640_add_type_to_design_updates.php new file mode 100644 index 0000000000..912eae90a0 --- /dev/null +++ b/database/migrations/2020_07_31_185640_add_type_to_design_updates.php @@ -0,0 +1,34 @@ +enum('update_type', ['MYO', 'Character'])->nullable()->default('Character'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('design_updates', function (Blueprint $table) { + // + $table->dropColumn('update_type'); + }); + } +} diff --git a/database/migrations/2020_07_31_193235_set_design_update_type_null.php b/database/migrations/2020_07_31_193235_set_design_update_type_null.php new file mode 100644 index 0000000000..a4b63e9a14 --- /dev/null +++ b/database/migrations/2020_07_31_193235_set_design_update_type_null.php @@ -0,0 +1,30 @@ + Date: Fri, 31 Jul 2020 23:04:45 -0400 Subject: [PATCH 18/43] Add sorting options to user list. --- app/Http/Controllers/BrowseController.php | 33 +++++++++++++++++++++-- resources/views/browse/users.blade.php | 11 ++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index 12a96826a7..a06e8c6a3b 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -38,14 +38,43 @@ class BrowseController extends Controller public function getUsers(Request $request) { $query = User::visible()->join('ranks','users.rank_id', '=', 'ranks.id')->select('ranks.name AS rank_name', 'users.*'); - + $sort = $request->only(['sort']); + if($request->get('name')) $query->where(function($query) use ($request) { $query->where('users.name', 'LIKE', '%' . $request->get('name') . '%')->orWhere('users.alias', 'LIKE', '%' . $request->get('name') . '%'); }); if($request->get('rank_id')) $query->where('rank_id', $request->get('rank_id')); + if(isset($sort['sort'])) + { + switch($sort['sort']) { + case 'alpha': + $query->orderBy('name'); + break; + case 'alpha-reverse': + $query->orderBy('name', 'DESC'); + break; + case 'alias': + $query->orderBy('alias', 'ASC'); + break; + case 'alias-reverse': + $query->orderBy('alias', 'DESC'); + break; + case 'rank': + $query->orderBy('ranks.sort', 'DESC')->orderBy('name'); + break; + case 'newest': + $query->orderBy('created_at', 'DESC'); + break; + case 'oldest': + $query->orderBy('created_at', 'ASC'); + break; + } + } + else $query->orderBy('ranks.sort', 'DESC')->orderBy('name'); + return view('browse.users', [ - 'users' => $query->orderBy('ranks.sort', 'DESC')->orderBy('name')->paginate(30)->appends($request->query()), + 'users' => $query->paginate(30)->appends($request->query()), 'ranks' => [0 => 'Any Rank'] + Rank::orderBy('ranks.sort', 'DESC')->pluck('name', 'id')->toArray(), 'blacklistLink' => Settings::get('blacklist_link') ]); diff --git a/resources/views/browse/users.blade.php b/resources/views/browse/users.blade.php index 01b8f5d194..d27caa4efa 100644 --- a/resources/views/browse/users.blade.php +++ b/resources/views/browse/users.blade.php @@ -19,6 +19,17 @@
{!! Form::select('rank_id', $ranks, Request::get('rank_id'), ['class' => 'form-control']) !!}
+
+ {!! Form::select('sort', [ + 'alpha' => 'Sort Alphabetically (A-Z)', + 'alpha-reverse' => 'Sort Alphabetically (Z-A)', + 'alias' => 'Sort by Alias (A-Z)', + 'alias-reverse' => 'Sort by Alias (Z-A)', + 'rank' => 'Sort by Rank (Default)', + 'newest' => 'Newest First', + 'oldest' => 'Oldest First' + ], Request::get('sort') ? : 'category', ['class' => 'form-control']) !!} +
{!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
From ff18802a70256f5788cc569aa4c283eb4b041b37 Mon Sep 17 00:00:00 2001 From: itinerare Date: Fri, 31 Jul 2020 23:14:50 -0400 Subject: [PATCH 19/43] Add sorting to admin user list as well. --- .../Admin/Users/UserController.php | 31 ++++++++++++++++++- resources/views/admin/users/index.blade.php | 11 +++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/Users/UserController.php b/app/Http/Controllers/Admin/Users/UserController.php index 16e2fc74ec..290ece6508 100644 --- a/app/Http/Controllers/Admin/Users/UserController.php +++ b/app/Http/Controllers/Admin/Users/UserController.php @@ -26,14 +26,43 @@ class UserController extends Controller public function getIndex(Request $request) { $query = User::join('ranks','users.rank_id', '=', 'ranks.id')->select('ranks.name AS rank_name', 'users.*'); + $sort = $request->only(['sort']); if($request->get('name')) $query->where(function($query) use ($request) { $query->where('users.name', 'LIKE', '%' . $request->get('name') . '%')->orWhere('users.alias', 'LIKE', '%' . $request->get('name') . '%'); }); if($request->get('rank_id')) $query->where('rank_id', $request->get('rank_id')); + if(isset($sort['sort'])) + { + switch($sort['sort']) { + case 'alpha': + $query->orderBy('name'); + break; + case 'alpha-reverse': + $query->orderBy('name', 'DESC'); + break; + case 'alias': + $query->orderBy('alias', 'ASC'); + break; + case 'alias-reverse': + $query->orderBy('alias', 'DESC'); + break; + case 'rank': + $query->orderBy('ranks.sort', 'DESC')->orderBy('name'); + break; + case 'newest': + $query->orderBy('created_at', 'DESC'); + break; + case 'oldest': + $query->orderBy('created_at', 'ASC'); + break; + } + } + else $query->orderBy('ranks.sort', 'DESC')->orderBy('name'); + return view('admin.users.index', [ - 'users' => $query->orderBy('ranks.sort', 'DESC')->orderBy('name')->paginate(30)->appends($request->query()), + 'users' => $query->paginate(30)->appends($request->query()), 'ranks' => [0 => 'Any Rank'] + Rank::orderBy('ranks.sort', 'DESC')->pluck('name', 'id')->toArray(), 'count' => $query->count() ]); diff --git a/resources/views/admin/users/index.blade.php b/resources/views/admin/users/index.blade.php index 92a8013d57..c11bedc86a 100644 --- a/resources/views/admin/users/index.blade.php +++ b/resources/views/admin/users/index.blade.php @@ -17,6 +17,17 @@
{!! Form::select('rank_id', $ranks, Request::get('rank_id'), ['class' => 'form-control']) !!}
+
+ {!! Form::select('sort', [ + 'alpha' => 'Sort Alphabetically (A-Z)', + 'alpha-reverse' => 'Sort Alphabetically (Z-A)', + 'alias' => 'Sort by Alias (A-Z)', + 'alias-reverse' => 'Sort by Alias (Z-A)', + 'rank' => 'Sort by Rank (Default)', + 'newest' => 'Newest First', + 'oldest' => 'Oldest First' + ], Request::get('sort') ? : 'category', ['class' => 'form-control']) !!} +
{!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
From c18c6f732d6bc18bcb45fecd5f14ed16985ffccd Mon Sep 17 00:00:00 2001 From: itinerare Date: Sat, 1 Aug 2020 12:08:15 -0400 Subject: [PATCH 20/43] Fix for bug with duplicate character features sometimes being consumed when editing an existing character's features. Thanks to https://github.com/Draginraptor for discovering the fix itself --- .../views/character/admin/_edit_features_modal.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/character/admin/_edit_features_modal.blade.php b/resources/views/character/admin/_edit_features_modal.blade.php index b6b14c4f22..b9a64616d5 100644 --- a/resources/views/character/admin/_edit_features_modal.blade.php +++ b/resources/views/character/admin/_edit_features_modal.blade.php @@ -19,8 +19,8 @@
@foreach($image->features as $feature)
- {!! Form::select('feature_id['.$feature->id.']', $features, $feature->feature_id, ['class' => 'form-control mr-2 feature-select original', 'placeholder' => 'Select Trait']) !!} - {!! Form::text('feature_data['.$feature->id.']', $feature->data, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!} + {!! Form::select('feature_id[]', $features, $feature->feature_id, ['class' => 'form-control mr-2 feature-select original', 'placeholder' => 'Select Trait']) !!} + {!! Form::text('feature_data[]', $feature->data, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!} ×
@endforeach From 3c8a859117b41cc4859b4f44a6ad68392bc32f58 Mon Sep 17 00:00:00 2001 From: itinerare Date: Tue, 18 Aug 2020 12:48:33 -0400 Subject: [PATCH 21/43] Add subtype display to design update request traits panel --- resources/views/character/design/features.blade.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/resources/views/character/design/features.blade.php b/resources/views/character/design/features.blade.php index 55919b3d45..e806e12990 100644 --- a/resources/views/character/design/features.blade.php +++ b/resources/views/character/design/features.blade.php @@ -83,6 +83,18 @@
Species
{!! $request->species ? $request->species->displayName : 'None Selected' !!}
+ @if($request->subtype_id) +
+
Subtype
+
+ @if($request->character->is_myo_slot && $request->character->image->subtype_id) + {!! $request->character->image->subtype->displayName !!} + @else + {!! $request->subtype_id ? $request->subtype->displayName : 'None Selected' !!} + @endif +
+
+ @endif
Rarity
{!! $request->rarity ? $request->rarity->displayName : 'None Selected' !!}
From 2ab59cd15d17f136c984a314ccb060abcd84bddd Mon Sep 17 00:00:00 2001 From: itinerare Date: Tue, 18 Aug 2020 13:45:22 -0400 Subject: [PATCH 22/43] Fix for bug with design update approval attempting to move image to nonexistent folder --- app/Services/CharacterManager.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/Services/CharacterManager.php b/app/Services/CharacterManager.php index b1246e781b..641b32a610 100644 --- a/app/Services/CharacterManager.php +++ b/app/Services/CharacterManager.php @@ -1830,6 +1830,17 @@ public function approveRequest($data, $request, $user) // Shift the image features over to the new image $request->rawFeatures()->update(['character_image_id' => $image->id, 'character_type' => 'Character']); + // Make the image directory if it doesn't exist + if(!file_exists($image->imagePath)) + { + // Create the directory. + if (!mkdir($image->imagePath, 0755, true)) { + $this->setError('error', 'Failed to create image directory.'); + return false; + } + chmod($image->imagePath, 0755); + } + // Move the image file to the new image File::move($request->imagePath . '/' . $request->imageFileName, $image->imagePath . '/' . $image->imageFileName); File::move($request->thumbnailPath . '/' . $request->thumbnailFileName, $image->thumbnailPath . '/' . $image->thumbnailFileName); From 20037c83a0c518ea0fda655c3955c650d5478382 Mon Sep 17 00:00:00 2001 From: itinerare Date: Thu, 20 Aug 2020 17:36:55 -0400 Subject: [PATCH 23/43] Set shop image max width for the sake of smaller screens. --- resources/views/shops/shop.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/shops/shop.blade.php b/resources/views/shops/shop.blade.php index 3ccebde446..e36cc1910f 100644 --- a/resources/views/shops/shop.blade.php +++ b/resources/views/shops/shop.blade.php @@ -10,7 +10,7 @@
- +

{!! $shop->parsed_description !!}

From 03df16a4b56691ec0d6821ef5ad5397a6991e659 Mon Sep 17 00:00:00 2001 From: itinerare Date: Wed, 26 Aug 2020 22:14:53 -0400 Subject: [PATCH 24/43] Fix bug with character design update rejection notification going to processing staff rather than user. --- app/Services/CharacterManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/CharacterManager.php b/app/Services/CharacterManager.php index 641b32a610..4ffe21b448 100644 --- a/app/Services/CharacterManager.php +++ b/app/Services/CharacterManager.php @@ -1965,7 +1965,7 @@ public function rejectRequest($data, $request, $user, $forceReject = false) $request->save(); // Notify the user - Notifications::create('DESIGN_REJECTED', $user, [ + Notifications::create('DESIGN_REJECTED', $request->user, [ 'design_url' => $request->url, 'character_url' => $request->character->url, 'name' => $request->character->fullName From a5371311961d9e85a0630495cda211bd4e9e0e77 Mon Sep 17 00:00:00 2001 From: itinerare Date: Thu, 27 Aug 2020 18:18:05 -0400 Subject: [PATCH 25/43] Fix bug with individual raffles having duplicate winners --- app/Services/RaffleManager.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Services/RaffleManager.php b/app/Services/RaffleManager.php index f8234182ce..58d28255e4 100644 --- a/app/Services/RaffleManager.php +++ b/app/Services/RaffleManager.php @@ -166,7 +166,7 @@ private function rollWinners($raffle) $winner->update(['position' => $i + 1]); // save the winning ticket's user id - if($winner->user_id) $winners['ids'][] = $winner->user_id; + if(isset($winner->user_id)) $winners['ids'][] = $winner->user_id; else $winners['aliases'][] = $winner->alias; // remove ticket from the ticket pool after pulled @@ -178,13 +178,14 @@ private function rollWinners($raffle) // remove tickets for the same user...I'm unsure how this is going to hold up with 3000 tickets, foreach($ticketPool as $key=>$ticket) { - if($ticket->user_id == $winner->user_id) + if(($ticket->user_id != null && $ticket->user_id == $winner->user_id) || ($ticket->user_id == null && $ticket->alias == $winner->alias)) { $ticketPool->forget($key); - $ticketPool = $ticketPool->values(); - $ticketCount--; } + } + $ticketPool = $ticketPool->values(); + $ticketCount = $ticketPool->count(); } return $winners; } From 528ef848489e6693d14e5f645eb7dad9dc77e0db Mon Sep 17 00:00:00 2001 From: itinerare Date: Sat, 29 Aug 2020 11:40:43 -0400 Subject: [PATCH 26/43] - Adjust character update logs to use request update type column - Remove MYO slot creations and design update approvals from approving staff's ownership log --- app/Models/User/User.php | 2 +- app/Services/CharacterManager.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Models/User/User.php b/app/Models/User/User.php index 3db9aca747..dbc3ea709d 100644 --- a/app/Models/User/User.php +++ b/app/Models/User/User.php @@ -395,7 +395,7 @@ public function getOwnershipLogs() { $user = $this; $query = UserCharacterLog::with('sender.rank')->with('recipient.rank')->with('character')->where(function($query) use ($user) { - $query->where('sender_id', $user->id)->where('log_type', '!=', 'Character Created'); + $query->where('sender_id', $user->id)->whereNotIn('log_type', ['Character Created', 'MYO Slot Created', 'Character Design Updated', 'MYO Design Approved']); })->orWhere(function($query) use ($user) { $query->where('recipient_id', $user->id); })->orderBy('id', 'DESC'); diff --git a/app/Services/CharacterManager.php b/app/Services/CharacterManager.php index 641b32a610..3b1dcb2a32 100644 --- a/app/Services/CharacterManager.php +++ b/app/Services/CharacterManager.php @@ -1874,15 +1874,15 @@ public function approveRequest($data, $request, $user) $request->character->character_image_id = $image->id; } - // Add a log for the character and user - $this->createLog($user->id, null, $request->character->user_id, $request->character->user->alias, $request->character->id, $request->character->is_myo_slot ? 'MYO Design Approved' : 'Character Design Updated', '[#'.$image->id.']', 'character'); - $this->createLog($user->id, null, $request->character->user_id, $request->character->user->alias, $request->character->id, $request->character->is_myo_slot ? 'MYO Design Approved' : 'Character Design Updated', '[#'.$image->id.']', 'user'); - // Final recheck and setting of update type, as insurance if($request->character->is_myo_slot) $request->update_type = 'MYO'; else $request->update_type = 'Character'; $request->save(); + + // Add a log for the character and user + $this->createLog($user->id, null, $request->character->user_id, $request->character->user->alias, $request->character->id, $request->update_type == 'MYO' ? 'MYO Design Approved' : 'Character Design Updated', '[#'.$image->id.']', 'character'); + $this->createLog($user->id, null, $request->character->user_id, $request->character->user->alias, $request->character->id, $request->update_type == 'MYO' ? 'MYO Design Approved' : 'Character Design Updated', '[#'.$image->id.']', 'user'); // If this is for a MYO, set user's FTO status and the MYO status of the slot if($request->character->is_myo_slot) From b09f0b49e6f3564db517ac3ab7facd5d437470ba Mon Sep 17 00:00:00 2001 From: itinerare Date: Sun, 30 Aug 2020 11:05:21 -0400 Subject: [PATCH 27/43] Fix bug with hidden images on characters being completely invisible even to permitted staff --- app/Models/Character/Character.php | 2 +- app/Models/Character/CharacterImage.php | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/app/Models/Character/Character.php b/app/Models/Character/Character.php index 2b77a11678..6de259a977 100644 --- a/app/Models/Character/Character.php +++ b/app/Models/Character/Character.php @@ -149,7 +149,7 @@ public function image() */ public function images() { - return $this->hasMany('App\Models\Character\CharacterImage', 'character_id')->guest(); + return $this->hasMany('App\Models\Character\CharacterImage', 'character_id')->images(); } /** diff --git a/app/Models/Character/CharacterImage.php b/app/Models/Character/CharacterImage.php index ad5a8ac18f..57362ba972 100644 --- a/app/Models/Character/CharacterImage.php +++ b/app/Models/Character/CharacterImage.php @@ -4,6 +4,7 @@ use Config; use DB; +use Auth; use App\Models\Model; use App\Models\Feature\FeatureCategory; use App\Models\Character\CharacterCategory; @@ -159,20 +160,10 @@ public function artists() * @param \Illuminate\Database\Eloquent\Builder $query * @return \Illuminate\Database\Eloquent\Builder */ - public function scopeGuest($query) + public function scopeImages($query) { - return $query->where('is_visible', 1)->orderBy('sort')->orderBy('id', 'DESC'); - } - - /** - * Scope a query to include images visible to staff with the required viewing powers. - * - * @param \Illuminate\Database\Eloquent\Builder $query - * @return \Illuminate\Database\Eloquent\Builder - */ - public function scopeMod($query) - { - return $query->orderBy('sort')->orderBy('id', 'DESC'); + if(Auth::check() ? Auth::user()->hasPower('manage_masterlist') : FALSE) return $query->orderBy('sort')->orderBy('id', 'DESC'); + else return $query->where('is_visible', 1)->orderBy('sort')->orderBy('id', 'DESC'); } /********************************************************************************************** From c40ccd87973a93641b77b2e96db5091ceb43d5bb Mon Sep 17 00:00:00 2001 From: itinerare Date: Sun, 30 Aug 2020 11:09:31 -0400 Subject: [PATCH 28/43] ; --- app/Models/Character/CharacterImage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Character/CharacterImage.php b/app/Models/Character/CharacterImage.php index 57362ba972..39ec0de11a 100644 --- a/app/Models/Character/CharacterImage.php +++ b/app/Models/Character/CharacterImage.php @@ -162,7 +162,7 @@ public function artists() */ public function scopeImages($query) { - if(Auth::check() ? Auth::user()->hasPower('manage_masterlist') : FALSE) return $query->orderBy('sort')->orderBy('id', 'DESC'); + if(Auth::check() ? Auth::user()->hasPower('manage_characters') : FALSE) return $query->orderBy('sort')->orderBy('id', 'DESC'); else return $query->where('is_visible', 1)->orderBy('sort')->orderBy('id', 'DESC'); } From b164e9f8313e8af75385d332cde63bfe03da046e Mon Sep 17 00:00:00 2001 From: itinerare Date: Sun, 30 Aug 2020 11:50:17 -0400 Subject: [PATCH 29/43] Tidier fix, adjust browse controller to suit --- app/Http/Controllers/BrowseController.php | 6 +----- app/Models/Character/CharacterImage.php | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index a06e8c6a3b..3a77cd0fbb 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -122,11 +122,7 @@ public function getCharacters(Request $request) { $query = Character::with('user.rank')->with('image.features')->with('rarity')->with('image.species')->myo(0); - $imageQuery = CharacterImage::with('features')->with('rarity')->with('species')->with('features'); - if(!Auth::check() || !Auth::user()->hasPower('manage_characters')) { - $query->visible(); - $imageQuery->guest(); - } + $imageQuery = CharacterImage::images()->with('features')->with('rarity')->with('species')->with('features'); if($request->get('name')) $query->where(function($query) use ($request) { $query->where('characters.name', 'LIKE', '%' . $request->get('name') . '%')->orWhere('characters.slug', 'LIKE', '%' . $request->get('name') . '%'); diff --git a/app/Models/Character/CharacterImage.php b/app/Models/Character/CharacterImage.php index 39ec0de11a..a3980acb22 100644 --- a/app/Models/Character/CharacterImage.php +++ b/app/Models/Character/CharacterImage.php @@ -162,8 +162,8 @@ public function artists() */ public function scopeImages($query) { - if(Auth::check() ? Auth::user()->hasPower('manage_characters') : FALSE) return $query->orderBy('sort')->orderBy('id', 'DESC'); - else return $query->where('is_visible', 1)->orderBy('sort')->orderBy('id', 'DESC'); + if(!Auth::check() || !Auth::user()->hasPower('manage_characters')) return $query->where('is_visible', 1)->orderBy('sort')->orderBy('id', 'DESC'); + else return $query->orderBy('sort')->orderBy('id', 'DESC'); } /********************************************************************************************** From d97ca9729d8c0d8799137ab83e986aad7a3d99ee Mon Sep 17 00:00:00 2001 From: itinerare Date: Sun, 30 Aug 2020 13:54:43 -0400 Subject: [PATCH 30/43] - Sort news posts by last updated in both user and admin lists - Add ability to bump existing news posts via a toggle in the edit form - Change news post header to include time of last edit and move staff attribution there --- app/Http/Controllers/Admin/NewsController.php | 4 ++-- app/Http/Controllers/NewsController.php | 2 +- app/Services/NewsService.php | 1 + .../admin/news/create_edit_news.blade.php | 18 +++++++++++++++--- resources/views/news/_news.blade.php | 2 +- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Admin/NewsController.php b/app/Http/Controllers/Admin/NewsController.php index 68def02bca..05d2686f7d 100644 --- a/app/Http/Controllers/Admin/NewsController.php +++ b/app/Http/Controllers/Admin/NewsController.php @@ -21,7 +21,7 @@ class NewsController extends Controller public function getIndex() { return view('admin.news.news', [ - 'newses' => News::orderBy('post_at', 'DESC')->paginate(20) + 'newses' => News::orderBy('updated_at', 'DESC')->paginate(20) ]); } @@ -64,7 +64,7 @@ public function postCreateEditNews(Request $request, NewsService $service, $id = { $id ? $request->validate(News::$updateRules) : $request->validate(News::$createRules); $data = $request->only([ - 'title', 'text', 'post_at', 'is_visible' + 'title', 'text', 'post_at', 'is_visible', 'bump' ]); if($id && $service->updateNews(News::find($id), $data, Auth::user())) { flash('News updated successfully.')->success(); diff --git a/app/Http/Controllers/NewsController.php b/app/Http/Controllers/NewsController.php index 0d647c863d..e5e2945d05 100644 --- a/app/Http/Controllers/NewsController.php +++ b/app/Http/Controllers/NewsController.php @@ -28,7 +28,7 @@ class NewsController extends Controller public function getIndex() { if(Auth::check() && Auth::user()->is_news_unread) Auth::user()->update(['is_news_unread' => 0]); - return view('news.index', ['newses' => News::visible()->orderBy('id', 'DESC')->paginate(10)]); + return view('news.index', ['newses' => News::visible()->orderBy('updated_at', 'DESC')->paginate(10)]); } /** diff --git a/app/Services/NewsService.php b/app/Services/NewsService.php index 0433d37e1a..ad6148f3c1 100644 --- a/app/Services/NewsService.php +++ b/app/Services/NewsService.php @@ -62,6 +62,7 @@ public function updateNews($news, $data, $user) $data['parsed_text'] = parse($data['text']); $data['user_id'] = $user->id; if(!isset($data['is_visible'])) $data['is_visible'] = 0; + if(isset($data['bump']) && $data['bump'] == 1) $this->alertUsers(); $news->update($data); diff --git a/resources/views/admin/news/create_edit_news.blade.php b/resources/views/admin/news/create_edit_news.blade.php index 9faa239697..c4f98c72aa 100644 --- a/resources/views/admin/news/create_edit_news.blade.php +++ b/resources/views/admin/news/create_edit_news.blade.php @@ -36,9 +36,21 @@ {!! Form::textarea('text', $news->text, ['class' => 'form-control wysiwyg']) !!}
-
- {!! Form::checkbox('is_visible', 1, $news->id ? $news->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!} - {!! Form::label('is_visible', 'Is Viewable', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned off, the post will not be visible. If the post time is set, it will automatically become visible at/after the given post time, so make sure the post time is empty if you want it to be completely hidden.') !!} +
+
+
+ {!! Form::checkbox('is_visible', 1, $news->id ? $news->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!} + {!! Form::label('is_visible', 'Is Viewable', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned off, the post will not be visible. If the post time is set, it will automatically become visible at/after the given post time, so make sure the post time is empty if you want it to be completely hidden.') !!} +
+
+ @if($news->id) +
+
+ {!! Form::checkbox('bump', 1, null, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!} + {!! Form::label('bump', 'Bump News', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If toggled on, this will alert users that there is new news. Best in conjunction with a clear notification of changes!') !!} +
+
+ @endif
diff --git a/resources/views/news/_news.blade.php b/resources/views/news/_news.blade.php index 0aa4c6bacb..bd2a4ea1ba 100644 --- a/resources/views/news/_news.blade.php +++ b/resources/views/news/_news.blade.php @@ -2,7 +2,7 @@

{!! $news->displayName !!}

- Posted {!! $news->post_at ? format_date($news->post_at) : format_date($news->created_at) !!} by {!! $news->user->displayName !!} + Posted {!! $news->post_at ? format_date($news->post_at) : format_date($news->created_at) !!} :: Last edited {!! format_date($news->updated_at) !!} by {!! $news->user->displayName !!}
From b404a4a7f89682739635c8b91f8d0e266ba8775c Mon Sep 17 00:00:00 2001 From: itinerare Date: Sun, 30 Aug 2020 11:50:17 -0400 Subject: [PATCH 31/43] Tidier fix, adjust browse controller to suit --- app/Http/Controllers/BrowseController.php | 6 +----- app/Models/Character/CharacterImage.php | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index a06e8c6a3b..3a77cd0fbb 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -122,11 +122,7 @@ public function getCharacters(Request $request) { $query = Character::with('user.rank')->with('image.features')->with('rarity')->with('image.species')->myo(0); - $imageQuery = CharacterImage::with('features')->with('rarity')->with('species')->with('features'); - if(!Auth::check() || !Auth::user()->hasPower('manage_characters')) { - $query->visible(); - $imageQuery->guest(); - } + $imageQuery = CharacterImage::images()->with('features')->with('rarity')->with('species')->with('features'); if($request->get('name')) $query->where(function($query) use ($request) { $query->where('characters.name', 'LIKE', '%' . $request->get('name') . '%')->orWhere('characters.slug', 'LIKE', '%' . $request->get('name') . '%'); diff --git a/app/Models/Character/CharacterImage.php b/app/Models/Character/CharacterImage.php index 39ec0de11a..a3980acb22 100644 --- a/app/Models/Character/CharacterImage.php +++ b/app/Models/Character/CharacterImage.php @@ -162,8 +162,8 @@ public function artists() */ public function scopeImages($query) { - if(Auth::check() ? Auth::user()->hasPower('manage_characters') : FALSE) return $query->orderBy('sort')->orderBy('id', 'DESC'); - else return $query->where('is_visible', 1)->orderBy('sort')->orderBy('id', 'DESC'); + if(!Auth::check() || !Auth::user()->hasPower('manage_characters')) return $query->where('is_visible', 1)->orderBy('sort')->orderBy('id', 'DESC'); + else return $query->orderBy('sort')->orderBy('id', 'DESC'); } /********************************************************************************************** From 758ab210901cb30064444ea554c54996298e39a9 Mon Sep 17 00:00:00 2001 From: itinerare Date: Sun, 30 Aug 2020 14:13:57 -0400 Subject: [PATCH 32/43] Tweak bump option to only be available for visible news --- app/Services/NewsService.php | 2 +- resources/views/admin/news/create_edit_news.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Services/NewsService.php b/app/Services/NewsService.php index ad6148f3c1..46482b3c04 100644 --- a/app/Services/NewsService.php +++ b/app/Services/NewsService.php @@ -62,7 +62,7 @@ public function updateNews($news, $data, $user) $data['parsed_text'] = parse($data['text']); $data['user_id'] = $user->id; if(!isset($data['is_visible'])) $data['is_visible'] = 0; - if(isset($data['bump']) && $data['bump'] == 1) $this->alertUsers(); + if(isset($data['bump']) && $data['is_visible'] == 1 && $data['bump'] == 1) $this->alertUsers(); $news->update($data); diff --git a/resources/views/admin/news/create_edit_news.blade.php b/resources/views/admin/news/create_edit_news.blade.php index c4f98c72aa..f5b4c51ba3 100644 --- a/resources/views/admin/news/create_edit_news.blade.php +++ b/resources/views/admin/news/create_edit_news.blade.php @@ -43,7 +43,7 @@ {!! Form::label('is_visible', 'Is Viewable', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned off, the post will not be visible. If the post time is set, it will automatically become visible at/after the given post time, so make sure the post time is empty if you want it to be completely hidden.') !!}
- @if($news->id) + @if($news->id && $news->is_visible)
{!! Form::checkbox('bump', 1, null, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!} From 4b0959798966f1a170000d62b50817d4163f2960 Mon Sep 17 00:00:00 2001 From: itinerare Date: Sun, 30 Aug 2020 14:41:25 -0400 Subject: [PATCH 33/43] Set raffle group visibility setting to cascade to any raffles in the group on editing the group --- app/Services/RaffleService.php | 1 + resources/views/admin/raffle/_group_create_edit.blade.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Services/RaffleService.php b/app/Services/RaffleService.php index 258a9474fd..8b5125b9a3 100644 --- a/app/Services/RaffleService.php +++ b/app/Services/RaffleService.php @@ -91,6 +91,7 @@ public function updateRaffleGroup($data, $group) DB::beginTransaction(); if(!isset($data['is_active'])) $data['is_active'] = 0; $group->update(array_only($data, ['name', 'is_active'])); + foreach($group->raffles as $raffle) $raffle->update(['is_active' => $data['is_active']]); DB::commit(); return $group; } diff --git a/resources/views/admin/raffle/_group_create_edit.blade.php b/resources/views/admin/raffle/_group_create_edit.blade.php index 75b82ed303..b9f79aa1d2 100644 --- a/resources/views/admin/raffle/_group_create_edit.blade.php +++ b/resources/views/admin/raffle/_group_create_edit.blade.php @@ -11,7 +11,7 @@
From d746dd96673ad2346650ffd2d5a38788661dccd8 Mon Sep 17 00:00:00 2001 From: itinerare Date: Sun, 30 Aug 2020 20:47:18 -0400 Subject: [PATCH 34/43] Apply imageQuery fix to MYO masterlist --- app/Http/Controllers/BrowseController.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index 3a77cd0fbb..4c3b37d614 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -226,11 +226,7 @@ public function getMyos(Request $request) { $query = Character::with('user.rank')->with('image.features')->with('rarity')->with('image.species')->myo(1); - $imageQuery = CharacterImage::with('features')->with('rarity')->with('species')->with('features'); - if(!Auth::check() || !Auth::user()->hasPower('manage_characters')) { - $query->visible(); - $imageQuery->guest(); - } + $imageQuery = CharacterImage::images()->with('features')->with('rarity')->with('species')->with('features'); if($request->get('name')) $query->where(function($query) use ($request) { $query->where('characters.name', 'LIKE', '%' . $request->get('name') . '%')->orWhere('characters.slug', 'LIKE', '%' . $request->get('name') . '%'); From 84b06467eafb118be06f8a01dfaa897afbcdac04 Mon Sep 17 00:00:00 2001 From: itinerare Date: Mon, 31 Aug 2020 19:25:51 -0400 Subject: [PATCH 35/43] Fix bug reuploading character image with non-cropped thumbnail --- app/Services/CharacterManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/CharacterManager.php b/app/Services/CharacterManager.php index c5844d0cdf..1ac9f420b4 100644 --- a/app/Services/CharacterManager.php +++ b/app/Services/CharacterManager.php @@ -618,7 +618,7 @@ public function reuploadImage($data, $image, $user) // Save thumbnail if(isset($data['use_cropper'])) $this->cropThumbnail(array_only($data, ['x0','x1','y0','y1']), $image); - else $this->handleImage($data['thumbnail'], $image->thumbnailDirectory, $image->thumbnailFileName); + else $this->handleImage($data['thumbnail'], $image->thumbnailPath, $image->thumbnailFileName); // Add a log for the character // This logs all the updates made to the character From d109b8b782af488f7e6706365c2fff436aa37a09 Mon Sep 17 00:00:00 2001 From: itinerare Date: Sat, 5 Sep 2020 21:45:30 -0400 Subject: [PATCH 36/43] Add an "ask first" option to the gift art option on character profiles. --- app/Http/Controllers/BrowseController.php | 12 +++++++++++- app/Services/CharacterManager.php | 2 +- resources/views/browse/_masterlist_content.blade.php | 11 ++++++----- resources/views/character/edit_profile.blade.php | 4 ++-- resources/views/character/profile.blade.php | 4 ++-- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index 3a77cd0fbb..67e2bd03f9 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -134,7 +134,17 @@ public function getCharacters(Request $request) if($request->get('sale_value_max')) $query->where('sale_value', '<=', $request->get('sale_value_max')); if($request->get('is_trading')) $query->where('is_trading', 1); - if($request->get('is_gift_art_allowed')) $query->where('is_gift_art_allowed', 1); + if($request->get('is_gift_art_allowed')) switch($request->get('is_gift_art_allowed')) { + case 1: + $query->where('is_gift_art_allowed', 1); + break; + case 2: + $query->where('is_gift_art_allowed', 2); + break; + case 3: + $query->where('is_gift_art_allowed', 1)->orWhere('is_gift_art_allowed', 2); + break; + } if($request->get('is_sellable')) $query->where('is_sellable', 1); if($request->get('is_tradeable')) $query->where('is_tradeable', 1); if($request->get('is_giftable')) $query->where('is_giftable', 1); diff --git a/app/Services/CharacterManager.php b/app/Services/CharacterManager.php index c5844d0cdf..eed281ea16 100644 --- a/app/Services/CharacterManager.php +++ b/app/Services/CharacterManager.php @@ -981,7 +981,7 @@ public function updateCharacterProfile($data, $character, $user, $isAdmin = fals if($character->is_trading != isset($data['is_trading'])) $notifyTrading = true; if($character->is_gift_art_allowed != isset($data['is_gift_art_allowed'])) $notifyGiftArt = true; - $character->is_gift_art_allowed = isset($data['is_gift_art_allowed']); + $character->is_gift_art_allowed = isset($data['is_gift_art_allowed']) ? $data['is_gift_art_allowed'] : 0; $character->is_trading = isset($data['is_trading']); $character->save(); } diff --git a/resources/views/browse/_masterlist_content.blade.php b/resources/views/browse/_masterlist_content.blade.php index ac1953af59..61975dac30 100644 --- a/resources/views/browse/_masterlist_content.blade.php +++ b/resources/views/browse/_masterlist_content.blade.php @@ -46,16 +46,17 @@ {!! Form::label('sale_value_max', 'Resale Maximum ($): ') !!} {!! Form::text('sale_value_max', Request::get('sale_value_max'), ['class' => 'form-control']) !!}
- {{-- Setting the width and height on the toggles as they don't seem to calculate correctly if the div is collapsed. --}} -
- {!! Form::checkbox('is_trading', 1, Request::get('is_trading'), ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Open For Trade', 'data-off' => 'Any Trading Status', 'data-width' => '200', 'data-height' => '46']) !!} -
@if(!$isMyo)
- {!! Form::checkbox('is_gift_art_allowed', 1, Request::get('is_gift_art_allowed'), ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Open For Gift Art', 'data-off' => 'Any Gift Art Status', 'data-width' => '195', 'data-height' => '46']) !!} + {!! Form::label('is_gift_art_allowed', 'Gift Art Status: ') !!} + {!! Form::select('is_gift_art_allowed', [0 => 'Any', 2 => 'Ask First', 1 => 'Yes', 3 => 'Yes OR Ask First'], Request::get('is_gift_art_allowed'), ['class' => 'form-control']) !!}
@endif
+ {{-- Setting the width and height on the toggles as they don't seem to calculate correctly if the div is collapsed. --}} +
+ {!! Form::checkbox('is_trading', 1, Request::get('is_trading'), ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Open For Trade', 'data-off' => 'Any Trading Status', 'data-width' => '200', 'data-height' => '46']) !!} +
{!! Form::checkbox('is_sellable', 1, Request::get('is_sellable'), ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Can Be Sold', 'data-off' => 'Any Sellable Status', 'data-width' => '204', 'data-height' => '46']) !!}
diff --git a/resources/views/character/edit_profile.blade.php b/resources/views/character/edit_profile.blade.php index 25be48180e..0aa400a436 100644 --- a/resources/views/character/edit_profile.blade.php +++ b/resources/views/character/edit_profile.blade.php @@ -30,8 +30,8 @@ @if($character->user_id == Auth::user()->id) @if(!$character->is_myo_slot)
- {!! Form::checkbox('is_gift_art_allowed', 1, $character->is_gift_art_allowed, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!} - {!! Form::label('is_gift_art_allowed', 'Allow Gift Art', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will place the character on the list of characters that can be drawn for gift art. This does not have any other functionality, but allow users looking for characters to draw to find your character easily.') !!} + {!! Form::label('is_gift_art_allowed', 'Allow Gift Art', ['class' => 'form-check-label mb-3']) !!} {!! add_help('This will place the character on the list of characters that can be drawn for gift art. This does not have any other functionality, but allow users looking for characters to draw to find your character easily.') !!} + {!! Form::select('is_gift_art_allowed', [0 => 'No', 1 => 'Yes', 2 => 'Ask First'], $character->is_gift_art_allowed, ['class' => 'form-control user-select']) !!}
@endif @if($character->is_tradeable || $character->is_sellable) diff --git a/resources/views/character/profile.blade.php b/resources/views/character/profile.blade.php index ac90f6e7cf..2b360ef35c 100644 --- a/resources/views/character/profile.blade.php +++ b/resources/views/character/profile.blade.php @@ -33,8 +33,8 @@
@if($character->is_trading || $character->is_gift_art_allowed)
    - @if($character->is_gift_art_allowed && !$character->is_myo_slot) -
  • Gift art is allowed
    • + @if($character->is_gift_art_allowed >= 1 && !$character->is_myo_slot) +
  • {{ $character->is_gift_art_allowed == 1 ? 'Gift art is allowed' : 'Please ask before gift art' }}
    • @endif @if($character->is_trading)
  • Open for trades
    • From 00bff4fdf1e68549ad7e08ec5b1465f890647006 Mon Sep 17 00:00:00 2001 From: itinerare Date: Sat, 5 Sep 2020 22:05:11 -0400 Subject: [PATCH 37/43] Slightly more checking on setting gift art status --- app/Services/CharacterManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/CharacterManager.php b/app/Services/CharacterManager.php index ba75149850..5756f800c8 100644 --- a/app/Services/CharacterManager.php +++ b/app/Services/CharacterManager.php @@ -981,7 +981,7 @@ public function updateCharacterProfile($data, $character, $user, $isAdmin = fals if($character->is_trading != isset($data['is_trading'])) $notifyTrading = true; if($character->is_gift_art_allowed != isset($data['is_gift_art_allowed'])) $notifyGiftArt = true; - $character->is_gift_art_allowed = isset($data['is_gift_art_allowed']) ? $data['is_gift_art_allowed'] : 0; + $character->is_gift_art_allowed = isset($data['is_gift_art_allowed']) && $data['is_gift_art_allowed'] <= 2 ? $data['is_gift_art_allowed'] : 0; $character->is_trading = isset($data['is_trading']); $character->save(); } From db83d8cb1753041e675428ca607c133c7e633a85 Mon Sep 17 00:00:00 2001 From: itinerare Date: Thu, 10 Sep 2020 22:40:35 -0400 Subject: [PATCH 38/43] Add an extension service for handling misc general tasks relating to extensions. For the moment it only serves as a home for a function to adjust the type ID of existing notifications within the DB. --- app/Services/ExtensionService.php | 46 +++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 app/Services/ExtensionService.php diff --git a/app/Services/ExtensionService.php b/app/Services/ExtensionService.php new file mode 100644 index 0000000000..ca931880e1 --- /dev/null +++ b/app/Services/ExtensionService.php @@ -0,0 +1,46 @@ +count(); + if($count && isset($destination)) { + DB::beginTransaction(); + try { + Notification::where('notification_type_id', $source)->update(['notification_type_id' => $destination]); + + return $this->commitReturn(true); + } catch(\Exception $e) { + $this->setError('error', $e->getMessage()); + } + return $this->rollbackReturn(false); + } + } +} \ No newline at end of file From dd864cc6ed36f06252b9513e4167eb1069616cfc Mon Sep 17 00:00:00 2001 From: itinerare Date: Tue, 6 Oct 2020 13:55:26 -0400 Subject: [PATCH 39/43] Revert "Add an extension service for handling misc general tasks relating to extensions." This reverts commit db83d8cb1753041e675428ca607c133c7e633a85. --- app/Services/ExtensionService.php | 46 ------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 app/Services/ExtensionService.php diff --git a/app/Services/ExtensionService.php b/app/Services/ExtensionService.php deleted file mode 100644 index ca931880e1..0000000000 --- a/app/Services/ExtensionService.php +++ /dev/null @@ -1,46 +0,0 @@ -count(); - if($count && isset($destination)) { - DB::beginTransaction(); - try { - Notification::where('notification_type_id', $source)->update(['notification_type_id' => $destination]); - - return $this->commitReturn(true); - } catch(\Exception $e) { - $this->setError('error', $e->getMessage()); - } - return $this->rollbackReturn(false); - } - } -} \ No newline at end of file From c0237eab628f5f90f24bacec0be61e349751b33d Mon Sep 17 00:00:00 2001 From: itinerare Date: Tue, 6 Oct 2020 13:57:03 -0400 Subject: [PATCH 40/43] - Remove isset on switch in browse/admin user controllers in favor of default - Move auth out of character image model --- .../Admin/Users/UserController.php | 53 +++++++++-------- app/Http/Controllers/BrowseController.php | 57 +++++++++---------- app/Models/Character/CharacterImage.php | 5 +- resources/views/character/images.blade.php | 2 +- 4 files changed, 57 insertions(+), 60 deletions(-) diff --git a/app/Http/Controllers/Admin/Users/UserController.php b/app/Http/Controllers/Admin/Users/UserController.php index 290ece6508..f3f9e86dc5 100644 --- a/app/Http/Controllers/Admin/Users/UserController.php +++ b/app/Http/Controllers/Admin/Users/UserController.php @@ -33,33 +33,32 @@ public function getIndex(Request $request) }); if($request->get('rank_id')) $query->where('rank_id', $request->get('rank_id')); - if(isset($sort['sort'])) - { - switch($sort['sort']) { - case 'alpha': - $query->orderBy('name'); - break; - case 'alpha-reverse': - $query->orderBy('name', 'DESC'); - break; - case 'alias': - $query->orderBy('alias', 'ASC'); - break; - case 'alias-reverse': - $query->orderBy('alias', 'DESC'); - break; - case 'rank': - $query->orderBy('ranks.sort', 'DESC')->orderBy('name'); - break; - case 'newest': - $query->orderBy('created_at', 'DESC'); - break; - case 'oldest': - $query->orderBy('created_at', 'ASC'); - break; - } - } - else $query->orderBy('ranks.sort', 'DESC')->orderBy('name'); + switch($sort['sort']) { + default: + $query->orderBy('ranks.sort', 'DESC')->orderBy('name'); + break; + case 'alpha': + $query->orderBy('name'); + break; + case 'alpha-reverse': + $query->orderBy('name', 'DESC'); + break; + case 'alias': + $query->orderBy('alias', 'ASC'); + break; + case 'alias-reverse': + $query->orderBy('alias', 'DESC'); + break; + case 'rank': + $query->orderBy('ranks.sort', 'DESC')->orderBy('name'); + break; + case 'newest': + $query->orderBy('created_at', 'DESC'); + break; + case 'oldest': + $query->orderBy('created_at', 'ASC'); + break; + } return view('admin.users.index', [ 'users' => $query->paginate(30)->appends($request->query()), diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index de08f22a12..db9b466f91 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -45,33 +45,32 @@ public function getUsers(Request $request) }); if($request->get('rank_id')) $query->where('rank_id', $request->get('rank_id')); - if(isset($sort['sort'])) - { - switch($sort['sort']) { - case 'alpha': - $query->orderBy('name'); - break; - case 'alpha-reverse': - $query->orderBy('name', 'DESC'); - break; - case 'alias': - $query->orderBy('alias', 'ASC'); - break; - case 'alias-reverse': - $query->orderBy('alias', 'DESC'); - break; - case 'rank': - $query->orderBy('ranks.sort', 'DESC')->orderBy('name'); - break; - case 'newest': - $query->orderBy('created_at', 'DESC'); - break; - case 'oldest': - $query->orderBy('created_at', 'ASC'); - break; - } - } - else $query->orderBy('ranks.sort', 'DESC')->orderBy('name'); + switch($sort['sort']) { + default: + $query->orderBy('ranks.sort', 'DESC')->orderBy('name'); + break; + case 'alpha': + $query->orderBy('name'); + break; + case 'alpha-reverse': + $query->orderBy('name', 'DESC'); + break; + case 'alias': + $query->orderBy('alias', 'ASC'); + break; + case 'alias-reverse': + $query->orderBy('alias', 'DESC'); + break; + case 'rank': + $query->orderBy('ranks.sort', 'DESC')->orderBy('name'); + break; + case 'newest': + $query->orderBy('created_at', 'DESC'); + break; + case 'oldest': + $query->orderBy('created_at', 'ASC'); + break; + } return view('browse.users', [ 'users' => $query->paginate(30)->appends($request->query()), @@ -122,7 +121,7 @@ public function getCharacters(Request $request) { $query = Character::with('user.rank')->with('image.features')->with('rarity')->with('image.species')->myo(0); - $imageQuery = CharacterImage::images()->with('features')->with('rarity')->with('species')->with('features'); + $imageQuery = CharacterImage::images(Auth::check() ? Auth::user() : null)->with('features')->with('rarity')->with('species')->with('features'); if($request->get('name')) $query->where(function($query) use ($request) { $query->where('characters.name', 'LIKE', '%' . $request->get('name') . '%')->orWhere('characters.slug', 'LIKE', '%' . $request->get('name') . '%'); @@ -236,7 +235,7 @@ public function getMyos(Request $request) { $query = Character::with('user.rank')->with('image.features')->with('rarity')->with('image.species')->myo(1); - $imageQuery = CharacterImage::images()->with('features')->with('rarity')->with('species')->with('features'); + $imageQuery = CharacterImage::images(Auth::check() ? Auth::user() : null)->with('features')->with('rarity')->with('species')->with('features'); if($request->get('name')) $query->where(function($query) use ($request) { $query->where('characters.name', 'LIKE', '%' . $request->get('name') . '%')->orWhere('characters.slug', 'LIKE', '%' . $request->get('name') . '%'); diff --git a/app/Models/Character/CharacterImage.php b/app/Models/Character/CharacterImage.php index a3980acb22..cf051750e2 100644 --- a/app/Models/Character/CharacterImage.php +++ b/app/Models/Character/CharacterImage.php @@ -4,7 +4,6 @@ use Config; use DB; -use Auth; use App\Models\Model; use App\Models\Feature\FeatureCategory; use App\Models\Character\CharacterCategory; @@ -160,9 +159,9 @@ public function artists() * @param \Illuminate\Database\Eloquent\Builder $query * @return \Illuminate\Database\Eloquent\Builder */ - public function scopeImages($query) + public function scopeImages($query, $user = null) { - if(!Auth::check() || !Auth::user()->hasPower('manage_characters')) return $query->where('is_visible', 1)->orderBy('sort')->orderBy('id', 'DESC'); + if(!$user || !$user->hasPower('manage_characters')) return $query->where('is_visible', 1)->orderBy('sort')->orderBy('id', 'DESC'); else return $query->orderBy('sort')->orderBy('id', 'DESC'); } diff --git a/resources/views/character/images.blade.php b/resources/views/character/images.blade.php index 7db905479d..047bce681d 100644 --- a/resources/views/character/images.blade.php +++ b/resources/views/character/images.blade.php @@ -10,7 +10,7 @@ @include('character._header', ['character' => $character])
    - @foreach($character->images()->with('features.feature')->with('species')->with('rarity')->get() as $image) + @foreach($character->images(Auth::check() ? Auth::user() : null)->with('features.feature')->with('species')->with('rarity')->get() as $image)
    From 71aee3ce6ca86d351977d09e6155bd87de2c55e1 Mon Sep 17 00:00:00 2001 From: itinerare Date: Tue, 6 Oct 2020 14:37:43 -0400 Subject: [PATCH 41/43] Properly display/search hidden character images again --- app/Http/Controllers/Characters/CharacterController.php | 1 + resources/views/character/images.blade.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Characters/CharacterController.php b/app/Http/Controllers/Characters/CharacterController.php index 2ab72e9826..4925f19641 100644 --- a/app/Http/Controllers/Characters/CharacterController.php +++ b/app/Http/Controllers/Characters/CharacterController.php @@ -133,6 +133,7 @@ public function postEditCharacterProfile(Request $request, CharacterManager $ser public function getCharacterImages($slug) { return view('character.images', [ + 'user' => Auth::check() ? Auth::user() : null, 'character' => $this->character, ]); } diff --git a/resources/views/character/images.blade.php b/resources/views/character/images.blade.php index 047bce681d..65da4d4030 100644 --- a/resources/views/character/images.blade.php +++ b/resources/views/character/images.blade.php @@ -10,7 +10,7 @@ @include('character._header', ['character' => $character])
    - @foreach($character->images(Auth::check() ? Auth::user() : null)->with('features.feature')->with('species')->with('rarity')->get() as $image) + @foreach($character->images($user)->with('features.feature')->with('species')->with('rarity')->get() as $image)
    @@ -32,7 +32,7 @@