zhangyuheng/blessing-skin-server
1
0
Fork 0
forked from mirror/blessing-skin-server
Code Pull Requests Activity

Fix "*.master" templates

Browse Source
This commit is contained in:
Pig Fang 2019-12-07 16:39:04 +08:00
parent 61eea2b980
commit 6fc099bb34
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Providers/ViewServiceProvider.php
View File

@ -11,7 +11,12 @@ class ViewServiceProvider extends ServiceProvider
{ {
public function boot(Webpack $webpack) 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']; $lightColors = ['light', 'warning', 'white', 'orange'];
$color = option('navbar_color'); $color = option('navbar_color');
$view->with([ $view->with([

2
resources/views/admin/master.blade.php
View File

@ -11,9 +11,7 @@
@include('shared.header') @include('shared.header')
@include('shared.sidebar', ['scope' => 'admin']) @include('shared.sidebar', ['scope' => 'admin'])
@yield('content') @yield('content')
<footer class="main-footer">
@include('shared.footer') @include('shared.footer')
</footer>
</div> </div>
@include('shared.foot') @include('shared.foot')

2
resources/views/user/master.blade.php
View File

@ -11,9 +11,7 @@
@include('shared.header') @include('shared.header')
@include('shared.sidebar', ['scope' => 'user']) @include('shared.sidebar', ['scope' => 'user'])
@yield('content') @yield('content')
<footer class="main-footer">
@include('shared.footer') @include('shared.footer')
</footer>
</div> </div>
@include('shared.foot') @include('shared.foot')