From 6b6cec7f43e767dd8a59fa8d3c2aaef156547a17 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Sun, 15 Dec 2019 21:04:20 +0800 Subject: [PATCH] Add grid for admin dashboard --- app/Http/Controllers/AdminController.php | 27 +++- resources/views/admin/index.twig | 131 +----------------- .../views/admin/widgets/dashboard/chart.twig | 6 + .../admin/widgets/dashboard/notification.twig | 61 ++++++++ .../views/admin/widgets/dashboard/usage.twig | 55 ++++++++ 5 files changed, 145 insertions(+), 135 deletions(-) create mode 100644 resources/views/admin/widgets/dashboard/chart.twig create mode 100644 resources/views/admin/widgets/dashboard/notification.twig create mode 100644 resources/views/admin/widgets/dashboard/usage.twig diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 49c36f49..510ff347 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -23,9 +23,26 @@ use Option; class AdminController extends Controller { - public function index() + public function index(Filter $filter) { + $grid = [ + 'layout' => [ + ['md-6', 'md-6'], + ], + 'widgets' => [ + [ + [ + 'admin.widgets.dashboard.usage', + 'admin.widgets.dashboard.notification', + ], + ['admin.widgets.dashboard.chart'], + ], + ], + ]; + $grid = $filter->apply('grid:admin.index', $grid); + return view('admin.index', [ + 'grid' => $grid, 'sum' => [ 'users' => User::count(), 'players' => Player::count(), @@ -425,14 +442,14 @@ class AdminController extends Controller $grid = [ 'layout' => [ - ['md-6', 'md-6'] + ['md-6', 'md-6'], ], 'widgets' => [ [ ['admin.widgets.status.info'], - [] - ] - ] + [], + ], + ], ]; $grid = $filter->apply('grid:admin.status', $grid); diff --git a/resources/views/admin/index.twig b/resources/views/admin/index.twig index 08cdf8b4..cdf93ce7 100644 --- a/resources/views/admin/index.twig +++ b/resources/views/admin/index.twig @@ -3,134 +3,5 @@ {% block title %}{{ trans('general.dashboard') }}{% endblock %} {% block content %} -
-
-
-
-
-
-

{{ sum.users }}

-

{{ trans('admin.index.total-users') }}

-
-
- - {{ trans('general.user-manage') }}  - - -
-
- -
-
-
-

{{ sum.players }}

-

{{ trans('admin.index.total-players') }}

-
-
- - {{ trans('general.player-manage') }}  - - -
-
-
- -
-
-
-
-

{{ sum.textures }}

-

{{ trans('admin.index.total-textures') }}

-
-
-
-
- -
-
-
- {% if sum.storage > 1024 %} -

{{ (sum.storage / 1024)|round(1) }}MB

- {% else %} -

{{ sum.storage }}KB

- {% endif %} -

{{ trans('admin.index.disk-usage') }}

-
-
-
-
-
- -
-
-

{{ trans('admin.notifications.send.title') }}

-
-
- {{ csrf_field() }} -
- {% if errors.any %} -
{{ errors.first }}
- {% endif %} - {% set sent_result = session_pull('sentResult') %} - {% if sent_result %} -
{{ sent_result }}
- {% endif %} -
- -
- -
-
- -
-
- -
-
- -
-
-
- - -
-
- - -
-
- -
-
-
- -
-
-
-

{{ trans('admin.index.overview') }}

-
-
-
-
-
+ {{ include('shared.grid') }} {% endblock %} diff --git a/resources/views/admin/widgets/dashboard/chart.twig b/resources/views/admin/widgets/dashboard/chart.twig new file mode 100644 index 00000000..e8f2c22c --- /dev/null +++ b/resources/views/admin/widgets/dashboard/chart.twig @@ -0,0 +1,6 @@ +
+
+

{{ trans('admin.index.overview') }}

+
+
+
diff --git a/resources/views/admin/widgets/dashboard/notification.twig b/resources/views/admin/widgets/dashboard/notification.twig new file mode 100644 index 00000000..4ea82338 --- /dev/null +++ b/resources/views/admin/widgets/dashboard/notification.twig @@ -0,0 +1,61 @@ +
+
+

{{ trans('admin.notifications.send.title') }}

+
+
+ {{ csrf_field() }} +
+ {% if errors.any %} +
{{ errors.first }}
+ {% endif %} + {% set sent_result = session_pull('sentResult') %} + {% if sent_result %} +
{{ sent_result }}
+ {% endif %} +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + +
+
+ + +
+
+ +
+
diff --git a/resources/views/admin/widgets/dashboard/usage.twig b/resources/views/admin/widgets/dashboard/usage.twig new file mode 100644 index 00000000..d4926452 --- /dev/null +++ b/resources/views/admin/widgets/dashboard/usage.twig @@ -0,0 +1,55 @@ +
+
+
+
+

{{ sum.users }}

+

{{ trans('admin.index.total-users') }}

+
+
+ + {{ trans('general.user-manage') }}  + + +
+
+ +
+
+
+

{{ sum.players }}

+

{{ trans('admin.index.total-players') }}

+
+
+ + {{ trans('general.player-manage') }}  + + +
+
+
+ +
+
+
+
+

{{ sum.textures }}

+

{{ trans('admin.index.total-textures') }}

+
+
+
+
+ +
+
+
+ {% if sum.storage > 1024 %} +

{{ (sum.storage / 1024)|round(1) }}MB

+ {% else %} +

{{ sum.storage }}KB

+ {% endif %} +

{{ trans('admin.index.disk-usage') }}

+
+
+
+
+