Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: boarding

Browse Source
This commit is contained in:
Andras Bacsai 2023-10-20 18:15:25 +02:00
parent 5d9cfc393e
commit fae340afcb
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Livewire/Boarding/Index.php
View File

@ -213,7 +213,7 @@ public function validateServer()
]);
$this->getProxyType();
} catch (\Throwable $e) {
$this->dockerInstallationStarted = false;
// $this->dockerInstallationStarted = false;
return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
}
}

6
app/Models/Server.php
View File

@ -122,9 +122,9 @@ public function isEmpty()
public function databases()
{
return $this->destinations()->map(function ($standaloneDocker) {
$postgresqls = $standaloneDocker->postgresqls;
$redis = $standaloneDocker->redis;
$mongodbs = $standaloneDocker->mongodbs;
$postgresqls = data_get($standaloneDocker,'postgresqls',collect([]));
$redis = data_get($standaloneDocker,'redis',collect([]));
$mongodbs = data_get($standaloneDocker,'mongodbs',collect([]));
return $postgresqls->concat($redis)->concat($mongodbs);
})->flatten();
}

2
config/sentry.php
View File

@ -7,7 +7,7 @@
// The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => '4.0.0-beta.97',
'release' => '4.0.0-beta.98',
// When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'),

2
config/version.php
View File

@ -1,3 +1,3 @@
<?php
return '4.0.0-beta.97';
return '4.0.0-beta.98';

8
resources/views/livewire/boarding/index.blade.php
View File

@ -225,10 +225,10 @@
Could not find Docker Engine on your server. Do you want me to install it for you?
</x-slot:question>
<x-slot:actions>
@if ($dockerInstallationStarted)
<x-forms.button class="justify-center box" wire:click="installDocker"
onclick="installDocker.showModal()">
Let's do it!</x-forms.button>
onclick="installDocker.showModal()">
Let's do it!</x-forms.button>
@if ($dockerInstallationStarted)
<x-forms.button class="justify-center box" wire:click="dockerInstalledOrSkipped">
Next</x-forms.button>
@endif
@ -314,7 +314,7 @@ class="flex flex-col w-full gap-4 lg:w-96">
I will redirect you to the new resource page, where you can create your first resource.
</x-slot:question>
<x-slot:actions>
<div class="justify-center box" wire:click="showNewResource">Let's do
<div class="items-center justify-center box" wire:click="showNewResource">Let's do
it!</div>
</x-slot:actions>
<x-slot:explanation>

2
versions.json
View File

@ -4,7 +4,7 @@
"version": "3.12.36"
},
"v4": {
"version": "4.0.0-beta.97"
"version": "4.0.0-beta.98"
}
}
}