From 16db8d35124e5c5c482b541bebc0ad353a325488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carodej?= Date: Mon, 6 Jun 2022 07:57:37 +0200 Subject: [PATCH] setup wizard fix --- config/vuefilemanager.php | 2 +- resources/js/views/SetupWizard/StatusCheck.vue | 2 +- src/Domain/Settings/Actions/GetConfigAction.php | 8 +++----- src/Support/Status/Actions/GetServerSetupStatusAction.php | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/config/vuefilemanager.php b/config/vuefilemanager.php index 3ab0ee51..a0613140 100644 --- a/config/vuefilemanager.php +++ b/config/vuefilemanager.php @@ -1,7 +1,7 @@ '2.2.0.2', + 'version' => '2.2.0.3', 'is_demo' => env('APP_DEMO', false), diff --git a/resources/js/views/SetupWizard/StatusCheck.vue b/resources/js/views/SetupWizard/StatusCheck.vue index 481b32bb..512d6a6d 100644 --- a/resources/js/views/SetupWizard/StatusCheck.vue +++ b/resources/js/views/SetupWizard/StatusCheck.vue @@ -256,7 +256,7 @@ export default { axios .get('/api/ping') .then((response) => { - this.apiRunning = response.data === 'pong' + this.apiRunning = response.data.message === 'pong' }) .catch(() => { this.apiRunning = false diff --git a/src/Domain/Settings/Actions/GetConfigAction.php b/src/Domain/Settings/Actions/GetConfigAction.php index 13338968..5414808c 100644 --- a/src/Domain/Settings/Actions/GetConfigAction.php +++ b/src/Domain/Settings/Actions/GetConfigAction.php @@ -6,18 +6,16 @@ use DB; use PDOException; use Domain\Pages\Models\Page; use Monolog\Handler\MissingExtensionException; +use Support\Status\Actions\GetServerSetupStatusAction; use VueFileManager\Subscription\Domain\Plans\Models\Plan; -use Domain\Settings\Controllers\GetServerStatusController; use VueFileManager\Subscription\Domain\Transactions\Models\Transaction; use VueFileManager\Subscription\Domain\Subscriptions\Models\Subscription; class GetConfigAction { public function __construct( - public GetServerStatusController $getServerSetupStatus, - ) - { - } + public GetServerSetupStatusAction $getServerSetupStatus, + ) {} public function __invoke(): array { diff --git a/src/Support/Status/Actions/GetServerSetupStatusAction.php b/src/Support/Status/Actions/GetServerSetupStatusAction.php index 99972843..06cbb250 100644 --- a/src/Support/Status/Actions/GetServerSetupStatusAction.php +++ b/src/Support/Status/Actions/GetServerSetupStatusAction.php @@ -3,14 +3,14 @@ namespace Support\Status\Actions; class GetServerSetupStatusAction { - public function __invoke() + public function __invoke(): array { // Required parameters $upload_max_filesize = 128; $post_max_size = 128; $memory_limit = 512; $max_execution_time = 180; - $php_version = '8.0'; + $php_version = '8.1'; // Writable $storageDirectory = dirname(storage_path('/storage'));