Skip to content

Commit

Permalink
Fixed config
Browse files Browse the repository at this point in the history
  • Loading branch information
spitfire305 committed Jul 1, 2024
1 parent fbf7078 commit 0209564
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions resources/views/home.blade.php
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{{ config('app.leaflet_source') }}/dist/leaflet.js" integrity="{{ config('app.leaflet_js') }}" 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{{ config('app.leaflet_source') }}/dist/leaflet.css" integrity="{{ config('app.leaflet_css') }}" 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
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{{ config('app.leaflet_source') }}/dist/leaflet.css" integrity="{{ config('app.leaflet_css') }}" 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{{ config('app.leaflet_source') }}/dist/leaflet.js" integrity="{{ config('app.leaflet_js') }}" 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
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{{ config('app.leaflet_source') }}/dist/leaflet.js" integrity="{{ config('app.leaflet_js') }}" 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{{ config('app.leaflet_source') }}/dist/leaflet.css" integrity="{{ config('app.leaflet_css') }}" 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
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{{ config('app.leaflet_source') }}/dist/leaflet.js" integrity="{{ config('app.leaflet_js') }}" 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{{ config('app.leaflet_source') }}/dist/leaflet.css" integrity="{{ config('app.leaflet_css') }}" 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
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{{ config('app.leaflet_source') }}/dist/leaflet.js" integrity="{{ config('app.leaflet_js') }}" 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

0 comments on commit 0209564

Please sign in to comment.