dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: Update terminal button text and layout in application heading view

Browse Source
This commit is contained in:
Andras Bacsai
2024-09-16 10:56:11 +02:00
parent 7ebb0a4579
commit f124a1e60d
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Livewire/Project/Shared/ExecuteContainerCommand.php
View File

@@ -107,6 +107,9 @@ class ExecuteContainerCommand extends Component
} elseif (data_get($this->parameters, 'service_uuid')) { } elseif (data_get($this->parameters, 'service_uuid')) {
$this->container = $this->containers->first(); $this->container = $this->containers->first();
} }
if ($this->containers->count() === 1) {
$this->dispatch('connectToContainer');
}
} }
} }

6
resources/views/livewire/project/application/heading.blade.php
View File

@@ -1,7 +1,7 @@
<nav wire:poll.10000ms="check_status"> <nav wire:poll.10000ms="check_status">
<x-resources.breadcrumbs :resource="$application" :parameters="$parameters" :lastDeploymentInfo="$lastDeploymentInfo" :lastDeploymentLink="$lastDeploymentLink" /> <x-resources.breadcrumbs :resource="$application" :parameters="$parameters" :lastDeploymentInfo="$lastDeploymentInfo" :lastDeploymentLink="$lastDeploymentLink" />
<div class="navbar-main"> <div class="navbar-main">
<nav class="flex items-center flex-shrink-0 gap-6 scrollbar min-h-10 whitespace-nowrap"> <nav class="flex flex-shrink-0 gap-6 items-center whitespace-nowrap scrollbar min-h-10">
<a href="{{ route('project.application.configuration', $parameters) }}"> <a href="{{ route('project.application.configuration', $parameters) }}">
Configuration Configuration
</a> </a>
@@ -13,12 +13,12 @@
</a> </a>
@if (!$application->destination->server->isSwarm()) @if (!$application->destination->server->isSwarm())
<a href="{{ route('project.application.command', $parameters) }}"> <a href="{{ route('project.application.command', $parameters) }}">
<button>Command</button> <button>Terminal</button>
</a> </a>
@endif @endif
<x-applications.links :application="$application" /> <x-applications.links :application="$application" />
</nav> </nav>
<div class="flex flex-wrap items-center gap-2"> <div class="flex flex-wrap gap-2 items-center">
@if ($application->build_pack === 'dockercompose' && is_null($application->docker_compose_raw)) @if ($application->build_pack === 'dockercompose' && is_null($application->docker_compose_raw))
<div>Please load a Compose file.</div> <div>Please load a Compose file.</div>
@else @else

13
resources/views/livewire/project/database/heading.blade.php
View File

