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

Refactor ActivityMonitor component to add max height option

Browse Source
This commit is contained in:
Andras Bacsai
2024-04-16 13:14:09 +02:00
parent 92ee2be021
commit f0ad260eab
3 changed files with 175 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/livewire/activity-monitor.blade.php
View File

@@ -11,7 +11,7 @@
@endif @endif
<div @class([ <div @class([
'flex flex-col-reverse w-full px-4 py-2 overflow-y-auto bg-white border border-solid rounded dark:text-white dark:bg-coolgray-100 scrollbar border-neutral-300 dark:border-coolgray-300', 'flex flex-col-reverse w-full px-4 py-2 overflow-y-auto bg-white border border-solid rounded dark:text-white dark:bg-coolgray-100 scrollbar border-neutral-300 dark:border-coolgray-300',
'h-full' => $fullHeight, 'max-h-[48rem]' => $fullHeight,
'max-h-96' => !$fullHeight, 'max-h-96' => !$fullHeight,
])> ])>
<pre class="max-h-screen font-mono whitespace-pre-wrap" @if ($isPollingActive) wire:poll.1000ms="polling" @endif>{{ RunRemoteProcess::decodeOutput($this->activity) }}</pre> <pre class="max-h-screen font-mono whitespace-pre-wrap" @if ($isPollingActive) wire:poll.1000ms="polling" @endif>{{ RunRemoteProcess::decodeOutput($this->activity) }}</pre>

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

@@ -17,6 +17,7 @@
@endif @endif
<x-applications.links :application="$application" /> <x-applications.links :application="$application" />
<div class="flex-1"></div> <div class="flex-1"></div>
<div class="flex items-center gap-2">
@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
@@ -74,7 +75,8 @@
stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
stroke-linejoin="round"> stroke-linejoin="round">
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path> <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
<path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"> <path
d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
</path> </path>
<path <path
d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"> d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
@@ -86,9 +88,9 @@
</x-modal-confirmation> </x-modal-confirmation>
@else @else
<x-forms.button wire:click='deploy'> <x-forms.button wire:click='deploy'>
<svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning"
stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none"
stroke-linejoin="round"> stroke-linecap="round" stroke-linejoin="round">
<path stroke="none" d="M0 0h24v24H0z" fill="none" /> <path stroke="none" d="M0 0h24v24H0z" fill="none" />
<path d="M7 4v16l13 -8z" /> <path d="M7 4v16l13 -8z" />
</svg> </svg>
@@ -98,6 +100,7 @@
</div> </div>
@endif @endif
</div> </div>
</div>
@script @script
<script> <script>
$wire.$on('stopEvent', () => { $wire.$on('stopEvent', () => {

2
resources/views/livewire/project/service/navbar.blade.php
View File

@@ -15,6 +15,7 @@
</a> </a>
<x-services.links :service="$service" /> <x-services.links :service="$service" />
<div class="flex-1"></div> <div class="flex-1"></div>
<div class="flex gap-2">
@if (str($service->status())->contains('running')) @if (str($service->status())->contains('running'))
<button @click="$wire.dispatch('restartEvent')" class="gap-2 button"> <button @click="$wire.dispatch('restartEvent')" class="gap-2 button">
<svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"> <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
@@ -112,6 +113,7 @@
</button> </button>
@endif @endif
</div> </div>
</div>
@script @script
<script> <script>
$wire.$on('stopEvent', () => { $wire.$on('stopEvent', () => {