Merge pull request #904 from owlchester/leaflet-update

Updated leaflet
owlchester · Jul 2, 2024 · fbb0d67 · fbb0d67
2 parents 95b8a73 + 0209564
commit fbb0d67
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 12 deletions.
diff --git 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
@@ -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
@@ -8,7 +8,6 @@
 
 class Grid extends Component
 {
-
     /**
      * Create a new component instance.
      */

diff --git 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
@@ -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([

diff --git 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'))<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')
@@ -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>

diff --git a/resources/views/maps/form/_markers.blade.php b/resources/views/maps/form/_markers.blade.php
@@ -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>
@@ -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>

diff --git a/resources/views/maps/markers/create.blade.php b/resources/views/maps/markers/create.blade.php
@@ -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',
     ])
@@ -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
diff --git a/resources/views/maps/markers/edit.blade.php b/resources/views/maps/markers/edit.blade.php
@@ -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>
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ @@
     class Grid extends Component
     {
         /**
          * Create a new component instance.
          */
@@ Expand Down @@