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

updates

Browse Source
This commit is contained in:
Andras Bacsai
2023-05-31 12:38:36 +02:00
parent c953482ba9
commit 59f631e1d4
12 changed files with 73 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/views/livewire/project/application/deployment-cancel.blade.php
View File

@@ -1,3 +0,0 @@
<div>
<x-forms.button wire:click="cancel" isHighlighted>Cancel</x-forms.button>
</div>

12
resources/views/livewire/project/application/deployment-logs.blade.php
View File

@@ -1,4 +1,10 @@
<div
class="scrollbar flex flex-col-reverse w-full overflow-y-auto border border-solid rounded border-coolgray-300 max-h-[32rem] p-4 mt-4 text-xs text-white">
<pre class="font-mono whitespace-pre-wrap" @if ($isKeepAliveOn) wire:poll.2000ms="polling" @endif>{{ \App\Actions\CoolifyTask\RunRemoteProcess::decodeOutput($activity) }}</pre>
<div>
<div class="pt-2 text-sm">Build status: {{ data_get($activity, 'properties.status') }}</div>
@if (data_get($activity, 'properties.status') === 'in_progress')
<livewire:project.application.deployment-navbar :activity="$activity" :application="$application" :deployment_uuid="$deployment_uuid" />
@endif
<div
class="scrollbar flex flex-col-reverse w-full overflow-y-auto border border-solid rounded border-coolgray-300 max-h-[32rem] p-4 mt-4 text-xs text-white">
<pre class="font-mono whitespace-pre-wrap" @if ($isKeepAliveOn) wire:poll.2000ms="polling" @endif>{{ \App\Actions\CoolifyTask\RunRemoteProcess::decodeOutput($activity) }}</pre>
</div>
</div>

3
resources/views/livewire/project/application/deployment-navbar.blade.php Normal file
View File

@@ -0,0 +1,3 @@
<div>
<x-forms.button wire:click.prevent="cancel">Cancel deployment</x-forms.button>
</div>

2
resources/views/livewire/project/application/status.blade.php
View File

@@ -1,4 +1,4 @@
<div wire:poll.5000ms='pollingStatus'>
<div wire:poll.5000ms='applicationStatusChanged'>
@if ($application->status === 'running')
<span class="text-xs text-pink-600" wire:loading.delay.longer>Loading current status...</span>
<div class="flex items-center gap-2 text-sm" wire:loading.remove.delay.longer>

9
resources/views/project/application/deployment.blade.php
View File

@@ -12,11 +12,8 @@
</ul>
</div>
<x-applications.navbar :application="$application" />
<div class="pt-2 text-sm">Status: {{ data_get($activity, 'properties.status') }}</div>
@if (data_get($activity, 'properties.status') === 'in_progress' &&
(data_get($deployment, 'metadata.status') !== 'error' ||
data_get($deployment, 'metadata.status') !== 'finished'))
{{-- @if (data_get($activity, 'properties.status') === 'in_progress' && (data_get($deployment, 'metadata.status') !== 'error' || data_get($deployment, 'metadata.status') !== 'finished'))
<livewire:project.application.deployment-cancel :activity="$activity" :application="$application" :deployment_uuid="$deployment_uuid" />
@endif
<livewire:project.application.deployment-logs :activity="$activity" :deployment_uuid="$deployment_uuid" />
@endif --}}
<livewire:project.application.deployment-logs :activity="$activity" :application="$application" :deployment_uuid="$deployment_uuid" />
</x-layout>