Skip to content

Commit 0de66e3

Browse files
authored
refactor: page layout exclude livewire if inertia (#655)
1 parent 54fc423 commit 0de66e3

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

resources/views/pages/includes/layout-body.blade.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
'disableCookieOutsideClick' => false,
88
'overlayCookieCrossButton' => false,
99
'cookieContactUrl' => '/contact',
10+
'usesLivewire' => true,
1011
])
1112

1213
@aware([
@@ -39,9 +40,11 @@
3940
<x-ark-footer />
4041
@endif
4142

42-
@livewireScriptConfig
43+
@if ($usesLivewire)
44+
@livewireScriptConfig
4345

44-
@livewire('toast')
46+
@livewire('toast')
47+
@endif
4548

4649
{{ $includes }}
4750

resources/views/pages/includes/layout-head.blade.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
'themeColor',
55
'defaultName' => config('app.name', 'ARK'),
66
'viewport' => 'width=device-width, initial-scale=1.0',
7-
'inertia' => false,
7+
'usesLivewire' => true,
8+
'usesInertia' => false,
89
])
910

1011
<head>
@@ -14,7 +15,7 @@
1415
<!-- CSRF Token -->
1516
<meta name="csrf-token" content="{{ csrf_token() }}">
1617

17-
<title{!! $inertia ? ' inertia' : '' !!}>{!! trim(View::yieldContent('title', $defaultName)) !!}</title>
18+
<title{!! $usesInertia ? ' inertia' : '' !!}>{!! trim(View::yieldContent('title', $defaultName)) !!}</title>
1819

1920
@if (config('ui.dark-mode.enabled') === true)
2021
<x-ark-dark-theme-script />
@@ -47,7 +48,10 @@
4748

4849
<!-- Styles -->
4950
@vite('resources/css/app.css')
50-
@livewireStyles
51+
52+
@if ($usesLivewire)
53+
@livewireStyles
54+
@endif
5155

5256
@if (config('tracking.analytics.key') && Visitor::isEuropean())
5357
<link href="https://cdn.jsdelivr.net/gh/orestbida/cookieconsent@v2.5.1/dist/cookieconsent.css" rel="stylesheet">

0 commit comments

Comments
 (0)