From 86bed61a0e1ecff18c288309f54fa6d75f1478b0 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Sun, 28 Apr 2019 09:28:53 +0800 Subject: [PATCH] Simplify blades --- resources/views/admin/market.blade.php | 22 ++------------ resources/views/admin/players.blade.php | 22 ++------------ resources/views/admin/plugins.blade.php | 22 ++------------ resources/views/admin/reports.blade.php | 14 ++------- resources/views/common/skeleton.blade.php | 14 +++++++++ resources/views/user/oauth.blade.php | 14 ++------- resources/views/user/player.blade.php | 29 ++++-------------- resources/views/user/profile.blade.php | 36 +++++++---------------- resources/views/user/report.blade.php | 14 ++------- 9 files changed, 41 insertions(+), 146 deletions(-) create mode 100644 resources/views/common/skeleton.blade.php diff --git a/resources/views/admin/market.blade.php b/resources/views/admin/market.blade.php index 333ef15a..6b1a0236 100644 --- a/resources/views/admin/market.blade.php +++ b/resources/views/admin/market.blade.php @@ -1,20 +1,2 @@ -@extends('admin.master') - -@section('title', trans('general.plugin-market')) - -@section('content') - - -
- -
-

- @lang('general.plugin-market') -

-
- - -
-
- -@endsection +@component('common.skeleton', ['parent' => 'admin', 'title' => trans('general.plugin-market')]) +@endcomponent diff --git a/resources/views/admin/players.blade.php b/resources/views/admin/players.blade.php index ec0b7374..d9d5f996 100644 --- a/resources/views/admin/players.blade.php +++ b/resources/views/admin/players.blade.php @@ -1,20 +1,2 @@ -@extends('admin.master') - -@section('title', trans('general.player-manage')) - -@section('content') - - -
- -
-

- @lang('general.player-manage') -

-
- - -
-
- -@endsection +@component('common.skeleton', ['parent' => 'admin', 'title' => trans('general.player-manage')]) +@endcomponent diff --git a/resources/views/admin/plugins.blade.php b/resources/views/admin/plugins.blade.php index 7b244e3c..683d0492 100644 --- a/resources/views/admin/plugins.blade.php +++ b/resources/views/admin/plugins.blade.php @@ -1,20 +1,2 @@ -@extends('admin.master') - -@section('title', trans('general.plugin-manage')) - -@section('content') - - -
- -
-

- @lang('general.plugin-manage') -

-
- - -
-
- -@endsection +@component('common.skeleton', ['parent' => 'admin', 'title' => trans('general.plugin-manage')]) +@endcomponent diff --git a/resources/views/admin/reports.blade.php b/resources/views/admin/reports.blade.php index 2e455124..f50e41ce 100644 --- a/resources/views/admin/reports.blade.php +++ b/resources/views/admin/reports.blade.php @@ -1,12 +1,2 @@ -@extends('admin.master') - -@section('title', trans('general.report-manage')) - -@section('content') -
-
-

@lang('general.report-manage')

-
-
-
-@endsection +@component('common.skeleton', ['parent' => 'admin', 'title' => trans('general.report-manage')]) +@endcomponent diff --git a/resources/views/common/skeleton.blade.php b/resources/views/common/skeleton.blade.php new file mode 100644 index 00000000..0ec38144 --- /dev/null +++ b/resources/views/common/skeleton.blade.php @@ -0,0 +1,14 @@ +@extends("$parent.master") + +@section('title', $title) + +@section('content') +
+
+

{{ $title }}

+
+
+
+ +{{ $bottom ?? '' }} +@endsection diff --git a/resources/views/user/oauth.blade.php b/resources/views/user/oauth.blade.php index 3072f00e..5a2475f9 100644 --- a/resources/views/user/oauth.blade.php +++ b/resources/views/user/oauth.blade.php @@ -1,12 +1,2 @@ -@extends('user.master') - -@section('title', trans('general.oauth-manage')) - -@section('content') -
-
-

@lang('general.oauth-manage')

-
-
-
-@endsection +@component('common.skeleton', ['parent' => 'user', 'title' => trans('general.oauth-manage')]) +@endcomponent diff --git a/resources/views/user/player.blade.php b/resources/views/user/player.blade.php index c03a37d1..575a3cc3 100644 --- a/resources/views/user/player.blade.php +++ b/resources/views/user/player.blade.php @@ -1,24 +1,5 @@ -@extends('user.master') - -@section('title', trans('general.player-manage')) - -@section('content') - - -
- -
-

- @lang('general.player-manage') -

-
- - -
-
- - - -@endsection +@component('common.skeleton', ['parent' => 'user', 'title' => trans('general.player-manage')]) + @slot('bottom') + + @endslot +@endcomponent diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php index 600ed153..69fa013d 100644 --- a/resources/views/user/profile.blade.php +++ b/resources/views/user/profile.blade.php @@ -1,26 +1,10 @@ -@extends('user.master') - -@section('title', trans('general.profile')) - -@section('content') - - -
- -
-

- @lang('general.profile') -

-
- - -
-
- - -@endsection +@component('common.skeleton', ['parent' => 'user', 'title' => trans('general.profile')]) + @slot('bottom') + + @endslot +@endcomponent diff --git a/resources/views/user/report.blade.php b/resources/views/user/report.blade.php index e7c63878..4fdbba8e 100644 --- a/resources/views/user/report.blade.php +++ b/resources/views/user/report.blade.php @@ -1,12 +1,2 @@ -@extends('user.master') - -@section('title', trans('general.my-reports')) - -@section('content') -
-
-

@lang('general.my-reports')

-
-
-
-@endsection +@component('common.skeleton', ['parent' => 'user', 'title' => trans('general.my-reports')]) +@endcomponent