diff --git a/resources/views/components/domain-conflict-modal.blade.php b/resources/views/components/domain-conflict-modal.blade.php index 218a7ef16..fe55a8ba5 100644 --- a/resources/views/components/domain-conflict-modal.blade.php +++ b/resources/views/components/domain-conflict-modal.blade.php @@ -30,14 +30,12 @@ class="flex absolute top-2 right-2 justify-center items-center w-8 h-8 rounded-f
- + + The following domain(s) are already in use by other resources. Using the same domain for + multiple resources can cause routing conflicts and unpredictable behavior. +
-

Conflicting Resources:

- +
-
-

Actions

-
@foreach ($checkboxes as $index => $checkbox)
- + + {!! $warningMessage ?: 'This operation is permanent and cannot be undone. Please think again before proceeding!' !!} +
The following actions will be performed:
    @foreach ($actions as $action) @@ -325,10 +320,9 @@ class="w-auto" isError @if (!$disableTwoStepConfirmation)
    - + + Please enter your password to confirm this destructive action. +
    @php $passwordConfirm = Str::uuid(); diff --git a/resources/views/livewire/destination/new/docker.blade.php b/resources/views/livewire/destination/new/docker.blade.php index 795b33e81..953c4d42e 100644 --- a/resources/views/livewire/destination/new/docker.blade.php +++ b/resources/views/livewire/destination/new/docker.blade.php @@ -18,8 +18,7 @@
    @else -
    -

    You don't have permission to create new destinations.

    -

    Please contact your team administrator for access.

    -
    + + You don't have permission to create new destinations. Please contact your team administrator for access. + @endcan diff --git a/resources/views/livewire/project/shared/danger.blade.php b/resources/views/livewire/project/shared/danger.blade.php index 3562caa02..11afe0b41 100644 --- a/resources/views/livewire/project/shared/danger.blade.php +++ b/resources/views/livewire/project/shared/danger.blade.php @@ -11,17 +11,8 @@ confirmationLabel="Please confirm the execution of the actions by entering the Resource Name below" shortConfirmationLabel="Resource Name" /> @else -
    - - - -
    -
    Insufficient Permissions
    -
    You don't have permission to delete this resource. - Contact your team administrator for access.
    -
    -
    + + You don't have permission to delete this resource. Contact your team administrator for access. + @endif
    diff --git a/resources/views/livewire/project/shared/destination.blade.php b/resources/views/livewire/project/shared/destination.blade.php index 245449557..68ae44dc0 100644 --- a/resources/views/livewire/project/shared/destination.blade.php +++ b/resources/views/livewire/project/shared/destination.blade.php @@ -80,21 +80,11 @@ class="absolute bg-error -top-1 -left-1 badge ">
@if ($resource->persistentStorages()->count() > 0)

Add another server

-
-
- -
-

Cannot add additional - servers

-

- This application has persistent storage volumes configured. Applications with persistent - storage cannot be deployed to multiple servers as the storage would not be accessible - across different servers. -

-
-
-
+ + This application has persistent storage volumes configured. Applications with persistent + storage cannot be deployed to multiple servers as the storage would not be accessible + across different servers. + @elseif (count($networks) > 0)

Add another server

diff --git a/resources/views/livewire/project/shared/resource-operations.blade.php b/resources/views/livewire/project/shared/resource-operations.blade.php index aa8f536ce..be7cbd7dc 100644 --- a/resources/views/livewire/project/shared/resource-operations.blade.php +++ b/resources/views/livewire/project/shared/resource-operations.blade.php @@ -28,13 +28,9 @@ @endforeach @endforeach @else -
-
- Access Restricted: You don't have permission to clone resources. Contact your team - administrator to request access. -
-
+ + You don't have permission to clone resources. Contact your team administrator to request access. + @endcan
@@ -71,13 +67,9 @@ class="font-bold dark:text-warning">{{ $resource->environment->project->name }}
No projects found to move to
@endforelse @else -
-
- Access Restricted: You don't have permission to move resources between projects or - environments. Contact your team administrator to request access. -
-
+ + You don't have permission to move resources between projects or environments. Contact your team administrator to request access. + @endcan
diff --git a/resources/views/livewire/project/shared/tags.blade.php b/resources/views/livewire/project/shared/tags.blade.php index 2c75deab9..85208b75b 100644 --- a/resources/views/livewire/project/shared/tags.blade.php +++ b/resources/views/livewire/project/shared/tags.blade.php @@ -10,12 +10,9 @@ Add @else -
-
- Access Restricted: You don't have permission to manage tags. Contact your team - administrator to request access. -
-
+ + You don't have permission to manage tags. Contact your team administrator to request access. + @endcan @if (data_get($this->resource, 'tags') && count(data_get($this->resource, 'tags')) > 0)

