From 9ad6ce5851c721da9d1fcae171daed48bec05d6b Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 25 Mar 2024 11:33:38 +0100 Subject: [PATCH] ui ui ui ui --- .../Project/Service/Configuration.php | 24 +++++++++++ app/Models/ServiceApplication.php | 5 +++ app/Models/ServiceDatabase.php | 5 +++ resources/css/app.css | 4 +- resources/views/components/helper.blade.php | 2 +- .../components/modal-confirmation.blade.php | 8 ++-- resources/views/components/navbar.blade.php | 25 +++++------ .../views/components/slide-over.blade.php | 2 +- resources/views/livewire/dashboard.blade.php | 1 - .../livewire/destination/new/docker.blade.php | 2 +- .../views/livewire/destination/show.blade.php | 12 ++---- .../project/add-environment.blade.php | 4 +- .../database/backup/execution.blade.php | 10 ----- .../project/database/backup/index.blade.php | 22 ++-------- .../project/database/configuration.blade.php | 10 ----- .../create-scheduled-backup.blade.php | 4 +- .../project/database/heading.blade.php | 2 +- .../database/postgresql/general.blade.php | 26 +++++------- .../database/scheduled-backups.blade.php | 18 ++++---- .../views/livewire/project/edit.blade.php | 19 ++++----- .../project/environment-edit.blade.php | 14 ++----- .../views/livewire/project/index.blade.php | 2 +- .../project/service/configuration.blade.php | 33 ++++++--------- .../livewire/project/service/index.blade.php | 11 ++--- .../project/service/stack-form.blade.php | 12 ++---- .../project/service/storage.blade.php | 10 ++--- .../shared/environment-variable/add.blade.php | 4 +- .../shared/environment-variable/all.blade.php | 10 ++--- .../shared/scheduled-task/add.blade.php | 4 +- .../shared/scheduled-task/all.blade.php | 31 ++++++-------- .../project/shared/storages/add.blade.php | 2 +- .../views/livewire/project/show.blade.php | 13 ++---- .../dynamic-configuration-navbar.blade.php | 13 ++---- .../proxy/dynamic-configurations.blade.php | 17 ++++---- .../proxy/new-dynamic-configuration.blade.php | 4 +- .../server/show-private-key.blade.php | 21 ++++------ .../livewire/source/github/create.blade.php | 42 +++++++++---------- .../team-shared-variables-index.blade.php | 11 ++--- .../livewire/team/storage/index.blade.php | 11 ++--- .../security/private-key/index.blade.php | 11 ++--- resources/views/source/all.blade.php | 11 ++--- 41 files changed, 203 insertions(+), 289 deletions(-) diff --git a/app/Livewire/Project/Service/Configuration.php b/app/Livewire/Project/Service/Configuration.php index eb72c803c..cdedb3f8e 100644 --- a/app/Livewire/Project/Service/Configuration.php +++ b/app/Livewire/Project/Service/Configuration.php @@ -36,6 +36,30 @@ public function mount() $this->applications = $this->service->applications->sort(); $this->databases = $this->service->databases->sort(); } + public function restartApplication($id) + { + try { + $application = $this->service->applications->find($id); + if ($application) { + $application->restart(); + $this->dispatch('success', 'Application restarted successfully.'); + } + } catch (\Exception $e) { + return handleError($e, $this); + } + } + public function restartDatabase($id) + { + try { + $database = $this->service->databases->find($id); + if ($database) { + $database->restart(); + $this->dispatch('success', 'Database restarted successfully.'); + } + } catch (\Exception $e) { + return handleError($e, $this); + } + } public function check_status() { try { diff --git a/app/Models/ServiceApplication.php b/app/Models/ServiceApplication.php index 37f7d9c9c..820ef6fee 100644 --- a/app/Models/ServiceApplication.php +++ b/app/Models/ServiceApplication.php @@ -19,6 +19,11 @@ protected static function booted() $service->fileStorages()->delete(); }); } + public function restart() + { + $container_id = $this->name . '-' . $this->service->uuid; + instant_remote_process(["docker restart {$container_id}"], $this->service->server); + } public function isLogDrainEnabled() { return data_get($this, 'is_log_drain_enabled', false); diff --git a/app/Models/ServiceDatabase.php b/app/Models/ServiceDatabase.php index 9375fe807..9e9e9d202 100644 --- a/app/Models/ServiceDatabase.php +++ b/app/Models/ServiceDatabase.php @@ -17,6 +17,11 @@ protected static function booted() $service->fileStorages()->delete(); }); } + public function restart() + { + $container_id = $this->name . '-' . $this->service->uuid; + remote_process(["docker restart {$container_id}"], $this->service->server); + } public function isLogDrainEnabled() { return data_get($this, 'is_log_drain_enabled', false); diff --git a/resources/css/app.css b/resources/css/app.css index efeb4af7c..f03e7e850 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -41,7 +41,7 @@ option { } .button { - @apply flex items-center justify-center gap-2 px-3 py-1 text-sm font-normal normal-case rounded cursor-pointer bg-neutral-200 hover:bg-neutral-300 dark:bg-coolgray-200 dark:text-white dark:hover:bg-coolgray-100 dark:hover:dark:text-white dark:disabled:bg-coolgray-100/40 dark:disabled:text-neutral-800 min-w-fit hover:dark:text-white focus-visible:outline-none; + @apply flex items-center justify-center gap-2 px-3 py-1 text-sm font-normal normal-case rounded cursor-pointer bg-neutral-200 hover:bg-neutral-300 dark:bg-coolgray-200 dark:text-white dark:hover:bg-coolgray-100 dark:hover:dark:text-white dark:disabled:bg-coolgray-100/40 dark:disabled:text-neutral-800 disabled:bg-neutral-100 disabled:text-neutral-200 disabled:cursor-not-allowed min-w-fit hover:dark:text-white focus:outline-1 ; } button[isError]:not(:disabled) { @@ -195,7 +195,7 @@ .on-box { } .box-without-bg { - @apply flex p-2 transition-colors dark:hover:text-white hover:no-underline min-h-[4rem] dark:border-black border-neutral-200; + @apply flex p-2 transition-colors dark:hover:text-white hover:no-underline min-h-[4rem]; } .box-title { diff --git a/resources/views/components/helper.blade.php b/resources/views/components/helper.blade.php index 378892b85..43c49491d 100644 --- a/resources/views/components/helper.blade.php +++ b/resources/views/components/helper.blade.php @@ -1,4 +1,4 @@ -
+
merge(['class' => "group"]) }}>
@else @if ($disabled) @if ($buttonFullWidth) - + {{ $buttonTitle }} @else - + {{ $buttonTitle }} @endif @@ -36,11 +36,11 @@ class="relative w-auto h-auto"> @endif @else @if ($buttonFullWidth) - + {{ $buttonTitle }} @else - + {{ $buttonTitle }} @endif diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php index 6ecc2e70b..3c90651dd 100644 --- a/resources/views/components/navbar.blade.php +++ b/resources/views/components/navbar.blade.php @@ -57,18 +57,7 @@ class="{{ request()->is('server/*') || request()->is('servers') ? 'menu-item men Servers -
  • - - - - - Security - -
    • +
  • + + + + Keys & Tokens + +
  • + class="fixed inset-0 dark:bg-black/60 backdrop-blur-sm">
    • diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php index bab6156ec..a53b06882 100644 --- a/resources/views/livewire/dashboard.blade.php +++ b/resources/views/livewire/dashboard.blade.php @@ -20,7 +20,6 @@
    @foreach ($projects as $project)
    - @if (data_get($project, 'environments')->count() === 1) diff --git a/resources/views/livewire/destination/new/docker.blade.php b/resources/views/livewire/destination/new/docker.blade.php index 894ed2cb1..d05218def 100644 --- a/resources/views/livewire/destination/new/docker.blade.php +++ b/resources/views/livewire/destination/new/docker.blade.php @@ -1,4 +1,4 @@ -
    +
    Destinations are used to segregate resources by network.
    diff --git a/resources/views/livewire/destination/show.blade.php b/resources/views/livewire/destination/show.blade.php index a73c8aceb..ecc68dc5c 100644 --- a/resources/views/livewire/destination/show.blade.php +++ b/resources/views/livewire/destination/show.blade.php @@ -2,15 +2,9 @@ @if ($server->isFunctional())

    Destinations

    - - New Destination - - - - - - + + + Scan Destinations
    Destinations are used to segregate resources by network.
    diff --git a/resources/views/livewire/project/add-environment.blade.php b/resources/views/livewire/project/add-environment.blade.php index 80a1047b6..01b56102a 100644 --- a/resources/views/livewire/project/add-environment.blade.php +++ b/resources/views/livewire/project/add-environment.blade.php @@ -1,5 +1,5 @@ - - + + Save diff --git a/resources/views/livewire/project/database/backup/execution.blade.php b/resources/views/livewire/project/database/backup/execution.blade.php index f63ed2be7..9a9a8733c 100644 --- a/resources/views/livewire/project/database/backup/execution.blade.php +++ b/resources/views/livewire/project/database/backup/execution.blade.php @@ -1,16 +1,6 @@

    Backups

    - - - - - - - Close - - -
    diff --git a/resources/views/livewire/project/database/backup/index.blade.php b/resources/views/livewire/project/database/backup/index.blade.php index 3538c6688..e26a28c3a 100644 --- a/resources/views/livewire/project/database/backup/index.blade.php +++ b/resources/views/livewire/project/database/backup/index.blade.php @@ -1,28 +1,12 @@

    Backups

    - - - - - - - - Close - - -

    Scheduled Backups

    - - New Scheduled Backup - - - - - + + +
    diff --git a/resources/views/livewire/project/database/configuration.blade.php b/resources/views/livewire/project/database/configuration.blade.php index 1cb43d939..725fb1233 100644 --- a/resources/views/livewire/project/database/configuration.blade.php +++ b/resources/views/livewire/project/database/configuration.blade.php @@ -1,16 +1,6 @@

    Configuration

    - - - - - - - Close - - -
    - + + @if ($s3s->count() === 0) diff --git a/resources/views/livewire/project/database/heading.blade.php b/resources/views/livewire/project/database/heading.blade.php index ada627c19..f4eadd6bf 100644 --- a/resources/views/livewire/project/database/heading.blade.php +++ b/resources/views/livewire/project/database/heading.blade.php @@ -3,7 +3,7 @@ Database Startup Logs - +
    diff --git a/resources/views/livewire/project/database/postgresql/general.blade.php b/resources/views/livewire/project/database/postgresql/general.blade.php index 7c38a9da9..8f6237b2e 100644 --- a/resources/views/livewire/project/database/postgresql/general.blade.php +++ b/resources/views/livewire/project/database/postgresql/general.blade.php @@ -82,21 +82,17 @@

    Initialization scripts

    - - New Init Script - - - - - - Save - - - - - + +
    + + + + Save + + +
    @forelse(data_get($database,'init_scripts', []) as $script) diff --git a/resources/views/livewire/project/database/scheduled-backups.blade.php b/resources/views/livewire/project/database/scheduled-backups.blade.php index dd06c6819..10736c381 100644 --- a/resources/views/livewire/project/database/scheduled-backups.blade.php +++ b/resources/views/livewire/project/database/scheduled-backups.blade.php @@ -2,12 +2,14 @@
    @forelse($database->scheduledBackups as $backup) @if ($type == 'database') - -
    Frequency: {{ $backup->frequency }}
    -
    Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}
    -
    Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}
    -     +
    + +
    Frequency: {{ $backup->frequency }}
    +
    Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}
    +
    Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}
    +     +
    @else
    @@ -25,8 +27,8 @@
    @if ($type === 'service-database' && $selectedBackup)
    - +

    Executions

    diff --git a/resources/views/livewire/project/edit.blade.php b/resources/views/livewire/project/edit.blade.php index aee64bdde..e291446f3 100644 --- a/resources/views/livewire/project/edit.blade.php +++ b/resources/views/livewire/project/edit.blade.php @@ -16,18 +16,15 @@

    Shared Variables

    - - New Shared Variable - - - - - + + +
    -
    You can use these variables anywhere with @{{ project.VARIABLENAME }} +
    +
    You can use these variables anywhere with
    +
    @{{ project.VARIABLENAME }}
    +
    @forelse ($project->environment_variables->sort()->sortBy('real_value') as $env) diff --git a/resources/views/livewire/project/environment-edit.blade.php b/resources/views/livewire/project/environment-edit.blade.php index b61bc5c65..59dd922ea 100644 --- a/resources/views/livewire/project/environment-edit.blade.php +++ b/resources/views/livewire/project/environment-edit.blade.php @@ -44,18 +44,12 @@

    Shared Variables

    - - New Shared Variable - - - - - + + +
    You can use these variables anywhere with @{{environment.VARIABLENAME}} + helper="More info here.">
    @forelse ($environment->environment_variables->sort()->sortBy('real_value') as $env) diff --git a/resources/views/livewire/project/index.blade.php b/resources/views/livewire/project/index.blade.php index 8cce07023..bb8e8c1c3 100644 --- a/resources/views/livewire/project/index.blade.php +++ b/resources/views/livewire/project/index.blade.php @@ -17,7 +17,7 @@ {{ $project->description }}
    - Settings diff --git a/resources/views/livewire/project/service/configuration.blade.php b/resources/views/livewire/project/service/configuration.blade.php index 6220bc2a4..8107b0492 100644 --- a/resources/views/livewire/project/service/configuration.blade.php +++ b/resources/views/livewire/project/service/configuration.blade.php @@ -75,17 +75,14 @@
    {{ $application->status }}
    - - - - - - + Settings + + This application will be unavailable during the restart.
    Please think again. +
    @@ -100,8 +97,6 @@ $database->status)->contains(['restarting']), 'flex gap-2 box-without-bg bg-coolgray-100 hover:text-neutral-300 group', ])> - -
    @@ -121,17 +116,15 @@
    {{ $database->status }}
    - - - - - - + Settings + + This database will be unavailable during the restart.
    Please think again. +     +
    diff --git a/resources/views/livewire/project/service/index.blade.php b/resources/views/livewire/project/service/index.blade.php index d51234983..eefa25692 100644 --- a/resources/views/livewire/project/service/index.blade.php +++ b/resources/views/livewire/project/service/index.blade.php @@ -55,14 +55,9 @@

    Scheduled Backups

    - - New Scheduled Backup - - - - - + + +
    diff --git a/resources/views/livewire/project/service/stack-form.blade.php b/resources/views/livewire/project/service/stack-form.blade.php index 0606234d6..b3f88c927 100644 --- a/resources/views/livewire/project/service/stack-form.blade.php +++ b/resources/views/livewire/project/service/stack-form.blade.php @@ -3,13 +3,9 @@

    Service Stack

    Save - - Docker Compose - - - - - + + +
    Configuration
    @@ -19,7 +15,7 @@
    + helper="By default, you do not reach the Coolify defined networks.
    Starting a docker compose based resource will have an internal network.
    If you connect to a Coolify defined network, you maybe need to use different internal DNS names to connect to a resource.

    For more information, check this." />
    @if ($fields)
    diff --git a/resources/views/livewire/project/service/storage.blade.php b/resources/views/livewire/project/service/storage.blade.php index 7101b0b2b..a46dd881e 100644 --- a/resources/views/livewire/project/service/storage.blade.php +++ b/resources/views/livewire/project/service/storage.blade.php @@ -11,13 +11,9 @@ helper="For Preview Deployments, storage has a -pr-#PRNumber in their volume name, example: -pr-1" /> - - New Persistent Storage - - - - - + + +
    Persistent storage to preserve data between deployments.
    @if ($resource->persistentStorages()->get()->count() === 0 && $resource->fileStorages()->get()->count() == 0) diff --git a/resources/views/livewire/project/shared/environment-variable/add.blade.php b/resources/views/livewire/project/shared/environment-variable/add.blade.php index 6c85d0e48..271dcda03 100644 --- a/resources/views/livewire/project/shared/environment-variable/add.blade.php +++ b/resources/views/livewire/project/shared/environment-variable/add.blade.php @@ -1,5 +1,5 @@ -
    - + + diff --git a/resources/views/livewire/project/shared/environment-variable/all.blade.php b/resources/views/livewire/project/shared/environment-variable/all.blade.php index 1a58c00cb..951f53e61 100644 --- a/resources/views/livewire/project/shared/environment-variable/all.blade.php +++ b/resources/views/livewire/project/shared/environment-variable/all.blade.php @@ -3,13 +3,9 @@

    Environment Variables

    @if ($resource->type() !== 'service') - - New Environment Variable - - - - - + + + @endif {{ $view === 'normal' ? 'Developer view' : 'Normal view' }} diff --git a/resources/views/livewire/project/shared/scheduled-task/add.blade.php b/resources/views/livewire/project/shared/scheduled-task/add.blade.php index 6448480b8..3226981b8 100644 --- a/resources/views/livewire/project/shared/scheduled-task/add.blade.php +++ b/resources/views/livewire/project/shared/scheduled-task/add.blade.php @@ -1,5 +1,5 @@ - - + +

    Scheduled Tasks

    - - New Scheduled Task - - - - - + + +
    @forelse($resource->scheduled_tasks as $task) type() == 'application') - href="{{ route('project.application.scheduled-tasks', [...$parameters, 'task_uuid' => $task->uuid]) }}"> + @if ($resource->type() == 'application') href="{{ route('project.application.scheduled-tasks', [...$parameters, 'task_uuid' => $task->uuid]) }}"> @elseif ($resource->type() == 'service') - href="{{ route('project.service.scheduled-tasks', [...$parameters, 'task_uuid' => $task->uuid]) }}"> - @endif -
    {{ $task->name }}
    -
    Frequency: {{ $task->frequency }}
    -
    Last run: {{ data_get($task->latest_log, 'status', 'No runs yet') }}
    -     - @empty -
    No scheduled tasks configured.
    - @endforelse + href="{{ route('project.service.scheduled-tasks', [...$parameters, 'task_uuid' => $task->uuid]) }}"> @endif +
    {{ $task->name }}
    +
    Frequency: {{ $task->frequency }}
    +
    Last run: {{ data_get($task->latest_log, 'status', 'No runs yet') }}
    + +@empty +
    No scheduled tasks configured.
    + @endforelse +
    diff --git a/resources/views/livewire/project/shared/storages/add.blade.php b/resources/views/livewire/project/shared/storages/add.blade.php index 23a1e78a3..ef8e7a97a 100644 --- a/resources/views/livewire/project/shared/storages/add.blade.php +++ b/resources/views/livewire/project/shared/storages/add.blade.php @@ -1,4 +1,4 @@ - + @if ($isSwarm)
    Swarm Mode detected: You need to set a shared volume (EFS/NFS/etc) on all the worker nodes if you would like to use a persistent volumes.
    diff --git a/resources/views/livewire/project/show.blade.php b/resources/views/livewire/project/show.blade.php index 70dae4bf0..3535fe7df 100644 --- a/resources/views/livewire/project/show.blade.php +++ b/resources/views/livewire/project/show.blade.php @@ -1,14 +1,9 @@

    Environments

    - - New Environment - - - - - + + +
    {{ $project->name }}.
    @@ -23,7 +18,7 @@ {{ $environment->description }}
    - Settings diff --git a/resources/views/livewire/server/proxy/dynamic-configuration-navbar.blade.php b/resources/views/livewire/server/proxy/dynamic-configuration-navbar.blade.php index a11ee20ae..81394418f 100644 --- a/resources/views/livewire/server/proxy/dynamic-configuration-navbar.blade.php +++ b/resources/views/livewire/server/proxy/dynamic-configuration-navbar.blade.php @@ -1,15 +1,10 @@

    File: {{ str_replace('|', '.', $fileName) }}

    - - Edit Configuration - - - - - + + +
    Delete
    diff --git a/resources/views/livewire/server/proxy/dynamic-configurations.blade.php b/resources/views/livewire/server/proxy/dynamic-configurations.blade.php index 347c5c9ad..64d0b3ee0 100644 --- a/resources/views/livewire/server/proxy/dynamic-configurations.blade.php +++ b/resources/views/livewire/server/proxy/dynamic-configurations.blade.php @@ -9,15 +9,9 @@

    Dynamic Configurations

    Reload - - New Dynamic Configuration - - - - - + + +
    You can add dynamic proxy configurations here.
    @@ -29,7 +23,10 @@ class="button">+ @if ($contents?->isNotEmpty()) @foreach ($contents as $fileName => $value)
    - @if (str_replace('|', '.', $fileName) === 'coolify.yaml' || str_replace('|', '.', $fileName) === 'Caddyfile' || str_replace('|', '.', $fileName) === 'coolify.caddy' || str_replace('|', '.', $fileName) === 'default_redirect_404.caddy') + @if (str_replace('|', '.', $fileName) === 'coolify.yaml' || + str_replace('|', '.', $fileName) === 'Caddyfile' || + str_replace('|', '.', $fileName) === 'coolify.caddy' || + str_replace('|', '.', $fileName) === 'default_redirect_404.caddy')

    File: {{ str_replace('|', '.', $fileName) }}

    diff --git a/resources/views/livewire/server/proxy/new-dynamic-configuration.blade.php b/resources/views/livewire/server/proxy/new-dynamic-configuration.blade.php index 110ba289c..d31afdb07 100644 --- a/resources/views/livewire/server/proxy/new-dynamic-configuration.blade.php +++ b/resources/views/livewire/server/proxy/new-dynamic-configuration.blade.php @@ -1,5 +1,5 @@ - - + + Save diff --git a/resources/views/livewire/server/show-private-key.blade.php b/resources/views/livewire/server/show-private-key.blade.php index dcadabb8f..ac52d601f 100644 --- a/resources/views/livewire/server/show-private-key.blade.php +++ b/resources/views/livewire/server/show-private-key.blade.php @@ -1,14 +1,9 @@

    Private Key

    - - New Team - - - - - + + + Check connection @@ -31,10 +26,12 @@

    Choose another Key

    @forelse ($privateKeys as $private_key) - -
    {{ $private_key->name }}
    -
    {{ $private_key->description }}
    -     +
    +
    +
    {{ $private_key->name }}
    +
    {{ $private_key->description }}
    +
    +
    @empty
    No private keys found.
    @endforelse diff --git a/resources/views/livewire/source/github/create.blade.php b/resources/views/livewire/source/github/create.blade.php index a3330aea1..727bca4e2 100644 --- a/resources/views/livewire/source/github/create.blade.php +++ b/resources/views/livewire/source/github/create.blade.php @@ -1,22 +1,20 @@ -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    - @if (!isCloud()) - - @endif - - Continue - - -
    +
    +
    + + +
    +
    + + +
    +
    + + +
    + @if (!isCloud()) + + @endif + + Continue + + diff --git a/resources/views/livewire/team-shared-variables-index.blade.php b/resources/views/livewire/team-shared-variables-index.blade.php index b3d9a1f4a..f12fa39f2 100644 --- a/resources/views/livewire/team-shared-variables-index.blade.php +++ b/resources/views/livewire/team-shared-variables-index.blade.php @@ -2,14 +2,9 @@

    Shared Variables

    - - New Shared Variable - - - - - + + +
    You can use these variables anywhere with @{{ team.VARIABLENAME }}

    S3 Storages

    - - New S3 Storage - - - - - + + + {{-- + Add --}}
    diff --git a/resources/views/security/private-key/index.blade.php b/resources/views/security/private-key/index.blade.php index 5ef4c722e..564fb1bff 100644 --- a/resources/views/security/private-key/index.blade.php +++ b/resources/views/security/private-key/index.blade.php @@ -2,14 +2,9 @@

    Private Keys

    - - New Private Key - - - - - + + +
    @forelse ($privateKeys as $key) diff --git a/resources/views/source/all.blade.php b/resources/views/source/all.blade.php index c564d1316..998292458 100644 --- a/resources/views/source/all.blade.php +++ b/resources/views/source/all.blade.php @@ -1,14 +1,9 @@

    Sources

    - - New GitHub App - - - - - + + +
    Git sources for your applications.