diff --git a/app/Providers/ViewServiceProvider.php b/app/Providers/ViewServiceProvider.php index 722a0e16..d4a56b45 100644 --- a/app/Providers/ViewServiceProvider.php +++ b/app/Providers/ViewServiceProvider.php @@ -11,7 +11,12 @@ class ViewServiceProvider extends ServiceProvider { public function boot(Webpack $webpack) { - View::composer(['home', '*.base', 'shared.header'], function ($view) { + View::composer([ + 'home', + '*.base', + '*.master', + 'shared.header' + ], function ($view) { $lightColors = ['light', 'warning', 'white', 'orange']; $color = option('navbar_color'); $view->with([ diff --git a/resources/views/admin/master.blade.php b/resources/views/admin/master.blade.php index 1fc8bdc8..3a96eb78 100644 --- a/resources/views/admin/master.blade.php +++ b/resources/views/admin/master.blade.php @@ -11,9 +11,7 @@ @include('shared.header') @include('shared.sidebar', ['scope' => 'admin']) @yield('content') - + @include('shared.footer') @include('shared.foot') diff --git a/resources/views/user/master.blade.php b/resources/views/user/master.blade.php index bbcd5b10..4790767b 100644 --- a/resources/views/user/master.blade.php +++ b/resources/views/user/master.blade.php @@ -11,9 +11,7 @@ @include('shared.header') @include('shared.sidebar', ['scope' => 'user']) @yield('content') - + @include('shared.footer') @include('shared.foot')