From 79a96ec6d8235d50164a5f59c092a5b69c33755d Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Sun, 15 Dec 2019 19:04:30 +0800 Subject: [PATCH] Add grid for status page --- app/Http/Controllers/AdminController.php | 18 ++++++++- resources/views/admin/status.twig | 39 +------------------ .../views/admin/widgets/status/info.twig | 33 ++++++++++++++++ 3 files changed, 51 insertions(+), 39 deletions(-) create mode 100644 resources/views/admin/widgets/status/info.twig diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 7e7cd35d..49c36f49 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -6,6 +6,7 @@ use App\Models\Player; use App\Models\Texture; use App\Models\User; use App\Notifications; +use App\Services\Filter; use App\Services\OptionForm; use App\Services\PluginManager; use Auth; @@ -406,7 +407,8 @@ class AdminController extends Controller public function status( Request $request, PluginManager $plugins, - Filesystem $filesystem + Filesystem $filesystem, + Filter $filter ) { $db = get_db_config(); $enabledPlugins = $plugins->getEnabledPlugins()->map(function ($plugin) { @@ -421,7 +423,21 @@ class AdminController extends Controller $commit = $process->isSuccessful() ? trim($process->getOutput()) : ''; } + $grid = [ + 'layout' => [ + ['md-6', 'md-6'] + ], + 'widgets' => [ + [ + ['admin.widgets.status.info'], + [] + ] + ] + ]; + $grid = $filter->apply('grid:admin.status', $grid); + return view('admin.status') + ->with('grid', $grid) ->with('detail', [ 'bs' => [ 'version' => config('app.version'), diff --git a/resources/views/admin/status.twig b/resources/views/admin/status.twig index 6832c441..1caefb1e 100644 --- a/resources/views/admin/status.twig +++ b/resources/views/admin/status.twig @@ -3,42 +3,5 @@ {% block title %}{{ trans('general.status') }}{% endblock %} {% block content %} -
-
-
-
-

{{ trans('admin.status.info') }}

-
-
- - - {% for category, info in detail %} - - - - {% for key, value in info %} - - - - - {% endfor %} - {% endfor %} - - - - {% for plugin in plugins %} - - - - - {% endfor %} - -
{{ trans("admin.status.#{category}.name") }}
{{ trans("admin.status.#{category}.#{key}") }}{{ value }}
- {{ trans('admin.status.plugins', {amount: plugins|length}) }} -
{{ plugin.title }}{{ plugin.version }}
-
-
-
-
-
+ {{ include('shared.grid') }} {% endblock %} diff --git a/resources/views/admin/widgets/status/info.twig b/resources/views/admin/widgets/status/info.twig new file mode 100644 index 00000000..c44776d4 --- /dev/null +++ b/resources/views/admin/widgets/status/info.twig @@ -0,0 +1,33 @@ +
+
+

{{ trans('admin.status.info') }}

+
+
+ + + {% for category, info in detail %} + + + + {% for key, value in info %} + + + + + {% endfor %} + {% endfor %} + + + + {% for plugin in plugins %} + + + + + {% endfor %} + +
{{ trans("admin.status.#{category}.name") }}
{{ trans("admin.status.#{category}.#{key}") }}{{ value }}
+ {{ trans('admin.status.plugins', {amount: plugins|length}) }} +
{{ plugin.title }}{{ plugin.version }}
+
+