Fall back on default layout if no page is present (yet)

This commit is contained in:
James Cole 2023-07-23 08:33:37 +02:00
parent 68da1a7039
commit f1173263b6
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
3 changed files with 6 additions and 4 deletions

View File

@ -21,9 +21,11 @@
declare(strict_types=1); declare(strict_types=1);
$path = realpath(base_path('resources/views')); $paths = [realpath(base_path('resources/views'))];
if ('v2' === env('FIREFLY_III_LAYOUT')) { if ('v2' === env('FIREFLY_III_LAYOUT')) {
$path = realpath(base_path('resources/views/v2')); $paths = [
realpath(base_path('resources/views/v2')),
realpath(base_path('resources/views'))];
} }
@ -39,7 +41,7 @@ return [
| |
*/ */
'paths' => [$path,], 'paths' => $paths,
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

View File

@ -1,4 +1,4 @@
@extends('layout.default') @extends('layout.v2')
@section('vite') @section('vite')
@vite(['resources/assets/v2/sass/app.scss', 'resources/assets/v2/dashboard.js']) @vite(['resources/assets/v2/sass/app.scss', 'resources/assets/v2/dashboard.js'])
@endsection @endsection