diff --git a/resources/views/components/applications/links.blade.php b/resources/views/components/applications/links.blade.php index cf9e9c029..26b1cedf5 100644 --- a/resources/views/components/applications/links.blade.php +++ b/resources/views/components/applications/links.blade.php @@ -8,133 +8,85 @@ 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) - - - - - - - {{ getFqdnWithoutPort($fqdn) }} +
+ @if (data_get($application, 'gitBrancLocation')) + + + Git Repository - @endforeach - @endif - @if (data_get($application, 'previews', collect())->count() > 0) - @if (data_get($application, 'build_pack') === 'dockercompose') - @foreach ($application->previews as $preview) - @foreach (collect(json_decode($preview->docker_compose_domains)) as $fqdn) - @if (data_get($fqdn, 'domain')) - @foreach (explode(',', data_get($fqdn, 'domain')) as $domain) - - - - - - - PR{{ data_get($preview, 'pull_request_id') }} | - {{ getFqdnWithoutPort($domain) }} - - @endforeach - @endif - @endforeach - @endforeach - @else - @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 @endif - @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) - - - - - - - - {{ $server->ip }}:{{ explode(':', $port)[0] }} + @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) + + {{ getFqdnWithoutPort($fqdn) }} + + @endforeach + @endif + @if (data_get($application, 'previews', collect())->count() > 0) + @if (data_get($application, 'build_pack') === 'dockercompose') + @foreach ($application->previews as $preview) + @foreach (collect(json_decode($preview->docker_compose_domains)) as $fqdn) + @if (data_get($fqdn, 'domain')) + @foreach (explode(',', data_get($fqdn, 'domain')) as $domain) + + PR{{ data_get($preview, 'pull_request_id') }} + | + {{ getFqdnWithoutPort($domain) }} + + @endforeach + @endif + @endforeach + @endforeach + @else + @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 @endif - @endforeach - @endif + @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) + + + {{ $server->ip }}:{{ explode(':', $port)[0] }} + + @endforeach + @endif + @endif + @endforeach + @endif +
@else
No links available
@endif diff --git a/resources/views/components/external-link.blade.php b/resources/views/components/external-link.blade.php index ddf03427f..9e68704cd 100644 --- a/resources/views/components/external-link.blade.php +++ b/resources/views/components/external-link.blade.php @@ -1,7 +1,6 @@ -

{{ $exception->getMessage() }}

@else -

The request could not be understood by the server due to +

The request could not be understood by the + server due to malformed syntax.

@endif diff --git a/resources/views/errors/401.blade.php b/resources/views/errors/401.blade.php index e0a44aed8..b9e6afa85 100644 --- a/resources/views/errors/401.blade.php +++ b/resources/views/errors/401.blade.php @@ -3,7 +3,7 @@

401

You shall not pass!

-

You don't have permission to access this page. +

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 f54a2866a..1c792420f 100644 --- a/resources/views/errors/403.blade.php +++ b/resources/views/errors/403.blade.php @@ -3,7 +3,7 @@

403

You shall not pass!

-

You don't have permission to access this page. +

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 569488d19..ace38f1e0 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -3,7 +3,7 @@

404

How did you get here?

-

Sorry, we couldn’t find the page you’re looking +

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 723ba9f55..841da45b1 100644 --- a/resources/views/errors/419.blade.php +++ b/resources/views/errors/419.blade.php @@ -3,7 +3,7 @@

419

This page is definitely old, not like you!

-

Sorry, we couldn’t find the page you’re looking +

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 443244351..8b7477fb5 100644 --- a/resources/views/errors/429.blade.php +++ b/resources/views/errors/429.blade.php @@ -3,7 +3,8 @@

429

Woah, slow down there!

-

You're making too many requests. Please wait a few +

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 cc672a324..da93f7669 100644 --- a/resources/views/errors/500.blade.php +++ b/resources/views/errors/500.blade.php @@ -3,7 +3,8 @@

500

Wait, this is not cool...

-

There has been an error with the following error message:

+

There has been an error with the following + error message:

@if ($exception->getMessage() !== '')
{!! Purify::clean($exception->getMessage()) !!} @@ -13,8 +14,8 @@ Go back home - - Contact support + Contact + support
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php index 668ea5e3a..2f8041134 100644 --- a/resources/views/errors/503.blade.php +++ b/resources/views/errors/503.blade.php @@ -3,14 +3,13 @@

503

We are working on serious things.

-

Service Unavailable. Be right back. Thanks for your +

Service Unavailable. Be right back. Thanks for + your patience.

-
- Contact - support - - -
+ Contact + support + +
diff --git a/resources/views/livewire/settings-dropdown.blade.php b/resources/views/livewire/settings-dropdown.blade.php index 5a703459c..6a462a664 100644 --- a/resources/views/livewire/settings-dropdown.blade.php +++ b/resources/views/livewire/settings-dropdown.blade.php @@ -224,7 +224,8 @@ @if ($showWhatsNewModal) -
+
@@ -296,12 +297,7 @@ target="_blank" class="inline-flex items-center gap-1 hover:text-coolgray-500"> - - - +