From b4c5874ddfd442de3b876997f74693a9d3ee1d9d Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Mon, 22 Aug 2022 16:06:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=BC=95=E5=AF=BC=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/EnvironmentController.php | 4 +- .../Installer/Controllers/FinalController.php | 4 +- .../Controllers/PermissionsController.php | 4 +- .../Controllers/RequirementsController.php | 4 +- .../Controllers/WelcomeController.php | 5 +- .../Installer/Views/layouts/master.blade.php | 41 +++++++-- beike/Installer/Views/permissions.blade.php | 63 ++++++++----- beike/Installer/Views/requirements.blade.php | 86 +++++++++++------- beike/Installer/Views/welcome.blade.php | 22 +++-- beike/Installer/assets/scss/_install-1.scss | 12 +++ beike/Installer/assets/scss/_steps.scss | 13 ++- beike/Installer/assets/scss/app.scss | 10 +- public/build/beike/admin/js/app.js | 18 ++-- .../beike/installer => install/css}/app.css | 24 ++++- public/install/image/install-1.png | Bin 0 -> 324289 bytes webpack.mix.js | 2 +- 16 files changed, 213 insertions(+), 99 deletions(-) create mode 100644 beike/Installer/assets/scss/_install-1.scss rename public/{build/beike/installer => install/css}/app.css (79%) create mode 100644 public/install/image/install-1.png diff --git a/beike/Installer/Controllers/EnvironmentController.php b/beike/Installer/Controllers/EnvironmentController.php index 6b66d13f..441c2f8e 100644 --- a/beike/Installer/Controllers/EnvironmentController.php +++ b/beike/Installer/Controllers/EnvironmentController.php @@ -32,7 +32,9 @@ class EnvironmentController extends Controller */ public function index() { - return view('installer::environment-wizard'); + $steps = 4; + + return view('installer::environment-wizard', compact('steps')); } /** diff --git a/beike/Installer/Controllers/FinalController.php b/beike/Installer/Controllers/FinalController.php index 046a5d6d..34d6adb1 100644 --- a/beike/Installer/Controllers/FinalController.php +++ b/beike/Installer/Controllers/FinalController.php @@ -26,6 +26,8 @@ class FinalController extends Controller event(new LaravelInstallerFinished); - return view('installer::finished', compact('finalMessages', 'finalStatusMessage', 'finalEnvFile')); + $steps = 5; + + return view('installer::finished', compact('finalMessages', 'finalStatusMessage', 'finalEnvFile', 'steps')); } } diff --git a/beike/Installer/Controllers/PermissionsController.php b/beike/Installer/Controllers/PermissionsController.php index 5c6bc1a2..1144509a 100644 --- a/beike/Installer/Controllers/PermissionsController.php +++ b/beike/Installer/Controllers/PermissionsController.php @@ -31,6 +31,8 @@ class PermissionsController extends Controller config('installer.permissions') ); - return view('installer::permissions', compact('permissions')); + $steps = 3; + + return view('installer::permissions', compact('permissions', 'steps')); } } diff --git a/beike/Installer/Controllers/RequirementsController.php b/beike/Installer/Controllers/RequirementsController.php index e606b9fa..377f5a06 100644 --- a/beike/Installer/Controllers/RequirementsController.php +++ b/beike/Installer/Controllers/RequirementsController.php @@ -34,6 +34,8 @@ class RequirementsController extends Controller config('installer.requirements') ); - return view('installer::requirements', compact('requirements', 'phpSupportInfo')); + $steps = 2; + + return view('installer::requirements', compact('requirements', 'phpSupportInfo', 'steps')); } } diff --git a/beike/Installer/Controllers/WelcomeController.php b/beike/Installer/Controllers/WelcomeController.php index 1a1ecdc9..70124355 100644 --- a/beike/Installer/Controllers/WelcomeController.php +++ b/beike/Installer/Controllers/WelcomeController.php @@ -20,6 +20,9 @@ class WelcomeController extends Controller if (installed()) { exit('Already installed'); } - return view('installer::welcome'); + + $steps = 1; + + return view('installer::welcome', compact('steps')); } } diff --git a/beike/Installer/Views/layouts/master.blade.php b/beike/Installer/Views/layouts/master.blade.php index 4a28117e..2cc23090 100644 --- a/beike/Installer/Views/layouts/master.blade.php +++ b/beike/Installer/Views/layouts/master.blade.php @@ -16,7 +16,7 @@ - + @yield('style') @@ -25,18 +25,41 @@
{{--
diff --git a/beike/Installer/Views/permissions.blade.php b/beike/Installer/Views/permissions.blade.php index b871089f..38c2ed61 100644 --- a/beike/Installer/Views/permissions.blade.php +++ b/beike/Installer/Views/permissions.blade.php @@ -1,35 +1,56 @@ @extends('installer::layouts.master') @section('template_title') - {{ trans('installer::installer_messages.permissions.templateTitle') }} + {{ trans('installer::installer_messages.permissions.templateTitle') }} @endsection @section('title') - - {{ trans('installer::installer_messages.permissions.title') }} + + {{ trans('installer::installer_messages.permissions.title') }} @endsection @section('content') - -