diff --git a/app/Livewire/Project/Application/Configuration.php b/app/Livewire/Project/Application/Configuration.php index 5261a0800..bf2811075 100644 --- a/app/Livewire/Project/Application/Configuration.php +++ b/app/Livewire/Project/Application/Configuration.php @@ -8,14 +8,21 @@ use Livewire\Component; class Configuration extends Component { + public $currentRoute; + public Application $application; + public $project; + + public $environment; + public $servers; protected $listeners = ['buildPackUpdated' => '$refresh']; public function mount() { + $this->currentRoute = request()->route()->getName(); $project = currentTeam() ->projects() ->select('id', 'uuid', 'team_id') @@ -30,6 +37,8 @@ class Configuration extends Component ->where('uuid', request()->route('application_uuid')) ->firstOrFail(); + $this->project = $project; + $this->environment = $environment; $this->application = $application; if ($application->destination && $application->destination->server) { $mainServer = $application->destination->server; diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/Show.php b/app/Livewire/Project/Shared/EnvironmentVariable/Show.php index 6294d97c6..2bccde0e9 100644 --- a/app/Livewire/Project/Shared/EnvironmentVariable/Show.php +++ b/app/Livewire/Project/Shared/EnvironmentVariable/Show.php @@ -5,7 +5,6 @@ namespace App\Livewire\Project\Shared\EnvironmentVariable; use App\Models\EnvironmentVariable as ModelsEnvironmentVariable; use App\Models\SharedEnvironmentVariable; use Livewire\Component; -use Visus\Cuid2\Cuid2; class Show extends Component { @@ -13,8 +12,6 @@ class Show extends Component public ModelsEnvironmentVariable|SharedEnvironmentVariable $env; - public ?string $modalId = null; - public bool $isDisabled = false; public bool $isLocked = false; @@ -61,7 +58,6 @@ class Show extends Component if ($this->env->getMorphClass() === \App\Models\SharedEnvironmentVariable::class) { $this->isSharedVariable = true; } - $this->modalId = new Cuid2; $this->parameters = get_route_parameters(); $this->checkEnvs(); } diff --git a/docker/development/etc/nginx/site-opts.d/http.conf b/docker/development/etc/nginx/site-opts.d/http.conf index 41735cf06..9f7e49ee2 100644 --- a/docker/development/etc/nginx/site-opts.d/http.conf +++ b/docker/development/etc/nginx/site-opts.d/http.conf @@ -39,7 +39,7 @@ location ~ \.php$ { fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; include fastcgi_params; - fastcgi_buffers 8 8k; - fastcgi_buffer_size 8k; + fastcgi_buffers 16 16k; + fastcgi_buffer_size 32k; fastcgi_read_timeout 99; } diff --git a/docker/production/etc/nginx/site-opts.d/http.conf b/docker/production/etc/nginx/site-opts.d/http.conf index 41735cf06..9f7e49ee2 100644 --- a/docker/production/etc/nginx/site-opts.d/http.conf +++ b/docker/production/etc/nginx/site-opts.d/http.conf @@ -39,7 +39,7 @@ location ~ \.php$ { fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; include fastcgi_params; - fastcgi_buffers 8 8k; - fastcgi_buffer_size 8k; + fastcgi_buffers 16 16k; + fastcgi_buffer_size 32k; fastcgi_read_timeout 99; } diff --git a/resources/views/livewire/project/application/configuration.blade.php b/resources/views/livewire/project/application/configuration.blade.php index b5ba6c822..fc2b8c7c0 100644 --- a/resources/views/livewire/project/application/configuration.blade.php +++ b/resources/views/livewire/project/application/configuration.blade.php @@ -5,34 +5,36 @@

Configuration

-
+ +
- General + General + Advanced @if ($application->destination->server->isSwarm()) - Swarm + $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}" + wire:navigate>Swarm Configuration @endif - Advanced - @if ($application->build_pack !== 'static') - Environment - Variables - @endif - @if ($application->build_pack !== 'static') - Storages - - @endif + Environment Variables + Persistent Storage @if ($application->git_based()) - Source + Git Source @endif - Servers + Servers @if (str($application->status)->contains('degraded')) @@ -50,102 +52,74 @@ @endif - Scheduled Tasks - + Scheduled Tasks + Webhooks + Preview Deployments + Healthcheck + Rollback + Resource Limits - Webhooks - - @if ($application->git_based()) - Preview - Deployments - - @endif - @if ($application->build_pack !== 'static' && $application->build_pack !== 'dockercompose') - Healthchecks - - @endif - Rollback - - @if ($application->build_pack !== 'dockercompose') - Resource Limits - - @endif - Resource Operations - - Metrics - - Tags - - Danger Zone - + Resource Operations + Metrics + Tags + Danger Zone
-
+ @if (request()->route()->getName() === 'project.application.configuration') -
-
+ @elseif (request()->route()->getName() === 'project.application.swarm' && $application->destination->server->isSwarm()) -
-
+ @elseif (request()->route()->getName() === 'project.application.advanced') -
-
+ @elseif (request()->route()->getName() === 'project.application.environment-variables') -
- @if ($application->git_based()) -
- -
- @endif -
+ @elseif (request()->route()->getName() === 'project.application.persistent-storage') + + @elseif (request()->route()->getName() === 'project.application.source' && $application->git_based()) + + @elseif (request()->route()->getName() === 'project.application.servers') -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
+ @elseif (request()->route()->getName() === 'project.application.scheduled-tasks.show') -
-
+ @elseif (request()->route()->getName() === 'project.application.webhooks') + + @elseif (request()->route()->getName() === 'project.application.preview-deployments') + + @elseif (request()->route()->getName() === 'project.application.healthcheck') + + @elseif (request()->route()->getName() === 'project.application.rollback') + + @elseif (request()->route()->getName() === 'project.application.resource-limits') + + @elseif (request()->route()->getName() === 'project.application.resource-operations') -
-
+ @elseif (request()->route()->getName() === 'project.application.metrics') -
-
- -
-
+ @elseif (request()->route()->getName() === 'project.application.tags') + + @elseif (request()->route()->getName() === 'project.application.danger') -
+ @endif
diff --git a/routes/web.php b/routes/web.php index 3d12b9b46..18adc0467 100644 --- a/routes/web.php +++ b/routes/web.php @@ -183,6 +183,23 @@ Route::middleware(['auth', 'verified'])->group(function () { }); Route::prefix('project/{project_uuid}/{environment_name}/application/{application_uuid}')->group(function () { Route::get('/', ApplicationConfiguration::class)->name('project.application.configuration'); + Route::get('/swarm', ApplicationConfiguration::class)->name('project.application.swarm'); + Route::get('/advanced', ApplicationConfiguration::class)->name('project.application.advanced'); + Route::get('/environment-variables', ApplicationConfiguration::class)->name('project.application.environment-variables'); + Route::get('/persistent-storage', ApplicationConfiguration::class)->name('project.application.persistent-storage'); + Route::get('/source', ApplicationConfiguration::class)->name('project.application.source'); + Route::get('/servers', ApplicationConfiguration::class)->name('project.application.servers'); + Route::get('/scheduled-tasks', ApplicationConfiguration::class)->name('project.application.scheduled-tasks.show'); + Route::get('/webhooks', ApplicationConfiguration::class)->name('project.application.webhooks'); + Route::get('/preview-deployments', ApplicationConfiguration::class)->name('project.application.preview-deployments'); + Route::get('/healthcheck', ApplicationConfiguration::class)->name('project.application.healthcheck'); + Route::get('/rollback', ApplicationConfiguration::class)->name('project.application.rollback'); + Route::get('/resource-limits', ApplicationConfiguration::class)->name('project.application.resource-limits'); + Route::get('/resource-operations', ApplicationConfiguration::class)->name('project.application.resource-operations'); + Route::get('/metrics', ApplicationConfiguration::class)->name('project.application.metrics'); + Route::get('/tags', ApplicationConfiguration::class)->name('project.application.tags'); + Route::get('/danger', ApplicationConfiguration::class)->name('project.application.danger'); + Route::get('/deployment', DeploymentIndex::class)->name('project.application.deployment.index'); Route::get('/deployment/{deployment_uuid}', DeploymentShow::class)->name('project.application.deployment.show'); Route::get('/logs', Logs::class)->name('project.application.logs');