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

fix

Browse Source
This commit is contained in:
Andras Bacsai
2023-06-16 12:35:40 +02:00
parent 7456fc1ac7
commit 3589b92ec9
84 changed files with 285 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/livewire/project/application/danger.blade.php
View File

@@ -1,8 +1,8 @@
<div x-data="{ deleteApplication: false }">
<h2>Danger Zone</h2>
<div class="text-sm">Woah. I hope you know what are you doing.</div>
<div class="">Woah. I hope you know what are you doing.</div>
<h3 class="pt-4">Delete Application</h3>
<div class="pb-4 text-sm">This will stop your containers, delete all related data, etc. Beware! There is no coming
<div class="pb-4 ">This will stop your containers, delete all related data, etc. Beware! There is no coming
back!
</div>
<x-naked-modal show="deleteApplication" />

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

@@ -1,13 +1,13 @@
<div class="pt-4">
<livewire:project.application.deployment-navbar :activity="$activity" :application="$application" :deployment_uuid="$deployment_uuid" />
@if (data_get($activity, 'properties.status') === 'in_progress')
<div class="flex items-center gap-1 pt-2 text-sm">Deployment is
<div class="flex items-center gap-1 pt-2 ">Deployment is
<div class="text-warning"> {{ Str::headline(data_get($activity, 'properties.status')) }}.</div>
<x-loading class="loading-ring" />
</div>
<div class="text-sm">Logs will be updated automatically.</div>
<div class="">Logs will be updated automatically.</div>
@else
<div class="pt-2 text-sm">Deployment is <span
<div class="pt-2 ">Deployment is <span
class="text-warning">{{ Str::headline(data_get($activity, 'properties.status')) }}</span>.
</div>
@endif

4
resources/views/livewire/project/application/deployments.blade.php
View File

@@ -23,8 +23,8 @@
class="hover:no-underline">
<div class="flex flex-col justify-start">
<div>
{{ $deployment->id }} <span class="text-sm text-warning">></span> {{ $deployment->deployment_uuid }}
<span class="text-sm text-warning">></span>
{{ $deployment->id }} <span class=" text-warning">></span> {{ $deployment->deployment_uuid }}
<span class=" text-warning">></span>
{{ $deployment->status }}
</div>
@if (data_get($deployment, 'pull_request_id'))

4
resources/views/livewire/project/application/destination.blade.php
View File

@@ -1,7 +1,7 @@
<div>
<h2>Destination</h2>
<div class="text-sm">The destination server / network where your application will be deployed to.</div>
<div class="py-4 text-sm">
<div class="">The destination server / network where your application will be deployed to.</div>
<div class="py-4 ">
<p>Server: {{ data_get($destination, 'server.name') }}</p>
<p>Destination Network: {{ $destination->network }}</p>
</div>

4
resources/views/livewire/project/application/environment-variable/all.blade.php
View File

@@ -1,7 +1,7 @@
<div class="flex flex-col gap-2">
<div>
<h2>Environment Variables</h2>
<div class="text-sm">Environment (secrets) variables for normal deployments.</div>
<div class="">Environment (secrets) variables for normal deployments.</div>
</div>
@foreach ($application->environment_variables as $env)
<livewire:project.application.environment-variable.show wire:key="environment-{{ $env->id }}"
@@ -12,7 +12,7 @@
</div>
<div>
<h3>Preview Deployments</h3>
<div class="text-sm">Environment (secrets) variables for Preview Deployments.</div>
<div class="">Environment (secrets) variables for Preview Deployments.</div>
</div>
@foreach ($application->environment_variables_preview as $env)
<livewire:project.application.environment-variable.show wire:key="environment-{{ $env->id }}"

4
resources/views/livewire/project/application/general.blade.php
View File

@@ -6,7 +6,7 @@
Save
</x-forms.button>
</div>
<div class="text-sm">General configuration for your application.</div>
<div class="">General configuration for your application.</div>
<div class="flex flex-col gap-2 py-4">
<div class="flex flex-col items-end gap-2 xl:flex-row">
<x-forms.input id="application.name" label="Name" required />
@@ -16,7 +16,7 @@
</div>
@if ($wildcard_domain)
<div class="pb-6">
<div class="text-sm">Set Random Domain</div>
<div class="">Set Random Domain</div>
@if ($global_wildcard_domain)
<x-forms.button wire:click="generateGlobalRandomDomain">Global Wildcard
</x-forms.button>

4
resources/views/livewire/project/application/preview/form.blade.php
View File

