From 2976c72e0900d69cedea10ce3cb22cfa91446c54 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 7 Nov 2023 10:18:28 +0100 Subject: [PATCH] fix: ui --- app/Http/Livewire/Project/Service/Navbar.php | 8 ++++++-- resources/views/components/services/navbar.blade.php | 4 ++-- resources/views/livewire/project/service/index.blade.php | 2 +- templates/compose/gitea-with-mariadb.yaml | 6 +++--- templates/compose/gitea-with-mysql.yaml | 6 +++--- templates/compose/gitea-with-postgresql.yaml | 6 +++--- templates/compose/gitea.yaml | 2 ++ templates/service-templates.json | 8 ++++---- 8 files changed, 24 insertions(+), 18 deletions(-) diff --git a/app/Http/Livewire/Project/Service/Navbar.php b/app/Http/Livewire/Project/Service/Navbar.php index 23ad062a5..1953605e6 100644 --- a/app/Http/Livewire/Project/Service/Navbar.php +++ b/app/Http/Livewire/Project/Service/Navbar.php @@ -27,11 +27,15 @@ class Navbar extends Component $activity = StartService::run($this->service); $this->emit('newMonitorActivity', $activity->id); } - public function stop() + public function stop(bool $forceCleanup = false) { StopService::run($this->service); $this->service->refresh(); - $this->emit('success', 'Service stopped successfully.'); + if ($forceCleanup) { + $this->emit('success', 'Force cleanup service successfully.'); + } else { + $this->emit('success', 'Service stopped successfully.'); + } $this->emit('checkStatus'); } } diff --git a/resources/views/components/services/navbar.blade.php b/resources/views/components/services/navbar.blade.php index 43e16c3df..1d0cf03a5 100644 --- a/resources/views/components/services/navbar.blade.php +++ b/resources/views/components/services/navbar.blade.php @@ -38,13 +38,13 @@ @endif @if (serviceStatus($service) === 'exited') -