Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated leaflet #904

Merged
merged 4 commits into from
Jul 2, 2024
Merged

Updated leaflet #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df2dcfc
Updated leaflet
spitfire305 Jul 1, 2024
fc179eb
Fix
spitfire305 Jul 1, 2024
fbf7078
Fix styling
spitfire305 Jul 1, 2024
0209564
Fixed config
spitfire305 Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Jobs/Emails/SubscriptionCancelEmailJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class SubscriptionCancelEmailJob implements ShouldQueue
use Queueable;
use SerializesModels;

/** @var int */
/** */
public int $userId;

/** @var string */
Expand Down
3 changes: 2 additions & 1 deletion app/Models/CharacterRace.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
return $this->belongsTo(Race::class);
}

public function getCharacterRacesAttribute() {
public function getCharacterRacesAttribute()
{
return $this->character->races;

Check failure on line 42 in app/Models/CharacterRace.php

View workflow job for this annotation

GitHub Actions / PHP 8.3 

Access to an undefined property App\Models\CharacterRace::$character.
ilestis marked this conversation as resolved.
Show resolved Hide resolved
}
}
1 change: 0 additions & 1 deletion app/View/Components/Grid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

class Grid extends Component
{

/**
* Create a new component instance.
*/
Expand Down
8 changes: 8 additions & 0 deletions config/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions resources/views/home.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@
@vite('resources/js/dashboard.js')

@if ($hasMap)
<script src="https://unpkg.com/leaflet@1.9.2/dist/leaflet.js" integrity="sha256-o9N1jGDZrf5tS+Ft4gbIK7mYMipq9lqpVJ91xHSyKhg=" crossorigin=""></script>
<script src="{{ 'https://unpkg.com/leaflet@' . config('app.leaflet_source') . '/dist/leaflet.js' }}" integrity="{{ config('app.leaflet_js') }}" crossorigin=""></script>
<script src="{{ config('app.asset_url') }}/vendor/leaflet/leaflet.markercluster.js"></script>
<script src="{{ config('app.asset_url') }}/vendor/leaflet/leaflet.markercluster.layersupport.js"></script>
@endif
@endsection

@section('styles')
@if ($hasMap)
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.2/dist/leaflet.css" integrity="sha256-sA+zWATbFveLLNqWO2gtiw3HL/lh1giY/Inf1BJ0z14=" crossorigin="" />
<link rel="stylesheet" href="{{ 'https://unpkg.com/leaflet@' . config('app.leaflet_source') . '/dist/leaflet.css' }}" integrity="{{ config('app.leaflet_css') }}" crossorigin="" />
@endif

@vite([
Expand Down
4 changes: 2 additions & 2 deletions resources/views/layouts/map.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
'resources/sass/map-v3.scss',
])
@if (!config('fontawesome.kit'))<link href="/vendor/fontawesome/6.0.0/css/all.min.css" rel="stylesheet">@endif
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.2/dist/leaflet.css" integrity="sha256-sA+zWATbFveLLNqWO2gtiw3HL/lh1giY/Inf1BJ0z14=" crossorigin="" />
<link rel="stylesheet" href="{{ 'https://unpkg.com/leaflet@' . config('app.leaflet_source') . '/dist/leaflet.css' }}" integrity="{{ config('app.leaflet_css') }}" crossorigin="" />
@if (!empty($themeOverride) && in_array($themeOverride, ['dark', 'midnight', 'base']))
@php $specificTheme = $themeOverride; @endphp
@if($themeOverride != 'base')
Expand Down Expand Up @@ -152,7 +152,7 @@
<script src="https://kit.fontawesome.com/{{ config('fontawesome.kit') }}.js" crossorigin="anonymous"></script>
@endif
<!-- Make sure you put this AFTER Leaflet's CSS -->
<script src="https://unpkg.com/leaflet@1.9.2/dist/leaflet.js" integrity="sha256-o9N1jGDZrf5tS+Ft4gbIK7mYMipq9lqpVJ91xHSyKhg=" crossorigin=""></script>
<script src="{{ 'https://unpkg.com/leaflet@' . config('app.leaflet_source') . '/dist/leaflet.js' }}" integrity="{{ config('app.leaflet_js') }}" crossorigin=""></script>
<script src="{{ config('app.asset_url') }}/vendor/leaflet/leaflet.markercluster.js"></script>
<script src="{{ config('app.asset_url') }}/vendor/leaflet/leaflet.markercluster.layersupport.js"></script>
<script src="{{ config('app.asset_url') }}/vendor/leaflet/leaflet.zoomcss.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/maps/form/_markers.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
@section('scripts')
@parent
<!-- Make sure you put this AFTER Leaflet's CSS -->
<script src="https://unpkg.com/leaflet@1.9.2/dist/leaflet.js" integrity="sha256-o9N1jGDZrf5tS+Ft4gbIK7mYMipq9lqpVJ91xHSyKhg=" crossorigin=""></script>
<script src="{{ 'https://unpkg.com/leaflet@' . config('app.leaflet_source') . '/dist/leaflet.js' }}" integrity="{{ config('app.leaflet_js') }}" crossorigin=""></script>
<script src="{{ config('app.asset_url') }}/vendor/leaflet/leaflet.markercluster.js"></script>
<script src="{{ config('app.asset_url') }}/vendor/leaflet/leaflet.markercluster.layersupport.js"></script>
<script src="{{ config('app.asset_url') }}/vendor/leaflet/leaflet.path.drag.js"></script>
Expand Down Expand Up @@ -91,7 +91,7 @@

@section('styles')
@parent
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.2/dist/leaflet.css" integrity="sha256-sA+zWATbFveLLNqWO2gtiw3HL/lh1giY/Inf1BJ0z14=" crossorigin="" />
<link rel="stylesheet" href="{{ 'https://unpkg.com/leaflet@' . config('app.leaflet_source') . '/dist/leaflet.css' }}" integrity="{{ config('app.leaflet_css') }}" crossorigin="" />
@vite('resources/sass/map-v3.scss')

<style>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/maps/markers/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
@section('scripts')
@parent
<!-- Make sure you put this AFTER Leaflet's CSS -->
<script src="https://unpkg.com/leaflet@1.9.2/dist/leaflet.js" integrity="sha256-o9N1jGDZrf5tS+Ft4gbIK7mYMipq9lqpVJ91xHSyKhg=" crossorigin=""></script>
<script src="{{ 'https://unpkg.com/leaflet@' . config('app.leaflet_source') . '/dist/leaflet.js' }}" integrity="{{ config('app.leaflet_js') }}" crossorigin=""></script>
@vite([
'resources/js/location/map-v3.js',
])
Expand All @@ -73,6 +73,6 @@

@section('styles')
@parent
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.2/dist/leaflet.css" integrity="sha256-sA+zWATbFveLLNqWO2gtiw3HL/lh1giY/Inf1BJ0z14=" crossorigin="" />
<link rel="stylesheet" href="{{ 'https://unpkg.com/leaflet@' . config('app.leaflet_source') . '/dist/leaflet.css' }}" integrity="{{ config('app.leaflet_css') }}" crossorigin="" />
@vite('resources/sass/map-v3.scss')
@endsection
2 changes: 1 addition & 1 deletion resources/views/maps/markers/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
@section('scripts')
@parent
<!-- Make sure you put this AFTER Leaflet's CSS -->
<script src="https://unpkg.com/leaflet@1.9.2/dist/leaflet.js" integrity="sha256-o9N1jGDZrf5tS+Ft4gbIK7mYMipq9lqpVJ91xHSyKhg=" crossorigin=""></script>
<script src="{{ 'https://unpkg.com/leaflet@' . config('app.leaflet_source') . '/dist/leaflet.js' }}" integrity="{{ config('app.leaflet_js') }}" crossorigin=""></script>
<script src="{{ config('app.asset_url') }}/vendor/leaflet/leaflet.markercluster.js"></script>
<script src="{{ config('app.asset_url') }}/vendor/leaflet/leaflet.markercluster.layersupport.js"></script>
<script src="{{ config('app.asset_url') }}/vendor/leaflet/leaflet.path.drag.js"></script>
Expand Down
Loading