From 5ee29c6072cb69472b8d98bc552858f679d398e3 Mon Sep 17 00:00:00 2001 From: Ray Berger Date: Sun, 7 Jan 2024 22:32:54 +0000 Subject: [PATCH 1/2] fix typos --- app/Console/Commands/Init.php | 36 +++++++++---------- app/Livewire/Project/Application/General.php | 2 +- app/Models/Server.php | 4 +-- app/Notifications/Channels/EmailChannel.php | 10 +++--- .../views/components/pricing-plans.blade.php | 4 +-- .../resources/breadcrumbs.blade.php | 2 +- .../emails/s3-connection-error.blade.php | 2 +- .../notifications/email-settings.blade.php | 2 +- .../project/application/previews.blade.php | 2 +- .../project/new/docker-compose.blade.php | 4 +-- .../project/shared/destination.blade.php | 2 +- .../views/livewire/settings/email.blade.php | 2 +- scripts/install.sh | 2 +- templates/compose/appwrite.yaml | 2 +- templates/compose/embystat.yaml | 2 +- templates/service-templates.json | 2 +- 16 files changed, 40 insertions(+), 40 deletions(-) diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php index b0073e1f0..8903b435f 100644 --- a/app/Console/Commands/Init.php +++ b/app/Console/Commands/Init.php @@ -142,83 +142,83 @@ class Init extends Command try { $applications = Application::withTrashed()->whereNotNull('deleted_at')->get(); foreach ($applications as $application) { - echo "Deleting stucked application: {$application->name}\n"; + echo "Deleting stuck application: {$application->name}\n"; $application->forceDelete(); } } catch (\Throwable $e) { - echo "Error in cleaning stucked application: {$e->getMessage()}\n"; + echo "Error in cleaning stuck application: {$e->getMessage()}\n"; } try { $postgresqls = StandalonePostgresql::withTrashed()->whereNotNull('deleted_at')->get(); foreach ($postgresqls as $postgresql) { - echo "Deleting stucked postgresql: {$postgresql->name}\n"; + echo "Deleting stuck postgresql: {$postgresql->name}\n"; $postgresql->forceDelete(); } } catch (\Throwable $e) { - echo "Error in cleaning stucked postgresql: {$e->getMessage()}\n"; + echo "Error in cleaning stuck postgresql: {$e->getMessage()}\n"; } try { $redis = StandaloneRedis::withTrashed()->whereNotNull('deleted_at')->get(); foreach ($redis as $redis) { - echo "Deleting stucked redis: {$redis->name}\n"; + echo "Deleting stuck redis: {$redis->name}\n"; $redis->forceDelete(); } } catch (\Throwable $e) { - echo "Error in cleaning stucked redis: {$e->getMessage()}\n"; + echo "Error in cleaning stuck redis: {$e->getMessage()}\n"; } try { $mongodbs = StandaloneMongodb::withTrashed()->whereNotNull('deleted_at')->get(); foreach ($mongodbs as $mongodb) { - echo "Deleting stucked mongodb: {$mongodb->name}\n"; + echo "Deleting stuck mongodb: {$mongodb->name}\n"; $mongodb->forceDelete(); } } catch (\Throwable $e) { - echo "Error in cleaning stucked mongodb: {$e->getMessage()}\n"; + echo "Error in cleaning stuck mongodb: {$e->getMessage()}\n"; } try { $mysqls = StandaloneMysql::withTrashed()->whereNotNull('deleted_at')->get(); foreach ($mysqls as $mysql) { - echo "Deleting stucked mysql: {$mysql->name}\n"; + echo "Deleting stuck mysql: {$mysql->name}\n"; $mysql->forceDelete(); } } catch (\Throwable $e) { - echo "Error in cleaning stucked mysql: {$e->getMessage()}\n"; + echo "Error in cleaning stuck mysql: {$e->getMessage()}\n"; } try { $mariadbs = StandaloneMariadb::withTrashed()->whereNotNull('deleted_at')->get(); foreach ($mariadbs as $mariadb) { - echo "Deleting stucked mariadb: {$mariadb->name}\n"; + echo "Deleting stuck mariadb: {$mariadb->name}\n"; $mariadb->forceDelete(); } } catch (\Throwable $e) { - echo "Error in cleaning stucked mariadb: {$e->getMessage()}\n"; + echo "Error in cleaning stuck mariadb: {$e->getMessage()}\n"; } try { $services = Service::withTrashed()->whereNotNull('deleted_at')->get(); foreach ($services as $service) { - echo "Deleting stucked service: {$service->name}\n"; + echo "Deleting stuck service: {$service->name}\n"; $service->forceDelete(); } } catch (\Throwable $e) { - echo "Error in cleaning stucked service: {$e->getMessage()}\n"; + echo "Error in cleaning stuck service: {$e->getMessage()}\n"; } try { $serviceApps = ServiceApplication::withTrashed()->whereNotNull('deleted_at')->get(); foreach ($serviceApps as $serviceApp) { - echo "Deleting stucked serviceapp: {$serviceApp->name}\n"; + echo "Deleting stuck serviceapp: {$serviceApp->name}\n"; $serviceApp->forceDelete(); } } catch (\Throwable $e) { - echo "Error in cleaning stucked serviceapp: {$e->getMessage()}\n"; + echo "Error in cleaning stuck serviceapp: {$e->getMessage()}\n"; } try { $serviceDbs = ServiceDatabase::withTrashed()->whereNotNull('deleted_at')->get(); foreach ($serviceDbs as $serviceDb) { - echo "Deleting stucked serviceapp: {$serviceDb->name}\n"; + echo "Deleting stuck serviceapp: {$serviceDb->name}\n"; $serviceDb->forceDelete(); } } catch (\Throwable $e) { - echo "Error in cleaning stucked serviceapp: {$e->getMessage()}\n"; + echo "Error in cleaning stuck serviceapp: {$e->getMessage()}\n"; } // Cleanup any resources that are not attached to any environment or destination or server diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php index f54a46e09..919167afe 100644 --- a/app/Livewire/Project/Application/General.php +++ b/app/Livewire/Project/Application/General.php @@ -201,7 +201,7 @@ class General extends Component public function updatedApplicationFqdn() { $this->resetDefaultLabels(false); - $this->dispatch('success', 'Labels reseted to default!'); + $this->dispatch('success', 'Labels reset to default!'); } public function submit($showToaster = true) { diff --git a/app/Models/Server.php b/app/Models/Server.php index 291a9d479..e8e0332e0 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -358,9 +358,9 @@ class Server extends BaseModel public function validateOS(): bool | Stringable { $os_release = instant_remote_process(['cat /etc/os-release'], $this); - $datas = collect(explode("\n", $os_release)); + $data = collect(explode("\n", $os_release)); $collectedData = collect([]); - foreach ($datas as $data) { + foreach ($data as $data) { $item = Str::of($data)->trim(); $collectedData->put($item->before('=')->value(), $item->after('=')->lower()->replace('"', '')->value()); } diff --git a/app/Notifications/Channels/EmailChannel.php b/app/Notifications/Channels/EmailChannel.php index 99afcf5a7..da8ef812e 100644 --- a/app/Notifications/Channels/EmailChannel.php +++ b/app/Notifications/Channels/EmailChannel.php @@ -14,8 +14,8 @@ class EmailChannel { try { $this->bootConfigs($notifiable); - $recepients = $notifiable->getRecepients($notification); - if (count($recepients) === 0) { + $recipients = $notifiable->getRecepients($notification); + if (count($recipients) === 0) { throw new Exception('No email recipients found'); } @@ -24,7 +24,7 @@ class EmailChannel [], [], fn (Message $message) => $message - ->to($recepients) + ->to($recipients) ->subject($mailMessage->subject) ->html((string)$mailMessage->render()) ); @@ -35,8 +35,8 @@ class EmailChannel } ray($e->getMessage()); $message = "EmailChannel error: {$e->getMessage()}. Failed to send email to:"; - if (isset($recepients)) { - $message .= implode(', ', $recepients); + if (isset($recipients)) { + $message .= implode(', ', $recipients); } if (isset($mailMessage)) { $message .= " with subject: {$mailMessage->subject}"; diff --git a/resources/views/components/pricing-plans.blade.php b/resources/views/components/pricing-plans.blade.php index 7837bc0f5..3b37f6ef1 100644 --- a/resources/views/components/pricing-plans.blade.php +++ b/resources/views/components/pricing-plans.blade.php @@ -302,7 +302,7 @@
Once you connected your server, Coolify will start managing it and do a - lot of adminstrative tasks for you. You can also write your own scripts to + lot of administrative tasks for you. You can also write your own scripts to automate your server*.
@@ -384,7 +384,7 @@
Powerful API
- Programatically deploy, query, and manage your servers & resources. + Programmatically deploy, query, and manage your servers & resources. Integrate to your CI/CD pipelines, or build your own custom integrations. *
diff --git a/resources/views/components/resources/breadcrumbs.blade.php b/resources/views/components/resources/breadcrumbs.blade.php index b7e24eb61..8291fd904 100644 --- a/resources/views/components/resources/breadcrumbs.blade.php +++ b/resources/views/components/resources/breadcrumbs.blade.php @@ -1,7 +1,7 @@