From f1173263b6453c8b83ac76ef4f3c60792f925d20 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 23 Jul 2023 08:33:37 +0200 Subject: [PATCH] Fall back on default layout if no page is present (yet) --- config/view.php | 8 +++++--- resources/views/v2/index.blade.php | 2 +- .../views/v2/layout/{default.blade.php => v2.blade.php} | 0 3 files changed, 6 insertions(+), 4 deletions(-) rename resources/views/v2/layout/{default.blade.php => v2.blade.php} (100%) diff --git a/config/view.php b/config/view.php index d38cd36ef2..20ff1589d5 100644 --- a/config/view.php +++ b/config/view.php @@ -21,9 +21,11 @@ declare(strict_types=1); -$path = realpath(base_path('resources/views')); +$paths = [realpath(base_path('resources/views'))]; 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, /* |-------------------------------------------------------------------------- diff --git a/resources/views/v2/index.blade.php b/resources/views/v2/index.blade.php index 6217e68a46..d2a3e9d229 100644 --- a/resources/views/v2/index.blade.php +++ b/resources/views/v2/index.blade.php @@ -1,4 +1,4 @@ -@extends('layout.default') +@extends('layout.v2') @section('vite') @vite(['resources/assets/v2/sass/app.scss', 'resources/assets/v2/dashboard.js']) @endsection diff --git a/resources/views/v2/layout/default.blade.php b/resources/views/v2/layout/v2.blade.php similarity index 100% rename from resources/views/v2/layout/default.blade.php rename to resources/views/v2/layout/v2.blade.php