diff --git a/app/Livewire/Boarding/Index.php b/app/Livewire/Boarding/Index.php index 387d6cd0b..110222fb4 100644 --- a/app/Livewire/Boarding/Index.php +++ b/app/Livewire/Boarding/Index.php @@ -167,6 +167,10 @@ public function getProxyType() } public function selectExistingPrivateKey() { + if (is_null($this->selectedExistingPrivateKey)) { + $this->restartBoarding(); + return; + } $this->createdPrivateKey = PrivateKey::find($this->selectedExistingPrivateKey); $this->privateKey = $this->createdPrivateKey->private_key; $this->state = 'create-server'; diff --git a/app/Livewire/Project/Shared/Tags.php b/app/Livewire/Project/Shared/Tags.php index 0977f18f8..92a08f117 100644 --- a/app/Livewire/Project/Shared/Tags.php +++ b/app/Livewire/Project/Shared/Tags.php @@ -28,7 +28,7 @@ public function addTag(string $id, string $name) { try { if ($this->resource->tags()->where('id', $id)->exists()) { - $this->dispatch('error', 'Duplicate tags.', "Tag $name already added."); + $this->dispatch('error', 'Duplicate tags.', "Tag $name already added."); return; } $this->resource->tags()->syncWithoutDetaching($id); @@ -66,7 +66,7 @@ public function submit() $tags = str($this->new_tag)->trim()->explode(' '); foreach ($tags as $tag) { if ($this->resource->tags()->where('name', $tag)->exists()) { - $this->dispatch('error', 'Duplicate tags.', "Tag $tag already added."); + $this->dispatch('error', 'Duplicate tags.', "Tag $tag already added."); continue; } $found = Tag::where(['name' => $tag, 'team_id' => currentTeam()->id])->first(); diff --git a/app/View/Components/Forms/Checkbox.php b/app/View/Components/Forms/Checkbox.php index 0047e7a4d..95fe2d4f4 100644 --- a/app/View/Components/Forms/Checkbox.php +++ b/app/View/Components/Forms/Checkbox.php @@ -19,7 +19,7 @@ public function __construct( public ?string $helper = null, public string|bool $instantSave = false, public bool $disabled = false, - public string $defaultClass = "dark:border-neutral-700 text-warning focus:ring-warning dark:bg-coolgray-100 rounded cursor-pointer dark:disabled:bg-base dark:disabled:cursor-not-allowed", + public string $defaultClass = "dark:border-neutral-700 text-coolgray-400 focus:ring-warning dark:bg-coolgray-100 rounded cursor-pointer dark:disabled:bg-base dark:disabled:cursor-not-allowed", ) { // } diff --git a/app/View/Components/Forms/Textarea.php b/app/View/Components/Forms/Textarea.php index c9d2c26ba..95e0ef5d2 100644 --- a/app/View/Components/Forms/Textarea.php +++ b/app/View/Components/Forms/Textarea.php @@ -25,8 +25,8 @@ public function __construct( public ?string $helper = null, public bool $realtimeValidation = false, public bool $allowToPeak = true, - public string $defaultClass = "block w-full py-1.5 rounded border-0 text-sm ring-inset ring-1 dark:bg-coolgray-100 dark:text-white text-black focus:ring-2 dark:focus:ring-coolgray-300 dark:ring-coolgray-300 scrollbar dark:read-only:text-neutral-500", - public string $defaultClassInput = "block w-full py-1.5 rounded border-0 text-sm ring-inset ring-1 dark:bg-coolgray-100 dark:text-white text-black focus:ring-2 dark:focus:ring-coolgray-300 dark:ring-coolgray-300 dark:read-only:text-neutral-500" + public string $defaultClass = "input scrollbar", + public string $defaultClassInput = "input" ) { // } diff --git a/public/svgs/github.svg b/public/svgs/github.svg index 6c77b4144..270db203b 100644 --- a/public/svgs/github.svg +++ b/public/svgs/github.svg @@ -1 +1 @@ - + diff --git a/resources/css/app.css b/resources/css/app.css index 7d7659a8a..efeb4af7c 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -4,27 +4,36 @@ html, body { - @apply bg-neutral-100 text-neutral-800 dark:bg-base dark:text-neutral-400; + @apply h-full bg-neutral-100 text-neutral-800 dark:bg-base dark:text-neutral-400; } body { @apply text-sm antialiased scrollbar; } -.input, .select { - @apply text-black dark:bg-coolgray-100 dark:text-white ring-neutral-300 dark:ring-coolgray-300 ; +.input, +.select { + @apply text-black dark:bg-coolgray-100 dark:text-white ring-neutral-300 dark:ring-coolgray-300; } + /* Readonly */ -.input { - @apply dark:read-only:text-neutral-500 dark:read-only:ring-0 dark:read-only:bg-coolgray-100/40 placeholder:text-neutral-300 dark:placeholder:text-neutral-700; +.input { + @apply dark:read-only:text-neutral-500 dark:read-only:ring-0 dark:read-only:bg-coolgray-100/40 placeholder:text-neutral-300 dark:placeholder:text-neutral-700 read-only:text-neutral-500 read-only:bg-neutral-200; } + /* Focus */ -.input, .select { +.input, +.select { @apply focus:ring-2 dark:focus:ring-coolgray-300 focus:ring-neutral-400; } -.input, .select { - @apply block w-full py-1.5 rounded border-0 text-sm pr-10 ring-1 ring-inset; +.input, +.select { + @apply block w-full py-1.5 rounded border-0 text-sm ring-1 ring-inset; +} + +.input[type='password'] { + @apply pr-10; } option { @@ -32,14 +41,15 @@ option { } .button { - @apply flex items-center justify-center gap-2 px-3 py-1 text-sm font-normal normal-case rounded cursor-pointer bg-neutral-200 hover:bg-neutral-300 dark:bg-coolgray-200 dark:text-white dark:hover:bg-coolgray-100 dark:hover:dark:text-white dark:disabled:bg-coolgray-100/40 dark:disabled:text-neutral-800 min-w-fit hover:dark:text-white ; + @apply flex items-center justify-center gap-2 px-3 py-1 text-sm font-normal normal-case rounded cursor-pointer bg-neutral-200 hover:bg-neutral-300 dark:bg-coolgray-200 dark:text-white dark:hover:bg-coolgray-100 dark:hover:dark:text-white dark:disabled:bg-coolgray-100/40 dark:disabled:text-neutral-800 min-w-fit hover:dark:text-white focus-visible:outline-none; } + button[isError]:not(:disabled) { @apply text-white bg-red-600 hover:bg-red-700; } button[isHighlighted]:not(:disabled) { - @apply bg-coollabs hover:bg-coollabs-100; + @apply text-white bg-coollabs hover:bg-coollabs-100; } @@ -60,7 +70,7 @@ h4 { } a { - @apply hover:text-black dark:hover:text-white; + @apply hover:text-black dark:hover:text-white; } label { @@ -108,7 +118,7 @@ .alert-error { } .dropdown-item { - @apply relative flex cursor-pointer select-none dark:text-white dark:hover:bg-coollabs items-center pr-4 pl-2 py-1 text-xs justify-start outline-none transition-colors data-[disabled]:pointer-events-none data-[disabled]:opacity-50 gap-2 w-full; + @apply relative flex cursor-pointer select-none dark:text-white hover:bg-neutral-300 dark:hover:bg-coollabs items-center pr-4 pl-2 py-1 text-xs justify-start outline-none transition-colors data-[disabled]:pointer-events-none data-[disabled]:opacity-50 gap-2 w-full; } .badge { @@ -127,9 +137,9 @@ .badge-error { @apply bg-error; } -[type='checkbox']:checked { +/* [type='checkbox']:checked { background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='black' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e"); -} +} */ .menu { @apply flex items-center gap-1; @@ -142,6 +152,7 @@ .menu-item { .menu-item-active { @apply text-black rounded-none dark:bg-coolgray-200 dark:text-warning bg-neutral-200; } + .heading-item-active { @apply text-black rounded-none dark:bg-coolgray-200 dark:text-warning; } @@ -152,7 +163,7 @@ .icon { .scrollbar { - @apply scrollbar-thumb-coollabs-100 scrollbar-track-coolgray-200 scrollbar-w-2; + @apply scrollbar-thumb-coollabs-100 dark:scrollbar-track-coolgray-200 scrollbar-track-neutral-200 scrollbar-w-2; } .main { @@ -168,15 +179,15 @@ .navbar-main { } .loading { - @apply w-4 text-warning; + @apply w-4 dark:text-warning text-coollabs; } .kbd-custom { - @apply px-2 text-xs border border-dashed rounded border-neutral-700 text-warning; + @apply px-2 text-xs border border-dashed rounded border-neutral-700 dark:text-warning; } .box { - @apply flex p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 bg-white border border-neutral-200 dark:border-black hover:bg-neutral-200 dark:hover:bg-coollabs-100 dark:hover:text-white hover:no-underline; + @apply flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 bg-white border border-neutral-200 dark:border-black hover:bg-neutral-200 dark:hover:bg-coollabs-100 dark:hover:text-white hover:no-underline; } .on-box { @@ -184,15 +195,17 @@ .on-box { } .box-without-bg { - @apply flex p-2 transition-colors dark:hover:text-white hover:no-underline min-h-[4rem]; + @apply flex p-2 transition-colors dark:hover:text-white hover:no-underline min-h-[4rem] dark:border-black border-neutral-200; } .box-title { @apply font-bold text-black dark:text-white group-hover:dark:text-white; } + .box-description { @apply text-xs font-bold text-neutral-500 group-hover:dark:text-white group-hover:text-black; } + .description { @apply text-xs font-bold text-neutral-500 group-hover:dark:text-white group-hover:text-black; } @@ -232,11 +245,13 @@ .bg-coollabs-gradient { } .text-helper { - @apply inline-block font-bold text-red-500 dark:text-warning; + @apply inline-block font-bold text-coollabs dark:text-warning; } + .info-helper { @apply cursor-pointer text-coollabs dark:text-warning; } + .info-helper-popup { @apply absolute z-40 hidden text-xs rounded text-neutral-700 group-hover:block dark:border-coolgray-500 border-neutral-900 dark:bg-coolgray-400 bg-neutral-200 dark:text-neutral-300; } diff --git a/resources/js/components/MagicBar.vue b/resources/js/components/MagicBar.vue index 5a6ca8016..611ec0891 100644 --- a/resources/js/components/MagicBar.vue +++ b/resources/js/components/MagicBar.vue @@ -27,7 +27,7 @@ @@ -54,12 +54,12 @@ {{ sequenceState.sequence[sequenceState.currentActionIndex] }} name will be: - {{ search }} + {{ search }} {{ sequenceState.sequence[sequenceState.currentActionIndex] }} name will be: - randomly generated (type to + randomly generated (type to change) @@ -186,7 +186,7 @@
+ + class="absolute top-0 right-0 -mt-2 -mr-2 font-bold dark:text-warning">+
{{ action.name }} diff --git a/resources/views/components/applications/advanced.blade.php b/resources/views/components/applications/advanced.blade.php index 72e92f367..46ea54e99 100644 --- a/resources/views/components/applications/advanced.blade.php +++ b/resources/views/components/applications/advanced.blade.php @@ -1,50 +1,36 @@ -
-
- - -
+ @else +
+ + + + + + + + Force deploy (without + cache) +
+ @endif + diff --git a/resources/views/components/applications/links.blade.php b/resources/views/components/applications/links.blade.php index bd82f75a1..a14d0e3ae 100644 --- a/resources/views/components/applications/links.blade.php +++ b/resources/views/components/applications/links.blade.php @@ -1,94 +1,100 @@ -
- - - -
-
- @if ( - (data_get($application, 'fqdn') || - collect(json_decode($this->application->docker_compose_domains))->count() > 0 || - data_get($application, 'previews', collect([]))->count() > 0 || - data_get($application, 'ports_mappings_array')) && - data_get($application, 'settings.is_raw_compose_deployment_enabled') !== true) - @if (data_get($application, 'gitBrancLocation')) - - - Git Repository - - @endif - @if (data_get($application, 'build_pack') === 'dockercompose') - @foreach (collect(json_decode($this->application->docker_compose_domains)) as $fqdn) - @if (data_get($fqdn, 'domain')) - @foreach (explode(',', data_get($fqdn, 'domain')) as $domain) - - - - - - - {{ getFqdnWithoutPort($domain) }} - - @endforeach - @endif - @endforeach - @endif - @if (data_get($application, 'fqdn')) - @foreach (str(data_get($application, 'fqdn'))->explode(',') as $fqdn) - - + + + Links + + @if ( + (data_get($application, 'fqdn') || + collect(json_decode($this->application->docker_compose_domains))->count() > 0 || + data_get($application, 'previews', collect([]))->count() > 0 || + data_get($application, 'ports_mappings_array')) && + data_get($application, 'settings.is_raw_compose_deployment_enabled') !== true) + @if (data_get($application, 'gitBrancLocation')) + + + Git Repository + + @endif + @if (data_get($application, 'build_pack') === 'dockercompose') + @foreach (collect(json_decode($this->application->docker_compose_domains)) as $fqdn) + @if (data_get($fqdn, 'domain')) + @foreach (explode(',', data_get($fqdn, 'domain')) as $domain) + + - {{ getFqdnWithoutPort($fqdn) }} + {{ getFqdnWithoutPort($domain) }} @endforeach @endif - @if (data_get($application, 'previews', collect([]))->count() > 0) - @foreach (data_get($application, 'previews') as $preview) - @if (data_get($preview, 'fqdn')) - - - - - - - - PR{{ data_get($preview, 'pull_request_id') }} | - {{ data_get($preview, 'fqdn') }} - - @endif - @endforeach + @endforeach + @endif + @if (data_get($application, 'fqdn')) + @foreach (str(data_get($application, 'fqdn'))->explode(',') as $fqdn) + + + + + + + {{ getFqdnWithoutPort($fqdn) }} + + @endforeach + @endif + @if (data_get($application, 'previews', collect([]))->count() > 0) + @foreach (data_get($application, 'previews') as $preview) + @if (data_get($preview, 'fqdn')) + + + + + + + + PR{{ data_get($preview, 'pull_request_id') }} | + {{ data_get($preview, 'fqdn') }} + @endif - @if (data_get($application, 'ports_mappings_array')) - @foreach ($application->ports_mappings_array as $port) - @if ($application->destination->server->id === 0) + @endforeach + @endif + @if (data_get($application, 'ports_mappings_array')) + @foreach ($application->ports_mappings_array as $port) + @if ($application->destination->server->id === 0) + + + + + + + + Port {{ $port }} + + @else + + + + + + + + {{ $application->destination->server->ip }}:{{ explode(':', $port)[0] }} + + @if (count($application->additional_servers) > 0) + @foreach ($application->additional_servers as $server) + href="http://{{ $server->ip }}:{{ explode(':', $port)[0] }}"> @@ -98,45 +104,14 @@ class="absolute top-0 z-50 mt-6 min-w-max" x-cloak> - Port {{ $port }} + {{ $server->ip }}:{{ explode(':', $port)[0] }} - @else - - - - - - - - {{ $application->destination->server->ip }}:{{ explode(':', $port)[0] }} - - @if (count($application->additional_servers) > 0) - @foreach ($application->additional_servers as $server) - - - - - - - - {{ $server->ip }}:{{ explode(':', $port)[0] }} - - @endforeach - @endif - @endif - @endforeach + @endforeach + @endif @endif - @else -
No links available
- @endif -
-
-
+ @endforeach + @endif + @else +
No links available
+ @endif + diff --git a/resources/views/components/boarding-step.blade.php b/resources/views/components/boarding-step.blade.php index 3b1e5324e..98ec53ad6 100644 --- a/resources/views/components/boarding-step.blade.php +++ b/resources/views/components/boarding-step.blade.php @@ -1,15 +1,15 @@
-
-

{{ $title }}

+
+

{{ $title }}

@isset($question) -

+

{{ $question }}

@endisset
@if ($actions) -
+
{{ $actions }}
@endif diff --git a/resources/views/components/dropdown.blade.php b/resources/views/components/dropdown.blade.php new file mode 100644 index 000000000..097a490ab --- /dev/null +++ b/resources/views/components/dropdown.blade.php @@ -0,0 +1,23 @@ +
+ + +
+
+ {{ $slot }} +
+
+
diff --git a/resources/views/components/external-link.blade.php b/resources/views/components/external-link.blade.php index 7c97d74a1..6991e0637 100644 --- a/resources/views/components/external-link.blade.php +++ b/resources/views/components/external-link.blade.php @@ -1 +1,7 @@ - + diff --git a/resources/views/components/forms/checkbox.blade.php b/resources/views/components/forms/checkbox.blade.php index 749c7a21a..f3e3d5c9e 100644 --- a/resources/views/components/forms/checkbox.blade.php +++ b/resources/views/components/forms/checkbox.blade.php @@ -16,4 +16,3 @@ @if ($instantSave) wire:loading.attr="disabled" wire:click='{{ $instantSave === 'instantSave' || $instantSave == '1' ? 'instantSave' : $instantSave }}' wire:model={{ $id }} @else wire:model={{ $value ?? $id }} @endif />
- diff --git a/resources/views/components/loading.blade.php b/resources/views/components/loading.blade.php index 78a1f9726..7ee3b1d1a 100644 --- a/resources/views/components/loading.blade.php +++ b/resources/views/components/loading.blade.php @@ -3,7 +3,7 @@ @if (isset($text))
{{ $text }}
@endif - @endif @endif
+
- Cancel + Cancel
@if ($attributes->whereStartsWith('wire:click')->first()) diff --git a/resources/views/components/pricing-plans.blade.php b/resources/views/components/pricing-plans.blade.php index b58977259..cbfe7acd3 100644 --- a/resources/views/components/pricing-plans.blade.php +++ b/resources/views/components/pricing-plans.blade.php @@ -5,7 +5,7 @@
+ class="grid grid-cols-2 p-1 text-xs font-semibold leading-5 text-center rounded dark:text-white gap-x-1 bg-white/5"> Payment frequency
@if (config('constants.limits.trial_period') > 0)
{{ config('constants.limits.trial_period') }} + class="font-bold dark:text-warning">{{ config('constants.limits.trial_period') }} days trial included on all plans, without credit card details.
@endif
-
Save 10% annually with the yearly plans. +
Save 10% annually with the yearly plans.
@@ -39,14 +39,14 @@ class="font-bold text-warning">{{ config('constants.limits.trial_period') }} Get Started -

Start self-hosting without limits with +

Start self-hosting without limits with our OSS version. Same features as the paid version, but you have to manage by yourself.

--}}
For the detailed list of features, please visit our landing page: coolify.io
+ class="font-bold underline dark:text-white" href="https://coolify.io">coolify.io
@@ -78,16 +78,16 @@ class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-coolgray-500 isolate gap

  • - Connect 2 servers
  • -
  • -
  • -
  • -
    -
    +
    -
    +
    Once you connected your server, Coolify will start managing it and do a lot of administrative tasks for you. You can also write your own scripts to - automate your server*. + automate your server*.
    -
    +
    -
    +
    @@ -356,7 +356,7 @@ class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-coolgray-500 isolate gap
    -
    +
    -
    +
    @@ -389,12 +389,12 @@ class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-coolgray-500 isolate gap
    Programmatically deploy, query, and manage your servers & resources. Integrate to your CI/CD pipelines, or build your own custom integrations. * + class="dark:text-warning">*
    -
    +
    *
    Git integration is default today. We support hosted (github.com, - gitlab.com*) or self-hosted* + gitlab.com*) or self-hosted* (Github Enterprise, Gitlab) Git repositories.
    -
    +
    *
    - * Some features are work in progress and will be available soon. + * Some features are work in progress and will be available soon.
    --}}
    @isset($other) diff --git a/resources/views/components/resource-view.blade.php b/resources/views/components/resource-view.blade.php index a6bfef53c..6857a0dc0 100644 --- a/resources/views/components/resource-view.blade.php +++ b/resources/views/components/resource-view.blade.php @@ -1,5 +1,5 @@
    !$upgrade, 'hover:border-red-500 cursor-not-allowed' => $upgrade, ]) @if (!$upgrade) wire:click={{ $wire }} @endif> @@ -9,7 +9,7 @@
    {{ $title }}
    - @if($upgrade) + @if ($upgrade)
    {{ $upgrade }}
    @else
    diff --git a/resources/views/components/resources/breadcrumbs.blade.php b/resources/views/components/resources/breadcrumbs.blade.php index 4a4ea86f2..5b0956c93 100644 --- a/resources/views/components/resources/breadcrumbs.blade.php +++ b/resources/views/components/resources/breadcrumbs.blade.php @@ -7,7 +7,7 @@
  • -
  • -
  • -
    - - -
    -
    - @foreach ($links as $link) - - - - - - - {{ $link }} - - @endforeach -
    -
    -
    + + + Links + + @foreach ($links as $link) + + + + + + + {{ $link }} + + @endforeach + @endif diff --git a/resources/views/components/slide-over.blade.php b/resources/views/components/slide-over.blade.php index 4b342becd..09f7d4fdc 100644 --- a/resources/views/components/slide-over.blade.php +++ b/resources/views/components/slide-over.blade.php @@ -8,7 +8,7 @@
    + class="fixed inset-0 dark:bg-black bg-opacity-60">
    @@ -23,7 +23,7 @@ class="fixed inset-0 bg-black bg-opacity-60">
    'max-w-4xl w-screen' => $fullScreen, ])>
    + class="flex flex-col h-full py-6 overflow-hidden border-l shadow-lg bg-neutral-50 dark:bg-base dark:border-neutral-800 border-neutral-200">

    diff --git a/resources/views/components/status/degraded.blade.php b/resources/views/components/status/degraded.blade.php index d91051c8e..d48e1898c 100644 --- a/resources/views/components/status/degraded.blade.php +++ b/resources/views/components/status/degraded.blade.php @@ -5,11 +5,11 @@
    -
    +
    {{ str($status)->before(':')->headline() }}
    @if (!str($status)->startsWith('Proxy') && !str($status)->contains('(')) -
    ({{ str($status)->after(':') }})
    +
    ({{ str($status)->after(':') }})
    @endif
    diff --git a/resources/views/components/status/restarting.blade.php b/resources/views/components/status/restarting.blade.php index d43a3a719..7cb25128d 100644 --- a/resources/views/components/status/restarting.blade.php +++ b/resources/views/components/status/restarting.blade.php @@ -5,11 +5,11 @@
    -
    +
    {{ str($status)->before(':')->headline() }}
    @if (!str($status)->startsWith('Proxy') && !str($status)->contains('(')) -
    ({{ str($status)->after(':') }})
    +
    ({{ str($status)->after(':') }})
    @endif
    diff --git a/resources/views/components/status/running.blade.php b/resources/views/components/status/running.blade.php index 5bcb45cf5..249ce51c6 100644 --- a/resources/views/components/status/running.blade.php +++ b/resources/views/components/status/running.blade.php @@ -9,7 +9,7 @@ {{ str($status)->before(':')->headline() }}

    @if (!str($status)->startsWith('Proxy') && !str($status)->contains('(')) -
    ({{ str($status)->after(':') }})
    +
    ({{ str($status)->after(':') }})
    @endif
    diff --git a/resources/views/components/use-magic-bar.blade.php b/resources/views/components/use-magic-bar.blade.php index 60d2f3cab..3991e5958 100644 --- a/resources/views/components/use-magic-bar.blade.php +++ b/resources/views/components/use-magic-bar.blade.php @@ -1,7 +1,7 @@
    @if (isset($link)) Create a new one - + here. {{-- @else diff --git a/resources/views/errors/401.blade.php b/resources/views/errors/401.blade.php index c0cfa1148..46537d578 100644 --- a/resources/views/errors/401.blade.php +++ b/resources/views/errors/401.blade.php @@ -2,7 +2,7 @@
    -

    401

    +

    401

    You shall not pass!

    You don't have permission to access this page.

    diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php index 2b19498c0..5055869c8 100644 --- a/resources/views/errors/403.blade.php +++ b/resources/views/errors/403.blade.php @@ -2,7 +2,7 @@
    -

    403

    +

    403

    You shall not pass!

    You don't have permission to access this page.

    diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index 233e11736..0972b4fc8 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -2,7 +2,7 @@
    -

    404

    +

    404

    How did you got here?

    Sorry, we couldn’t find the page you’re looking for. diff --git a/resources/views/errors/419.blade.php b/resources/views/errors/419.blade.php index fa4b7d5c1..9bfd96b3a 100644 --- a/resources/views/errors/419.blade.php +++ b/resources/views/errors/419.blade.php @@ -2,7 +2,7 @@

    -

    419

    +

    419

    This page is definitely old, not like you!

    Sorry, we couldn’t find the page you’re looking for. diff --git a/resources/views/errors/429.blade.php b/resources/views/errors/429.blade.php index d2cfa39f1..b02e834a3 100644 --- a/resources/views/errors/429.blade.php +++ b/resources/views/errors/429.blade.php @@ -2,7 +2,7 @@

    -

    429

    +

    429

    Woah, slow down there!

    You're making too many requests. Please wait a few seconds before trying again. diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php index a9e41f184..ab8ca42dd 100644 --- a/resources/views/errors/500.blade.php +++ b/resources/views/errors/500.blade.php @@ -2,7 +2,7 @@

    -

    500

    +

    500

    Something is not okay, are you okay?

    There has been an error, we are working on it.

    diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php index b3712d484..74f0a8018 100644 --- a/resources/views/errors/503.blade.php +++ b/resources/views/errors/503.blade.php @@ -2,7 +2,7 @@
    -

    503

    +

    503

    We are working on serious things.

    Service Unavailable. Be right back. Thanks for your patience. diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 450aa40c2..dcbeede5d 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -16,7 +16,7 @@

    -
    diff --git a/resources/views/livewire/project/application/previews.blade.php b/resources/views/livewire/project/application/previews.blade.php index 91e9c0504..45d0fba63 100644 --- a/resources/views/livewire/project/application/previews.blade.php +++ b/resources/views/livewire/project/application/previews.blade.php @@ -2,7 +2,7 @@ @if (count($application->additional_servers) > 0)
    Previews will be deployed on {{ $application->destination->server->name }}.
    + class="dark:text-warning">{{ $application->destination->server->name }}.
    @endif
    @if ($application->is_github_based()) diff --git a/resources/views/livewire/project/application/rollback.blade.php b/resources/views/livewire/project/application/rollback.blade.php index a5b8f9a90..82c8c6cac 100644 --- a/resources/views/livewire/project/application/rollback.blade.php +++ b/resources/views/livewire/project/application/rollback.blade.php @@ -13,7 +13,7 @@
    @if (data_get($image, 'is_current')) - LIVE + LIVE | @endif SHA: {{ data_get($image, 'tag') }} diff --git a/resources/views/livewire/project/application/source.blade.php b/resources/views/livewire/project/application/source.blade.php index de7d94d39..bdf65931b 100644 --- a/resources/views/livewire/project/application/source.blade.php +++ b/resources/views/livewire/project/application/source.blade.php @@ -37,7 +37,7 @@ @isset($application->private_key_id)

    Deploy Key

    Currently attached Private Key: {{ $application->private_key->name }} + class="dark:text-warning">{{ $application->private_key->name }}

    Select another Private Key

    diff --git a/resources/views/livewire/project/database/heading.blade.php b/resources/views/livewire/project/database/heading.blade.php index 739e38c12..ada627c19 100644 --- a/resources/views/livewire/project/database/heading.blade.php +++ b/resources/views/livewire/project/database/heading.blade.php @@ -48,7 +48,7 @@ @else
    @else -
    Please verify these values. You can only modify them before the initial +
    Please verify these values. You can only modify them before the initial start. After that, you need to modify it in the database.
    @@ -44,7 +44,7 @@

    Network

    + helper="A comma separated list of ports you would like to map to the host system.
    Example3000:5432,3002:5433" /> diff --git a/resources/views/livewire/project/database/mongodb/general.blade.php b/resources/views/livewire/project/database/mongodb/general.blade.php index 0b57b4df7..6cc0035a8 100644 --- a/resources/views/livewire/project/database/mongodb/general.blade.php +++ b/resources/views/livewire/project/database/mongodb/general.blade.php @@ -23,7 +23,7 @@ helper="You can only change this in the database." />
    @else -
    Please verify these values. You can only modify them before the initial +
    Please verify these values. You can only modify them before the initial start. After that, you need to modify it in the database.
    @@ -38,7 +38,7 @@

    Network

    + helper="A comma separated list of ports you would like to map to the host system.
    Example3000:5432,3002:5433" /> diff --git a/resources/views/livewire/project/database/mysql/general.blade.php b/resources/views/livewire/project/database/mysql/general.blade.php index fd7c3876d..a97356492 100644 --- a/resources/views/livewire/project/database/mysql/general.blade.php +++ b/resources/views/livewire/project/database/mysql/general.blade.php @@ -25,7 +25,7 @@ helper="You can only change this in the database." />
    @else -
    Please verify these values. You can only modify them before the initial +
    Please verify these values. You can only modify them before the initial start. After that, you need to modify it in the database.
    @@ -44,7 +44,7 @@

    Network

    + helper="A comma separated list of ports you would like to map to the host system.
    Example3000:5432,3002:5433" /> diff --git a/resources/views/livewire/project/database/postgresql/general.blade.php b/resources/views/livewire/project/database/postgresql/general.blade.php index 322befc40..7c38a9da9 100644 --- a/resources/views/livewire/project/database/postgresql/general.blade.php +++ b/resources/views/livewire/project/database/postgresql/general.blade.php @@ -38,7 +38,7 @@ helper="You can only change this in the database." />
    @else -
    Please verify these values. You can only modify them before the initial +
    Please verify these values. You can only modify them before the initial start. After that, you need to modify it in the database.
    @@ -58,7 +58,7 @@

    Network

    + helper="A comma separated list of ports you would like to map to the host system.
    Example3000:5432,3002:5433" /> diff --git a/resources/views/livewire/project/database/redis/general.blade.php b/resources/views/livewire/project/database/redis/general.blade.php index 0bbf8fb33..267f45ee6 100644 --- a/resources/views/livewire/project/database/redis/general.blade.php +++ b/resources/views/livewire/project/database/redis/general.blade.php @@ -16,7 +16,7 @@

    Network

    + helper="A comma separated list of ports you would like to map to the host system.
    Example3000:5432,3002:5433" /> diff --git a/resources/views/livewire/project/environment-edit.blade.php b/resources/views/livewire/project/environment-edit.blade.php index 53aa0777a..b61bc5c65 100644 --- a/resources/views/livewire/project/environment-edit.blade.php +++ b/resources/views/livewire/project/environment-edit.blade.php @@ -14,7 +14,7 @@
  • -
  • -
    -
    You can use these variables anywhere with @{{environment.VARIABLENAME}}You can use these variables anywhere with @{{environment.VARIABLENAME}}
    diff --git a/resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php b/resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php index a157307d2..f8733c742 100644 --- a/resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php +++ b/resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php @@ -17,7 +17,7 @@ {{ $key->name }}
    + class="loading loading-xs dark:text-warning loading-spinner">
@else @@ -28,7 +28,7 @@ class="loading loading-xs text-warning loading-spinner"> {{ $key->name }}
+ class="loading loading-xs dark:text-warning loading-spinner">
@endif diff --git a/resources/views/livewire/project/new/github-private-repository.blade.php b/resources/views/livewire/project/new/github-private-repository.blade.php index 45249607b..29438988e 100644 --- a/resources/views/livewire/project/new/github-private-repository.blade.php +++ b/resources/views/livewire/project/new/github-private-repository.blade.php @@ -35,7 +35,7 @@
+ class="loading loading-xs dark:text-warning loading-spinner">
@endforeach diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.php index 5be683ca0..289d3a6a9 100644 --- a/resources/views/livewire/project/new/select.blade.php +++ b/resources/views/livewire/project/new/select.blade.php @@ -1,7 +1,7 @@
-
+

New Resource

-
+
@foreach ($environments as $environment) @@ -22,7 +22,7 @@ @@ -32,12 +32,21 @@ You can deploy public & private repositories through your GitHub Apps. - + + + + + + + - Private Repository (with deploy key) @@ -58,9 +67,42 @@ You can deploy a simple Dockerfile, without Git. - + + + + + + + + + + + + + + + + + + @@ -69,9 +111,44 @@ You can deploy complex application easily with Docker Compose, without Git. - +
+ + + + + + + + + + + + + + + + + + +
@@ -80,9 +157,44 @@ You can deploy an existing Docker Image from any Registry, without Git. - +
+ + + + + + + + + + + + + + + + + + +
@@ -163,7 +275,8 @@

Services

Reload List - +
Trademarks Policy: The respective trademarks mentioned here are owned by the respective @@ -254,7 +367,7 @@
@forelse($servers as $server) -
+
{{ $server->name }} @@ -265,7 +378,8 @@
@empty
- diff --git a/resources/views/livewire/project/resource/index.blade.php b/resources/views/livewire/project/resource/index.blade.php index 3cd50fbd2..d46528cc1 100644 --- a/resources/views/livewire/project/resource/index.blade.php +++ b/resources/views/livewire/project/resource/index.blade.php @@ -27,7 +27,7 @@ class="button">+
  • -
    - @@ -143,7 +143,7 @@

    Storages

    Persistent storage to preserve data between deployments.
    - Please modify storage layout in your Docker Compose file. + Please modify storage layout in your Docker Compose file. @foreach ($applications as $application) diff --git a/resources/views/livewire/project/service/database.blade.php b/resources/views/livewire/project/service/database.blade.php index 2096b5b2a..6d4cfc72b 100644 --- a/resources/views/livewire/project/service/database.blade.php +++ b/resources/views/livewire/project/service/database.blade.php @@ -13,7 +13,7 @@
    diff --git a/resources/views/livewire/project/service/index.blade.php b/resources/views/livewire/project/service/index.blade.php index 8f3be917d..d51234983 100644 --- a/resources/views/livewire/project/service/index.blade.php +++ b/resources/views/livewire/project/service/index.blade.php @@ -35,7 +35,7 @@

    Storages

    Persistent storage to preserve data between deployments.
    - Please modify storage layout in your Docker Compose file. + Please modify storage layout in your Docker Compose file.
    • @@ -49,7 +49,7 @@

    Storages

    Persistent storage to preserve data between deployments.
    - Please modify storage layout in your Docker Compose file. + Please modify storage layout in your Docker Compose file.
    diff --git a/resources/views/livewire/project/service/navbar.blade.php b/resources/views/livewire/project/service/navbar.blade.php index 34bcf2070..8b727ae08 100644 --- a/resources/views/livewire/project/service/navbar.blade.php +++ b/resources/views/livewire/project/service/navbar.blade.php @@ -16,7 +16,7 @@
    @if (str($service->status())->contains('running'))
    diff --git a/resources/views/livewire/project/shared/destination.blade.php b/resources/views/livewire/project/shared/destination.blade.php index f94d011f7..8da1cba43 100644 --- a/resources/views/livewire/project/shared/destination.blade.php +++ b/resources/views/livewire/project/shared/destination.blade.php @@ -3,7 +3,7 @@
    Server related configurations.
    -
    +
    Primary Server
    @if (str($resource->realStatus())->startsWith('running'))
    @@ -73,7 +73,7 @@ class="absolute bg-error -top-1 -left-1 badge ">
    @foreach ($networks as $network)
    + class="relative flex flex-col cursor-default dark:text-white box w-96">
    Server: {{ data_get($network, 'server.name') }}
    diff --git a/resources/views/livewire/project/shared/environment-variable/show.blade.php b/resources/views/livewire/project/shared/environment-variable/show.blade.php index a3f9210fa..2754a62bd 100644 --- a/resources/views/livewire/project/shared/environment-variable/show.blade.php +++ b/resources/views/livewire/project/shared/environment-variable/show.blade.php @@ -12,7 +12,7 @@ You will delete environment variable {{ $env->key }}. + class="font-bold dark:text-warning">{{ $env->key }}.
    @else @@ -53,7 +53,7 @@ class="font-bold text-warning">{{ $env->key }}. You will delete environment variable {{ $env->key }}. + class="font-bold dark:text-warning">{{ $env->key }}. @else @@ -64,7 +64,7 @@ class="font-bold text-warning">{{ $env->key }}. You will delete environment variable {{ $env->key }}. + class="font-bold dark:text-warning">{{ $env->key }}. @endif
    diff --git a/resources/views/livewire/project/shared/get-logs.blade.php b/resources/views/livewire/project/shared/get-logs.blade.php index 2c458fd0d..7f8ce9495 100644 --- a/resources/views/livewire/project/shared/get-logs.blade.php +++ b/resources/views/livewire/project/shared/get-logs.blade.php @@ -37,7 +37,7 @@ class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"> -

    Clone

    -
    +
    Clone this resource to another project / environment.
    -
    +
    @foreach ($servers->sortBy('id') as $server)
    @foreach ($server->destinations() as $destination) -
    -
    {{ $server->name }}
    -
    {{ $destination->name }}
    +
    +
    +
    {{ $server->name }}
    +
    {{ $destination->name }}
    +
    You are about to clone this resource.
    @@ -30,22 +32,25 @@
    This resource is currently in the {{ $resource->environment->project->name }} / + class="font-bold dark:text-warning">{{ $resource->environment->project->name }} / {{ $resource->environment->name }} environment.
    @forelse ($projects as $project)
    @foreach ($project->environments as $environment) - - -
    -
    {{ $project->name }}
    -
    {{ $environment->name }} environment
    -
    -     -
    You are about to move this resource.
    -     + + +
    +
    +
    {{ $project->name }}
    +
    {{ $environment->name }} environment +
    +
    +
    +     +
    You are about to move this resource.
    +     @endforeach
    @empty diff --git a/resources/views/livewire/project/shared/scheduled-task/all.blade.php b/resources/views/livewire/project/shared/scheduled-task/all.blade.php index 3b753ed02..2b78de165 100644 --- a/resources/views/livewire/project/shared/scheduled-task/all.blade.php +++ b/resources/views/livewire/project/shared/scheduled-task/all.blade.php @@ -17,7 +17,7 @@ @elseif ($resource->type() == 'service') href="{{ route('project.service.scheduled-tasks', [...$parameters, 'task_uuid' => $task->uuid]) }}"> @endif -
    {{ $task->name }}
    +
    {{ $task->name }}
    Frequency: {{ $task->frequency }}
    Last run: {{ data_get($task->latest_log, 'status', 'No runs yet') }}
    diff --git a/resources/views/livewire/project/shared/scheduled-task/show.blade.php b/resources/views/livewire/project/shared/scheduled-task/show.blade.php index d7ae45d55..144d22f16 100644 --- a/resources/views/livewire/project/shared/scheduled-task/show.blade.php +++ b/resources/views/livewire/project/shared/scheduled-task/show.blade.php @@ -14,7 +14,7 @@ Save - You will delete scheduled task {{ $task->name }}. + You will delete scheduled task {{ $task->name }}.
    diff --git a/resources/views/livewire/project/shared/storages/show.blade.php b/resources/views/livewire/project/shared/storages/show.blade.php index 0061edb73..a50a78877 100644 --- a/resources/views/livewire/project/shared/storages/show.blade.php +++ b/resources/views/livewire/project/shared/storages/show.blade.php @@ -25,7 +25,7 @@ Update - This storage will be deleted {{ $storage->name }}. It + This storage will be deleted {{ $storage->name }}. It is not reversible.
    Please think again. diff --git a/resources/views/livewire/project/shared/tags.blade.php b/resources/views/livewire/project/shared/tags.blade.php index 466e30991..d8c8fb320 100644 --- a/resources/views/livewire/project/shared/tags.blade.php +++ b/resources/views/livewire/project/shared/tags.blade.php @@ -2,7 +2,7 @@

    Tags

    @forelse ($this->resource->tags as $tagId => $tag) -
    +
    {{ $tag->name }} Add @if ($tags->count() > 0) -

    Quickly Add

    +

    Exisiting Tags

    +
    Click to add quickly
    @foreach ($tags as $tag) diff --git a/resources/views/livewire/security/api-tokens.blade.php b/resources/views/livewire/security/api-tokens.blade.php index d8c35b9ec..d643325a1 100644 --- a/resources/views/livewire/security/api-tokens.blade.php +++ b/resources/views/livewire/security/api-tokens.blade.php @@ -11,7 +11,7 @@ Create New Token @if (session()->has('token')) -
    Please copy this token now. For your security, it won't be shown again. +
    Please copy this token now. For your security, it won't be shown again.
    {{ session('token') }}
    @endif diff --git a/resources/views/livewire/security/private-key/create.blade.php b/resources/views/livewire/security/private-key/create.blade.php index 08365112e..d44e2c470 100644 --- a/resources/views/livewire/security/private-key/create.blade.php +++ b/resources/views/livewire/security/private-key/create.blade.php @@ -9,7 +9,7 @@ - ACTION REQUIRED: Copy the 'Public Key' to your server's + ACTION REQUIRED: Copy the 'Public Key' to your server's ~/.ssh/authorized_keys file diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php index 0ed481cad..c1d33ae7e 100644 --- a/resources/views/livewire/server/form.blade.php +++ b/resources/views/livewire/server/form.blade.php @@ -76,7 +76,7 @@ class="w-full mt-8 mb-4 font-bold box-without-bg bg-coollabs hover:bg-coollabs-1 label="Use it as a build server?" /> @else @if ($server->isSwarm())
    Swarm support is experimental.
    diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php index fc2e020c3..7ef521916 100644 --- a/resources/views/livewire/server/proxy.blade.php +++ b/resources/views/livewire/server/proxy.blade.php @@ -13,7 +13,7 @@ Save
    -
    diff --git a/resources/views/livewire/server/proxy/deploy.blade.php b/resources/views/livewire/server/proxy/deploy.blade.php index a677ae15d..88ce67cec 100644 --- a/resources/views/livewire/server/proxy/deploy.blade.php +++ b/resources/views/livewire/server/proxy/deploy.blade.php @@ -18,7 +18,7 @@ @endif - + @@ -49,7 +49,7 @@
    @else
    You can use these variables anywhere with @{{ team.VARIABLENAME }} @{{ team.VARIABLENAME }}
    diff --git a/resources/views/livewire/team/member/index.blade.php b/resources/views/livewire/team/member/index.blade.php index 6318b54d3..bd7ba5964 100644 --- a/resources/views/livewire/team/member/index.blade.php +++ b/resources/views/livewire/team/member/index.blade.php @@ -35,8 +35,8 @@ @else

    Invite New Member

    @if (isInstanceAdmin()) -
    You need to configure (as root team) Transactional +
    You need to configure (as root team) Transactional Emails before you can invite a diff --git a/resources/views/livewire/waitlist/index.blade.php b/resources/views/livewire/waitlist/index.blade.php index 8bf2aed1c..548e722fc 100644 --- a/resources/views/livewire/waitlist/index.blade.php +++ b/resources/views/livewire/waitlist/index.blade.php @@ -7,7 +7,7 @@

    Self-hosting in the cloud - Join Waitlist -
    People waiting in the line: {{ $waitingInLine }}
    -
    Already using Coolify Cloud: {{ $users }}
    +
    People waiting in the line: {{ $waitingInLine }}
    +
    Already using Coolify Cloud: {{ $users }}
    This is a paid & hosted version of Coolify.
    See the pricing here. + class="dark:text-warning">here.
    If you are looking for the self-hosted version go here. + class="dark:text-warning">here.