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

update css

Browse Source
This commit is contained in:
Andras Bacsai
2023-05-03 15:02:21 +02:00
parent d5c1e1d3f4
commit 5d5d856155
5 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/coolify.php
View File

@@ -1,5 +1,5 @@
<?php <?php
return [ return [
'version' => '4.0.0-nightly.1', 'version' => '4.0.0-nightly.2',
]; ];

2
resources/views/components/confirm-modal.blade.php
View File

@@ -16,7 +16,7 @@
<div class="flex flex-col items-center justify-center h-full"> <div class="flex flex-col items-center justify-center h-full">
<div class="pb-5 text-white" x-text="message"></div> <div class="pb-5 text-white" x-text="message"></div>
<div> <div>
<x-inputs.button x-on:click="$dispatch('confirm')">Confirm</x-inputs.button> <x-inputs.button isWarning x-on:click="$dispatch('confirm')">Confirm</x-inputs.button>
<x-inputs.button x-on:click="open = false">Cancel</x-inputs.button> <x-inputs.button x-on:click="open = false">Cancel</x-inputs.button>
</div> </div>
</div> </div>

25
resources/views/components/inputs/button.blade.php
View File

@@ -1,14 +1,23 @@
@props([ @props([
'class' => null, 'isWarning' => null,
'defaultClass' => 'text-white bg-violet-500 hover:bg-violet-600', 'defaultClass' => 'text-white bg-neutral-800 hover:bg-violet-600',
'defaultWarningClass' => 'text-white bg-red-500 hover:bg-red-600',
'confirm' => null, 'confirm' => null,
'confirmAction' => null, 'confirmAction' => null,
]) ])
<button {{ $attributes }} @class([
<button {{ $attributes }} {{ $attributes->merge(['class' => "$defaultClass $class"]) }} $defaultClass => !$confirm && !$isWarning,
@if ($attributes->whereStartsWith('wire:click')) wire:target="{{ $attributes->whereStartsWith('wire:click')->first() }}" $defaultWarningClass => $confirm || $isWarning,
wire:loading.class="text-black bg-green-500" wire:loading.attr="disabled" wire:loading.class.remove="{{ $defaultClass }} {{ $attributes->whereStartsWith('class')->first() }}" @endif ]) @if ($attributes->whereStartsWith('wire:click'))
@isset($confirm) x-on:click="toggleConfirmModal('{{ $confirm }}')" @endisset wire:target="{{ $attributes->whereStartsWith('wire:click')->first() }}"
@isset($confirmAction) @confirm.window="$wire.{{ $confirmAction }}()" @endisset> wire:loading.delay.class="text-black bg-green-500" wire:loading.delay.attr="disabled"
wire:loading.delay.class.remove="{{ $defaultClass }} {{ $attributes->whereStartsWith('class')->first() }}"
@endif
@isset($confirm)
x-on:click="toggleConfirmModal('{{ $confirm }}')"
@endisset
@isset($confirmAction)
@confirm.window="$wire.{{ $confirmAction }}()"
@endisset>
{{ $slot }} {{ $slot }}
</button> </button>

5
resources/views/livewire/project/application/deploy.blade.php
View File

@@ -8,8 +8,7 @@
<x-inputs.button wire:click='start'>Start</x-inputs.button> <x-inputs.button wire:click='start'>Start</x-inputs.button>
<x-inputs.button wire:click='forceRebuild'>Start (no cache)</x-inputs.button> <x-inputs.button wire:click='forceRebuild'>Start (no cache)</x-inputs.button>
@endif @endif
<x-inputs.button class="bg-red-500" confirmAction="delete" <x-inputs.button confirmAction="delete" confirm='Are you sure you would like to delete this application?'>
confirm='Are you sure you would like to delete this application?'>
Delete</x-inputs.button> Delete</x-inputs.button>
<span wire:poll.5000ms='pollingStatus'> <span wire:poll.5000ms='pollingStatus'>
@if ($application->status === 'running') @if ($application->status === 'running')
@@ -24,7 +23,7 @@
{{ explode(':', $port)[0] }}</a> {{ explode(':', $port)[0] }}</a>
@else @else
<a target="_blank" <a target="_blank"
href="http://{{ $application->destination->server->ip }}:{{ $port }}">Open href="http://{{ $application->destination->server->ip }}:{{ explode(':', $port)[0] }}">Open
{{ $port }}</a> {{ $port }}</a>
@endif @endif
@endforeach @endforeach

10
resources/views/project/application/configuration.blade.php
View File

@@ -3,16 +3,16 @@
<x-applications.navbar :applicationId="$application->id" /> <x-applications.navbar :applicationId="$application->id" />
<div x-data="{ activeTab: 'general' }"> <div x-data="{ activeTab: 'general' }">
<div class="flex gap-4"> <div class="flex gap-4">
<a :class="activeTab === 'general' && 'text-green-500'" @click.prevent="activeTab = 'general'" <a :class="activeTab === 'general' && 'text-purple-500'" @click.prevent="activeTab = 'general'"
href="#">General</a> href="#">General</a>
<a :class="activeTab === 'envs' && 'text-green-500'" @click.prevent="activeTab = 'envs'" <a :class="activeTab === 'envs' && 'text-purple-500'" @click.prevent="activeTab = 'envs'"
href="#">Environment Variables</a> href="#">Environment Variables</a>
<a :class="activeTab === 'source' && 'text-green-500'" @click.prevent="activeTab = 'source'" <a :class="activeTab === 'source' && 'text-purple-500'" @click.prevent="activeTab = 'source'"
href="#">Source</a> href="#">Source</a>
<a :class="activeTab === 'destination' && 'text-green-500'" @click.prevent="activeTab = 'destination'" <a :class="activeTab === 'destination' && 'text-purple-500'" @click.prevent="activeTab = 'destination'"
href="#">Destination href="#">Destination
</a> </a>
<a :class="activeTab === 'storages' && 'text-green-500'" @click.prevent="activeTab = 'storages'" <a :class="activeTab === 'storages' && 'text-purple-500'" @click.prevent="activeTab = 'storages'"
href="#">Storage href="#">Storage
</a> </a>
</div> </div>