From 8bb617623e6216e936a7133d6a7d26a24fb42a97 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Wed, 28 Aug 2019 11:39:00 +0800 Subject: [PATCH] Add environment status page --- app/Http/Controllers/AdminController.php | 9 +++++++++ config/menu.php | 1 + resources/lang/en/general.yml | 2 ++ resources/lang/zh_CN/general.yml | 2 ++ resources/views/admin/status.blade.php | 14 ++++++++++++++ routes/web.php | 2 ++ 6 files changed, 30 insertions(+) create mode 100644 resources/views/admin/status.blade.php diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 0742caa9..086bd70f 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -361,6 +361,15 @@ class AdminController extends Controller ->with('forms', compact('resources', 'redis', 'cache')); } + public function status(Request $request) + { + return view('admin.status', [ + 'phpVersion' => PHP_VERSION, + 'webSoftware' => $request->server('SERVER_SOFTWARE', trans('general.unknown')), + 'os' => sprintf('%s %s %s', php_uname('s'), php_uname('r'), php_uname('m')), + ]); + } + public function getUserData(Request $request, User $users) { $isSingleUser = $request->has('uid'); diff --git a/config/menu.php b/config/menu.php index aa028843..fe753329 100644 --- a/config/menu.php +++ b/config/menu.php @@ -32,6 +32,7 @@ $menu['admin'] = [ ['title' => 'general.score-options', 'link' => 'admin/score', 'icon' => 'fa-credit-card'], ['title' => 'general.options', 'link' => 'admin/options', 'icon' => 'fa-cog'], ['title' => 'general.res-options', 'link' => 'admin/resource', 'icon' => 'fa-atom'], + ['title' => 'general.status', 'link' => 'admin/status', 'icon' => 'fa-battery-three-quarters'], ['title' => 'general.plugin-market', 'link' => 'admin/plugins/market', 'icon' => 'fa-shopping-bag'], ['title' => 'general.plugin-manage', 'link' => 'admin/plugins/manage', 'icon' => 'fa-plug'], ['title' => 'general.plugin-configs', 'id' => 'plugin-configs', 'icon' => 'fa-cogs', 'children' => []], diff --git a/resources/lang/en/general.yml b/resources/lang/en/general.yml index 11f1c586..699cc632 100644 --- a/resources/lang/en/general.yml +++ b/resources/lang/en/general.yml @@ -25,6 +25,7 @@ customize: Customize options: Options score-options: Score Options res-options: Resource Options +status: Status check-update: Check Update download-update: Download Updates close: Close @@ -43,6 +44,7 @@ reset: Reset submit: Submit cancel: Cancel op-success: Operated successfully. +unknown: Unknown notice: Notice switch-2d-preview: Switch to 2D preview diff --git a/resources/lang/zh_CN/general.yml b/resources/lang/zh_CN/general.yml index 94c74726..3470f93c 100644 --- a/resources/lang/zh_CN/general.yml +++ b/resources/lang/zh_CN/general.yml @@ -25,6 +25,7 @@ customize: 个性化 options: 站点配置 score-options: 积分配置 res-options: 资源配置 +status: 运行状态 check-update: 检查更新 download-update: 下载更新 close: 关闭 @@ -43,6 +44,7 @@ reset: 重置 submit: 提交 cancel: 取消 op-success: 操作成功 +unknown: 未知 notice: 提示 switch-2d-preview: 切换 2D 预览 diff --git a/resources/views/admin/status.blade.php b/resources/views/admin/status.blade.php new file mode 100644 index 00000000..11f3cf8c --- /dev/null +++ b/resources/views/admin/status.blade.php @@ -0,0 +1,14 @@ +@extends('admin.master') + +@section('title', trans('general.status')) + +@section('content') +
+
+

@lang('general.status')

+
+ +
+
+
+@endsection diff --git a/routes/web.php b/routes/web.php index 5efc2ff8..dea11c03 100644 --- a/routes/web.php +++ b/routes/web.php @@ -123,6 +123,8 @@ Route::group(['middleware' => ['authorize', 'admin'], 'prefix' => 'admin'], func Route::any('/options', 'AdminController@options'); Route::any('/resource', 'AdminController@resource'); + Route::get('/status', 'AdminController@status'); + Route::view('/users', 'admin.users'); Route::post('/users', 'AdminController@userAjaxHandler'); Route::any('/user-data', 'AdminController@getUserData');