diff --git a/app/Jobs/Emails/SubscriptionCancelEmailJob.php b/app/Jobs/Emails/SubscriptionCancelEmailJob.php index e047a4db9c..d2336e89cb 100644 --- a/app/Jobs/Emails/SubscriptionCancelEmailJob.php +++ b/app/Jobs/Emails/SubscriptionCancelEmailJob.php @@ -20,7 +20,7 @@ class SubscriptionCancelEmailJob implements ShouldQueue use Queueable; use SerializesModels; - /** @var int */ + /** */ public int $userId; /** @var string */ diff --git a/app/Models/CharacterRace.php b/app/Models/CharacterRace.php index 1770503492..6017ad56d4 100644 --- a/app/Models/CharacterRace.php +++ b/app/Models/CharacterRace.php @@ -37,7 +37,8 @@ public function race() return $this->belongsTo(Race::class); } - public function getCharacterRacesAttribute() { + public function getCharacterRacesAttribute() + { return $this->character->races; } } diff --git a/app/View/Components/Grid.php b/app/View/Components/Grid.php index dd9986c9ca..9a4424dc7e 100644 --- a/app/View/Components/Grid.php +++ b/app/View/Components/Grid.php @@ -8,7 +8,6 @@ class Grid extends Component { - /** * Create a new component instance. */ diff --git a/config/app.php b/config/app.php index 955850b13a..76db5e47c1 100644 --- a/config/app.php +++ b/config/app.php @@ -166,6 +166,14 @@ */ 'default_country' => env('DEFAULT_COUNTRY', 'CH'), + /** + * Leaflet version. + */ + + 'leaflet_source' => env('LEAFLET_SOURCE', '@1.9.4'), + 'leaflet_css' => env('LEAFLET_CSS', 'sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY='), + 'leaflet_js' => env('LEAFLET_JS', 'sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo='), + /* |-------------------------------------------------------------------------- | Autoloaded Service Providers diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index a3ed61087b..cb6d6413e9 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -87,7 +87,7 @@ @vite('resources/js/dashboard.js') @if ($hasMap) - + @endif @@ -95,7 +95,7 @@ @section('styles') @if ($hasMap) - + @endif @vite([ diff --git a/resources/views/layouts/map.blade.php b/resources/views/layouts/map.blade.php index fc2e8ad21c..43cefab823 100644 --- a/resources/views/layouts/map.blade.php +++ b/resources/views/layouts/map.blade.php @@ -37,7 +37,7 @@ 'resources/sass/map-v3.scss', ]) @if (!config('fontawesome.kit'))@endif - + @if (!empty($themeOverride) && in_array($themeOverride, ['dark', 'midnight', 'base'])) @php $specificTheme = $themeOverride; @endphp @if($themeOverride != 'base') @@ -152,7 +152,7 @@ @endif - + diff --git a/resources/views/maps/form/_markers.blade.php b/resources/views/maps/form/_markers.blade.php index f70fbe4dd7..3d31484228 100644 --- a/resources/views/maps/form/_markers.blade.php +++ b/resources/views/maps/form/_markers.blade.php @@ -25,7 +25,7 @@ @section('scripts') @parent - + @@ -91,7 +91,7 @@ @section('styles') @parent - + @vite('resources/sass/map-v3.scss')