Assigned Tags

diff --git a/resources/views/livewire/project/shared/webhooks.blade.php b/resources/views/livewire/project/shared/webhooks.blade.php index f3403a402..ede1725b1 100644 --- a/resources/views/livewire/project/shared/webhooks.blade.php +++ b/resources/views/livewire/project/shared/webhooks.blade.php @@ -73,7 +73,9 @@ @endcan @else - You are using an official Git App. You do not need manual webhooks. + + You are using an official Git App. You do not need manual webhooks. + @endif
@endif diff --git a/resources/views/livewire/server/cloudflare-tunnel.blade.php b/resources/views/livewire/server/cloudflare-tunnel.blade.php index ce1cb7e58..a56d77926 100644 --- a/resources/views/livewire/server/cloudflare-tunnel.blade.php +++ b/resources/views/livewire/server/cloudflare-tunnel.blade.php @@ -23,15 +23,11 @@ class="px-2 py-1 text-xs font-semibold text-green-800 bg-green-100 rounded dark:
@if ($isCloudflareTunnelsEnabled)
-
-

Warning!

-

If you disable Cloudflare Tunnel, you will need to update the server's IP address back - to - its real IP address in the server "General" settings. The server may become inaccessible - if the IP - address is not updated correctly.

-
+ + If you disable Cloudflare Tunnel, you will need to update the server's IP address back + to its real IP address in the server "General" settings. The server may become inaccessible + if the IP address is not updated correctly. +
@if ($server->ip_previous) + To automatically configure Cloudflare Tunnel, please - validate your server first. Then you will need a Cloudflare token and an SSH + validate your server first. Then you will need a Cloudflare token and an SSH domain configured.
To manually configure Cloudflare Tunnel, please @@ -72,8 +67,8 @@ class="p-4 mb-4 w-full text-sm text-yellow-800 bg-yellow-100 rounded-sm dark:bg-

For more information, please read our documentation. -
+ class="underline">documentation. + @endif @if (!$isCloudflareTunnelsEnabled && $server->isFunctional())
@@ -97,10 +92,9 @@ class="flex flex-col gap-2 w-full"> Continue @else -
+ You don't have permission to configure Cloudflare Tunnel for this server. -
+ @endcan
@script @@ -128,10 +122,9 @@ class="p-4 mb-4 text-sm text-yellow-800 bg-yellow-100 rounded-sm dark:bg-yellow- confirmationLabel="Please type the confirmation text to confirm that you manually configured Cloudflare Tunnel." shortConfirmationLabel="Confirmation text" /> @else -
+ You don't have permission to configure Cloudflare Tunnel for this server. -
+ @endcan
@endif diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php index c40bdd31b..c46a114d8 100644 --- a/resources/views/livewire/server/proxy.blade.php +++ b/resources/views/livewire/server/proxy.blade.php @@ -119,10 +119,9 @@ --}}
@else -
+ You don't have permission to configure proxy settings for this server. -
+ @endcan @endif diff --git a/resources/views/livewire/server/show.blade.php b/resources/views/livewire/server/show.blade.php index 29eacf627..a25e245e9 100644 --- a/resources/views/livewire/server/show.blade.php +++ b/resources/views/livewire/server/show.blade.php @@ -62,9 +62,10 @@ class="mt-8 mb-4 w-full font-bold box-without-bg bg-coollabs hover:bg-coollabs-1 @endif @if ($server->isForceDisabled() && isCloud()) -
The system has disabled the server because you have - exceeded the - number of servers for which you have paid.
+ + The system has disabled the server because you have exceeded the + number of servers for which you have paid. + @endif
diff --git a/resources/views/livewire/settings/advanced.blade.php b/resources/views/livewire/settings/advanced.blade.php index b68370a09..65d7181c6 100644 --- a/resources/views/livewire/settings/advanced.blade.php +++ b/resources/views/livewire/settings/advanced.blade.php @@ -66,12 +66,10 @@ confirmationLabel="Please type the confirmation text to disable two step confirmation." shortConfirmationLabel="Confirmation text" />
-
-