@@ -8,19 +8,20 @@
</x-slide-over> </x-slide-over>
<div class="navbar-main"> <div class="navbar-main">
<nav <nav
class="flex items-center flex-shrink-0 gap-6 overflow-x-scroll sm:overflow-x-hidden scrollbar min-h-10 whitespace-nowrap"> class="flex overflow-x-scroll flex-shrink-0 gap-6 items-center whitespace-nowrap sm:overflow-x-hidden scrollbar min-h-10">
<a class="{{ request()->routeIs('project.database.configuration') ? 'dark:text-white' : '' }}" <a class="{{ request()->routeIs('project.database.configuration') ? 'dark:text-white' : '' }}"
href="{{ route('project.database.configuration', $parameters) }}"> href="{{ route('project.database.configuration', $parameters) }}">
<button>Configuration</button> <button>Configuration</button>
</a> </a>
<a class="{{ request()->routeIs('project.database.command') ? 'dark:text-white' : '' }}"
href="{{ route('project.database.command', $parameters) }}">
<button>Execute Command</button>
</a>
<a class="{{ request()->routeIs('project.database.logs') ? 'dark:text-white' : '' }}" <a class="{{ request()->routeIs('project.database.logs') ? 'dark:text-white' : '' }}"
href="{{ route('project.database.logs', $parameters) }}"> href="{{ route('project.database.logs', $parameters) }}">
<button>Logs</button> <button>Logs</button>
</a> </a>
<a class="{{ request()->routeIs('project.database.command') ? 'dark:text-white' : '' }}"
href="{{ route('project.database.command', $parameters) }}">
<button>Terminal</button>
</a>
@if ( @if (
$database->getMorphClass() === 'App\Models\StandalonePostgresql' || $database->getMorphClass() === 'App\Models\StandalonePostgresql' ||
$database->getMorphClass() === 'App\Models\StandaloneMongodb' || $database->getMorphClass() === 'App\Models\StandaloneMongodb' ||
@@ -32,7 +33,7 @@
</a> </a>
@endif @endif
</nav> </nav>
<div class="flex flex-wrap items-center gap-2"> <div class="flex flex-wrap gap-2 items-center">
@if (!str($database->status)->startsWith('exited')) @if (!str($database->status)->startsWith('exited'))
<x-modal-confirmation @click="$wire.dispatch('restartEvent')"> <x-modal-confirmation @click="$wire.dispatch('restartEvent')">
<x-slot:button-title> <x-slot:button-title>

14
resources/views/livewire/project/shared/execute-container-command.blade.php
View File

@@ -4,17 +4,13 @@
</x-slot> </x-slot>
<livewire:project.shared.configuration-checker :resource="$resource" /> <livewire:project.shared.configuration-checker :resource="$resource" />
@if ($type === 'application') @if ($type === 'application')
<h1>Execute Command</h1> <h1>Terminal</h1>
<livewire:project.application.heading :application="$resource" /> <livewire:project.application.heading :application="$resource" />
<h2 class="pt-4">Command</h2>
<div class="pb-2">Run any one-shot command inside a container.</div>
@elseif ($type === 'database') @elseif ($type === 'database')
<h1>Execute Command</h1> <h1>Terminal</h1>
<livewire:project.database.heading :database="$resource" /> <livewire:project.database.heading :database="$resource" />
<h2 class="pt-4">Command</h2>
<div class="pb-2">Run any one-shot command inside a container.</div>
@elseif ($type === 'service') @elseif ($type === 'service')
<h2>Execute Command</h2> <h2>Terminal</h2>
@endif @endif
<div x-init="$wire.loadContainers"> <div x-init="$wire.loadContainers">
<div class="pt-4" wire:loading wire:target='loadContainers'> <div class="pt-4" wire:loading wire:target='loadContainers'>
@@ -22,7 +18,7 @@
</div> </div>
<div wire:loading.remove wire:target='loadContainers'> <div wire:loading.remove wire:target='loadContainers'>
@if (count($containers) > 0) @if (count($containers) > 0)
<form class="flex flex-col justify-center gap-2 pt-4 xl:items-end xl:flex-row" <form class="flex flex-col gap-2 justify-center pt-4 xl:items-end xl:flex-row"
wire:submit="$dispatchSelf('connectToContainer')"> wire:submit="$dispatchSelf('connectToContainer')">
<x-forms.select label="Container" id="container" required> <x-forms.select label="Container" id="container" required>
<option disabled selected>Select container</option> <option disabled selected>Select container</option>
@@ -52,7 +48,7 @@
@endif @endif
</div> </div>
</div> </div>
<div class="w-full mx-auto"> <div class="mx-auto w-full">
<livewire:project.shared.terminal /> <livewire:project.shared.terminal />
</div> </div>
</div> </div>

6
routes/web.php
View File

@@ -183,20 +183,20 @@ Route::middleware(['auth', 'verified'])->group(function () {
Route::get('/deployment', DeploymentIndex::class)->name('project.application.deployment.index'); Route::get('/deployment', DeploymentIndex::class)->name('project.application.deployment.index');
Route::get('/deployment/{deployment_uuid}', DeploymentShow::class)->name('project.application.deployment.show'); Route::get('/deployment/{deployment_uuid}', DeploymentShow::class)->name('project.application.deployment.show');
Route::get('/logs', Logs::class)->name('project.application.logs'); Route::get('/logs', Logs::class)->name('project.application.logs');
Route::get('/command', ExecuteContainerCommand::class)->name('project.application.command'); Route::get('/terminal', ExecuteContainerCommand::class)->name('project.application.command');
Route::get('/tasks/{task_uuid}', ScheduledTaskShow::class)->name('project.application.scheduled-tasks'); Route::get('/tasks/{task_uuid}', ScheduledTaskShow::class)->name('project.application.scheduled-tasks');
}); });
Route::prefix('project/{project_uuid}/{environment_name}/database/{database_uuid}')->group(function () { Route::prefix('project/{project_uuid}/{environment_name}/database/{database_uuid}')->group(function () {
Route::get('/', DatabaseConfiguration::class)->name('project.database.configuration'); Route::get('/', DatabaseConfiguration::class)->name('project.database.configuration');
Route::get('/logs', Logs::class)->name('project.database.logs'); Route::get('/logs', Logs::class)->name('project.database.logs');
Route::get('/command', ExecuteContainerCommand::class)->name('project.database.command'); Route::get('/terminal', ExecuteContainerCommand::class)->name('project.database.command');
Route::get('/backups', DatabaseBackupIndex::class)->name('project.database.backup.index'); Route::get('/backups', DatabaseBackupIndex::class)->name('project.database.backup.index');
Route::get('/backups/{backup_uuid}', DatabaseBackupExecution::class)->name('project.database.backup.execution'); Route::get('/backups/{backup_uuid}', DatabaseBackupExecution::class)->name('project.database.backup.execution');
}); });
Route::prefix('project/{project_uuid}/{environment_name}/service/{service_uuid}')->group(function () { Route::prefix('project/{project_uuid}/{environment_name}/service/{service_uuid}')->group(function () {
Route::get('/', ServiceConfiguration::class)->name('project.service.configuration'); Route::get('/', ServiceConfiguration::class)->name('project.service.configuration');
Route::get('/{stack_service_uuid}', ServiceIndex::class)->name('project.service.index'); Route::get('/{stack_service_uuid}', ServiceIndex::class)->name('project.service.index');
Route::get('/command', ExecuteContainerCommand::class)->name('project.service.command'); Route::get('/terminal', ExecuteContainerCommand::class)->name('project.service.command');
Route::get('/tasks/{task_uuid}', ScheduledTaskShow::class)->name('project.service.scheduled-tasks'); Route::get('/tasks/{task_uuid}', ScheduledTaskShow::class)->name('project.service.scheduled-tasks');
}); });