From 23d4d974ca9b02c38e8125d99a6bbfd7bec58a1f Mon Sep 17 00:00:00 2001 From: ilestis Date: Thu, 8 Aug 2024 18:27:57 +0000 Subject: [PATCH] Fix styling --- app/Http/Controllers/Crud/BookmarkController.php | 6 +++--- app/Models/Bookmark.php | 4 ++-- app/Models/Campaign.php | 2 +- app/Models/Image.php | 4 ++-- app/Models/MapMarker.php | 1 - app/Models/UserSetting.php | 1 - app/Renderers/CalendarRenderer.php | 1 - app/Services/Entity/Connections/MapService.php | 1 - app/Services/Entity/Connections/RelatedService.php | 1 - 9 files changed, 8 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/Crud/BookmarkController.php b/app/Http/Controllers/Crud/BookmarkController.php index d0833a68e..2ca4eae67 100644 --- a/app/Http/Controllers/Crud/BookmarkController.php +++ b/app/Http/Controllers/Crud/BookmarkController.php @@ -106,9 +106,9 @@ public function update(StoreBookmark $request, Campaign $campaign, Bookmark $boo $link = '' . $bookmark->name . ''; $success = __('general.success.updated', [ 'name' => $link diff --git a/app/Models/Bookmark.php b/app/Models/Bookmark.php index 0b7302ccb..7972d46db 100644 --- a/app/Models/Bookmark.php +++ b/app/Models/Bookmark.php @@ -53,13 +53,13 @@ class Bookmark extends Model use HasCampaign; use HasFactory; use HasFilters; + use LastSync; + use Orderable; use Privatable; use Sanitizable; use Searchable; use Sortable; - use Orderable; use Taggable; - use LastSync; protected $fillable = [ 'campaign_id', diff --git a/app/Models/Campaign.php b/app/Models/Campaign.php index bf5521890..f88147c6a 100644 --- a/app/Models/Campaign.php +++ b/app/Models/Campaign.php @@ -407,7 +407,7 @@ public function hasPluginTheme(): bool */ public function getDefaultVisibilityAttribute(): mixed { - return Arr::get($this->settings, 'default_visibility', 'all'); + return Arr::get($this->settings, 'default_visibility', 'all'); } /** diff --git a/app/Models/Image.php b/app/Models/Image.php index bf3ff6e92..c6b7f8a50 100644 --- a/app/Models/Image.php +++ b/app/Models/Image.php @@ -130,7 +130,7 @@ public function mentions(): HasMany return $this->hasMany(ImageMention::class, 'image_id', 'id') ->with('entity') ->with('post') - ; + ; } public function inEntities(): array @@ -244,7 +244,7 @@ public function scopeDefaultOrder(Builder $query): Builder ->orderBy('is_folder', 'desc') ->orderBy('updated_at', 'desc') ->orderBy('name', 'asc') - ; + ; } /** diff --git a/app/Models/MapMarker.php b/app/Models/MapMarker.php index 653ae2615..d96d004ed 100644 --- a/app/Models/MapMarker.php +++ b/app/Models/MapMarker.php @@ -294,7 +294,6 @@ protected function labelMarker(): string /** * Generate the marker's popup that is usually opened on hover - * @return ?string */ protected function popup(): ?string { diff --git a/app/Models/UserSetting.php b/app/Models/UserSetting.php index be149701a..f3a5515aa 100644 --- a/app/Models/UserSetting.php +++ b/app/Models/UserSetting.php @@ -4,7 +4,6 @@ use App\User; use Illuminate\Support\Arr; -use Illuminate\Support\Collection; use Stevebauman\Purify\Facades\Purify; /** diff --git a/app/Renderers/CalendarRenderer.php b/app/Renderers/CalendarRenderer.php index 138d75c52..9ff848d06 100644 --- a/app/Renderers/CalendarRenderer.php +++ b/app/Renderers/CalendarRenderer.php @@ -1025,7 +1025,6 @@ protected function setMonth(int $month): self /** * Split the date into segments. Handle negative years - * @return array */ protected function splitDate(string $date): array { diff --git a/app/Services/Entity/Connections/MapService.php b/app/Services/Entity/Connections/MapService.php index 065b89b98..89b471d6e 100644 --- a/app/Services/Entity/Connections/MapService.php +++ b/app/Services/Entity/Connections/MapService.php @@ -24,7 +24,6 @@ use App\Traits\CampaignAware; use App\Traits\EntityAware; use Illuminate\Support\Arr; -use Illuminate\Support\Str; class MapService { diff --git a/app/Services/Entity/Connections/RelatedService.php b/app/Services/Entity/Connections/RelatedService.php index c5d56edc8..e2a02c143 100644 --- a/app/Services/Entity/Connections/RelatedService.php +++ b/app/Services/Entity/Connections/RelatedService.php @@ -5,7 +5,6 @@ use App\Models\Character; use App\Models\Conversation; use App\Models\Entity; -use App\Models\Item; use App\Models\Journal; use App\Models\Location; use App\Models\Map;