@@ -4,10 +4,10 @@
<x-forms.button type="submit">Save</x-forms.button>
<x-forms.button wire:click="resetToDefault">Reset template to default</x-forms.button>
</div>
<div class="pb-4 text-sm">Preview Deployments based on pull requests are here.</div>
<div class="pb-4 ">Preview Deployments based on pull requests are here.</div>
<div class="flex flex-col gap-2 pb-4">
<x-forms.input id="application.preview_url_template" label="Preview URL Template"
helper="Templates:<span class='text-helper'>@@{{ random }}</span> to generate random sub-domain each time a PR is deployed, <span class='text-helper'>@@{{ pr_id }}</span> to use pull request ID as sub-domain or <span class='text-helper'>@@{{ domain }}</span> to replace the domain name with the application's domain name." />
<div class="text-sm">Domain Preview: {{ $preview_url_template }}</div>
<div class="">Domain Preview: {{ $preview_url_template }}</div>
</div>
</form>

4
resources/views/livewire/project/application/previews.blade.php
View File

@@ -7,7 +7,7 @@
</x-forms.button>
</div>
@isset($rate_limit_remaining)
<div class="pt-1 text-sm">Requests remaning till rate limited by Git: {{ $rate_limit_remaining }}</div>
<div class="pt-1 ">Requests remaning till rate limited by Git: {{ $rate_limit_remaining }}</div>
@endisset
@if (count($pull_requests) > 0)
<div wire:loading.remove wire:target='load_prs'>
@@ -49,7 +49,7 @@
</div>
@if ($application->previews->count() > 0)
<h4 class="pt-4">Preview Deployments</h4>
<div class="flex gap-6 text-sm">
<div class="flex gap-6 ">
@foreach ($application->previews as $preview)
<div class="flex flex-col p-4 bg-coolgray-200 " x-init="$wire.loadStatus('{{ data_get($preview, 'pull_request_id') }}')">
<div class="flex gap-2">PR #{{ data_get($preview, 'pull_request_id') }} |

2
resources/views/livewire/project/application/resource-limits.blade.php
View File

@@ -4,7 +4,7 @@
<h2>Resource Limits</h2>
<x-forms.button type='submit'>Save</x-forms.button>
</div>
<div class="text-sm">Limit your container resources by CPU & memory.</div>
<div class="">Limit your container resources by CPU & memory.</div>
<h3 class="pt-4">Limit CPUs</h3>
<div class="flex gap-2">
<x-forms.input placeholder="1.5" label="Number of CPUs" id="application.limits_cpus" />

4
resources/views/livewire/project/application/rollback.blade.php
View File

@@ -3,14 +3,14 @@
<h2>Rollback</h2>
<x-forms.button wire:click='loadImages'>Reload Available Images</x-forms.button>
</div>
<div class="pb-4 text-sm">You can easily rollback to a previously built image quickly.</div>
<div class="pb-4 ">You can easily rollback to a previously built image quickly.</div>
<div wire:target='loadImages'>
<div class="flex flex-wrap">
@foreach ($images as $image)
<div class="w-2/4 p-2">
<div class="rounded shadow-lg bg-coolgray-200">
<div class="p-2">
<div class="text-sm">
<div class="">
@if (data_get($image, 'is_current'))
<span class="font-bold text-warning">LIVE</span>
|

4
resources/views/livewire/project/application/source.blade.php
View File

@@ -18,7 +18,7 @@
</a>
@endif
</div>
<div class="text-sm">Code source of your application.</div>
<div class="">Code source of your application.</div>
<x-forms.input placeholder="coollabsio/coolify-example" id="application.git_repository" label="Repository" />
<x-forms.input placeholder="main" id="application.git_branch" label="Branch" />
<div class="flex items-end gap-2 w-96">
@@ -40,7 +40,7 @@
<h4 class="py-2 pt-4">Current Deploy Key: <span
class="text-warning">{{ $application->private_key->name }}</span></h4>
<div class="py-2 text-sm">Select another Deploy Key</div>
<div class="py-2 ">Select another Deploy Key</div>
<div class="flex gap-2">
@foreach ($private_keys as $key)
<x-forms.button wire:click.defer="setPrivateKey('{{ $key->id }}')">{{ $key->name }}

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

@@ -7,7 +7,7 @@
volume
name, example: <span class='text-helper'>-pr-1</span>" />
</div>
<div class="text-sm">Persistent storage to preserve data between deployments.</div>
<div class="">Persistent storage to preserve data between deployments.</div>
</div>
<div class="flex flex-col gap-2 py-4">
@foreach ($application->persistentStorages as $storage)