diff --git a/app/Http/Livewire/Destination/New/StandaloneDocker.php b/app/Http/Livewire/Destination/New/StandaloneDocker.php index 8e189c912..e43b1df6e 100644 --- a/app/Http/Livewire/Destination/New/StandaloneDocker.php +++ b/app/Http/Livewire/Destination/New/StandaloneDocker.php @@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Collection; use Livewire\Component; use Visus\Cuid2\Cuid2; +use Illuminate\Support\Str; class StandaloneDocker extends Component { @@ -41,7 +42,11 @@ public function mount() } else { $this->network = new Cuid2(7); } - $this->name = generate_random_name(); + $this->name = Str::kebab("{$this->servers->first()->name}-{$this->network}"); + } + public function generate_name() { + $this->server = Server::find($this->server_id); + $this->name = Str::kebab("{$this->server->name}-{$this->network}"); } private function createNetworkAndAttachToProxy() { @@ -50,7 +55,6 @@ private function createNetworkAndAttachToProxy() } public function submit() { - $this->validate(); try { $this->server = Server::find($this->server_id); @@ -73,4 +77,4 @@ public function submit() return general_error_handler(err: $e); } } -} +} \ No newline at end of file diff --git a/app/Http/Livewire/Server/Form.php b/app/Http/Livewire/Server/Form.php index 871102ada..ae7717967 100644 --- a/app/Http/Livewire/Server/Form.php +++ b/app/Http/Livewire/Server/Form.php @@ -14,7 +14,6 @@ class Form extends Component public $dockerVersion; public string|null $wildcard_domain = null; public int $cleanup_after_percentage; - public string|null $modalId = null; protected $rules = [ 'server.name' => 'required|min:6', @@ -37,7 +36,6 @@ class Form extends Component ]; public function mount() { - $this->modalId = new Cuid2(7); $this->wildcard_domain = $this->server->settings->wildcard_domain; $this->cleanup_after_percentage = $this->server->settings->cleanup_after_percentage; } @@ -90,4 +88,4 @@ public function submit() $this->server->save(); $this->emit('success', 'Server updated successfully.'); } -} +} \ No newline at end of file diff --git a/app/View/Components/Forms/Button.php b/app/View/Components/Forms/Button.php index b347fefd1..faa2632b7 100644 --- a/app/View/Components/Forms/Button.php +++ b/app/View/Components/Forms/Button.php @@ -14,10 +14,13 @@ class Button extends Component public function __construct( public bool $disabled = false, public bool $isModal = false, + public bool $noStyle = false, public string|null $modalId = null, public string $defaultClass = "btn btn-primary btn-sm font-normal text-white normal-case no-animation rounded border-none" ) { - // + if ($this->noStyle) { + $this->defaultClass = ""; + } } /** @@ -27,4 +30,4 @@ public function render(): View|Closure|string { return view('components.forms.button'); } -} +} \ No newline at end of file diff --git a/resources/views/components/naked-modal.blade.php b/resources/views/components/naked-modal.blade.php deleted file mode 100644 index 661d1dfeb..000000000 --- a/resources/views/components/naked-modal.blade.php +++ /dev/null @@ -1,42 +0,0 @@ -@props([ - 'show' => null, - 'title' => 'Delete', - 'message' => 'Are you sure you want to delete this?', - 'action' => 'delete', -]) - diff --git a/resources/views/livewire/destination/form.blade.php b/resources/views/livewire/destination/form.blade.php index f87e160df..61b629611 100644 --- a/resources/views/livewire/destination/form.blade.php +++ b/resources/views/livewire/destination/form.blade.php @@ -1,14 +1,17 @@ -
- +
+ + +

This destination will be deleted. It is not reversible.
Please think again.

+ +

Destination

Save - @if ($destination->server->id === 0 && $destination->network !== 'coolify') - + @if ($destination->network !== 'coolify') + Delete @endif diff --git a/resources/views/livewire/destination/new/standalone-docker.blade.php b/resources/views/livewire/destination/new/standalone-docker.blade.php index b367680bb..031ff62d1 100644 --- a/resources/views/livewire/destination/new/standalone-docker.blade.php +++ b/resources/views/livewire/destination/new/standalone-docker.blade.php @@ -6,7 +6,7 @@
- + @foreach ($servers as $server) diff --git a/resources/views/livewire/private-key/change.blade.php b/resources/views/livewire/private-key/change.blade.php index c3700de34..26772c425 100644 --- a/resources/views/livewire/private-key/change.blade.php +++ b/resources/views/livewire/private-key/change.blade.php @@ -1,6 +1,9 @@ -
- +
+ + +

This private key will be deleted. It is not reversible.
Please think again.

+ +

Private Key

@@ -8,7 +11,7 @@ Save @if ($private_key->id > 0) - + Delete @endif diff --git a/resources/views/livewire/project/delete-environment.blade.php b/resources/views/livewire/project/delete-environment.blade.php index 485a6cddb..2e5971130 100644 --- a/resources/views/livewire/project/delete-environment.blade.php +++ b/resources/views/livewire/project/delete-environment.blade.php @@ -1,7 +1,8 @@ -
- - - Delete Environment - +
+ + +

This environment will be deleted. It is not reversible.
Please think again.

+ + + Delete Environment
diff --git a/resources/views/livewire/project/delete-project.blade.php b/resources/views/livewire/project/delete-project.blade.php index 710c47641..59c2b45bd 100644 --- a/resources/views/livewire/project/delete-project.blade.php +++ b/resources/views/livewire/project/delete-project.blade.php @@ -1,7 +1,10 @@ -
- - +
+ + +

This project will be deleted. It is not reversible.
Please think again.

+ + + Delete Project
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php index 19769195e..f96b44c9b 100644 --- a/resources/views/livewire/server/form.blade.php +++ b/resources/views/livewire/server/form.blade.php @@ -1,19 +1,21 @@ -
- +
+

This server will be deleted. It is not reversible.
Please think again..

 - + + +

You could lost a lot of functionalities if you change the server details of the server where Coolify is + running on.
Please think again.

+ + @if ($server->settings->is_reachable) - -

General

@if ($server->id === 0) - Save + Save @else Save @endif @@ -86,7 +88,7 @@ back!
@if ($server->id !== 0 || isDev()) - + Delete @endif diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php index 26620ea0f..41b951e11 100644 --- a/resources/views/livewire/server/proxy.blade.php +++ b/resources/views/livewire/server/proxy.blade.php @@ -1,6 +1,4 @@ -
- +
@if ($server->settings->is_usable) @if ($server->proxy->type)
diff --git a/resources/views/livewire/server/proxy/deploy.blade.php b/resources/views/livewire/server/proxy/deploy.blade.php index 01abbc38c..109fa4a06 100644 --- a/resources/views/livewire/server/proxy/deploy.blade.php +++ b/resources/views/livewire/server/proxy/deploy.blade.php @@ -1,6 +1,14 @@
@if (data_get($server, 'proxy.type')) @if (data_get($server, 'proxy.status') === 'running') + + +

This proxy will be stopped. It is not reversible.
All resources will be unavailable. +
Please think + again. +

+ +
  • -
    + @@ -59,7 +68,9 @@ class="relative text-xs text-white normal-case rounded min-w-max menu bg-coolgra - Stop
    + Stop + +
    • diff --git a/resources/views/livewire/source/github/change.blade.php b/resources/views/livewire/source/github/change.blade.php index e0df502a9..c200cd4a4 100644 --- a/resources/views/livewire/source/github/change.blade.php +++ b/resources/views/livewire/source/github/change.blade.php @@ -1,6 +1,9 @@ -
    - +
    + + +

    This source will be deleted. It is not reversible.
    Please think again.

    +     +

    GitHub App

    @@ -19,16 +22,12 @@ @endif - - Delete - @else Save - - Delete - - @endif + + Delete +
    Your Private GitHub App for private repositories.
    diff --git a/resources/views/livewire/team/delete.blade.php b/resources/views/livewire/team/delete.blade.php index 82c65297f..9d3c449b1 100644 --- a/resources/views/livewire/team/delete.blade.php +++ b/resources/views/livewire/team/delete.blade.php @@ -1,6 +1,9 @@ -
    - +
    + + +

    This team be deleted. It is not reversible.
    Please think again.

    +     +

    Danger Zone

    Woah. I hope you know what are you doing.

    Delete Team

    @@ -8,12 +11,13 @@
    This is the default team. You can't delete it.
    @elseif(auth()->user()->teams()->get()->count() === 1)
    You can't delete your last team.
    - @elseif(auth()->user()->currentTeam()->subscription?->lemon_status !== 'cancelled') + @elseif(auth()->user()->currentTeam()->subscription && + auth()->user()->currentTeam()->subscription?->lemon_status !== 'cancelled')
    Please cancel your subscription before delete this team (Manage My Subscription button).
    @else @if (session('currentTeam')->isEmpty())
    This will delete your team. Beware! There is no coming back!
    - + Delete @else