Warning!

-

Disabling two step confirmation reduces security (as anyone can easily delete anything) and - increases - the risk of accidental actions. This is not recommended for production servers.

-
+ + Disabling two step confirmation reduces security (as anyone can easily delete anything) and + increases the risk of accidental actions. This is not recommended for production servers. + @endif
diff --git a/resources/views/livewire/source/github/change.blade.php b/resources/views/livewire/source/github/change.blade.php index ba610eacd..e4d5e5228 100644 --- a/resources/views/livewire/source/github/change.blade.php +++ b/resources/views/livewire/source/github/change.blade.php @@ -269,19 +269,9 @@ class="" helper="Necessary for adding Github Runners to repositories.

Administration: read & write" /> --}} @else -
- - - -
-
Insufficient Permissions
-
You don't have permission to create - new GitHub Apps. Please contact your team administrator.
-
-
+ + You don't have permission to create new GitHub Apps. Please contact your team administrator. + @endcan diff --git a/resources/views/livewire/source/github/create.blade.php b/resources/views/livewire/source/github/create.blade.php index 154e93a27..f47575784 100644 --- a/resources/views/livewire/source/github/create.blade.php +++ b/resources/views/livewire/source/github/create.blade.php @@ -52,8 +52,7 @@ class="flex items-center justify-between w-full px-1 py-2 text-left select-none @else -
-

You don't have permission to create new GitHub Apps.

-

Please contact your team administrator for access.

-
+ + You don't have permission to create new GitHub Apps. Please contact your team administrator for access. + @endcan diff --git a/resources/views/livewire/storage/create.blade.php b/resources/views/livewire/storage/create.blade.php index 735e040eb..d4a12cf4b 100644 --- a/resources/views/livewire/storage/create.blade.php +++ b/resources/views/livewire/storage/create.blade.php @@ -24,8 +24,7 @@ @else -
-

You don't have permission to create new S3 storage configurations.

-

Please contact your team administrator for access.

-
+ + You don't have permission to create new S3 storage configurations. Please contact your team administrator for access. + @endcan diff --git a/resources/views/livewire/subscription/actions.blade.php b/resources/views/livewire/subscription/actions.blade.php index e54cb0bd4..516a57dd3 100644 --- a/resources/views/livewire/subscription/actions.blade.php +++ b/resources/views/livewire/subscription/actions.blade.php @@ -26,10 +26,11 @@
{{ currentTeam()->servers->count() }}
@if (currentTeam()->serverOverflow()) -
WARNING: You must delete - {{ currentTeam()->servers->count() - $server_limits }} servers, + + You must delete {{ currentTeam()->servers->count() - $server_limits }} servers, or upgrade your subscription. {{ currentTeam()->servers->count() - $server_limits }} servers will be - deactivated.
+ deactivated. + @endif Change Server Quantity diff --git a/resources/views/livewire/subscription/index.blade.php b/resources/views/livewire/subscription/index.blade.php index 0ca786988..d1d933e04 100644 --- a/resources/views/livewire/subscription/index.blade.php +++ b/resources/views/livewire/subscription/index.blade.php @@ -55,10 +55,10 @@

Subscription

-
You are not an admin so you cannot manage your Team's subscription. If this does not make sense, please - contact - us. -
+ + You are not an admin so you cannot manage your Team's subscription. If this does not make sense, please + contact us. + @endif