diff --git a/app/Livewire/Notifications/EmailSettings.php b/app/Livewire/Notifications/EmailSettings.php index b6152907d..a45381b84 100644 --- a/app/Livewire/Notifications/EmailSettings.php +++ b/app/Livewire/Notifications/EmailSettings.php @@ -119,16 +119,18 @@ class EmailSettings extends Component { try { $this->resetErrorBag(); - $this->validate([ - 'team.smtp_from_address' => 'required|email', - 'team.smtp_from_name' => 'required', - 'team.smtp_host' => 'required', - 'team.smtp_port' => 'required|numeric', - 'team.smtp_encryption' => 'nullable', - 'team.smtp_username' => 'nullable', - 'team.smtp_password' => 'nullable', - 'team.smtp_timeout' => 'nullable', - ]); + if (!$this->team->use_instance_email_settings) { + $this->validate([ + 'team.smtp_from_address' => 'required|email', + 'team.smtp_from_name' => 'required', + 'team.smtp_host' => 'required', + 'team.smtp_port' => 'required|numeric', + 'team.smtp_encryption' => 'nullable', + 'team.smtp_username' => 'nullable', + 'team.smtp_password' => 'nullable', + 'team.smtp_timeout' => 'nullable', + ]); + } $this->team->save(); refreshSession(); $this->dispatch('success', 'Settings saved.'); diff --git a/app/Livewire/Project/Application/Deployment/Index.php b/app/Livewire/Project/Application/Deployment/Index.php index 520848a54..d8e033b24 100644 --- a/app/Livewire/Project/Application/Deployment/Index.php +++ b/app/Livewire/Project/Application/Deployment/Index.php @@ -9,7 +9,7 @@ use Livewire\Component; class Index extends Component { public Application $application; - public array|Collection $deployments = []; + public ?Collection $deployments; public int $deployments_count = 0; public string $current_url; public int $skip = 0; @@ -48,9 +48,9 @@ class Index extends Component } private function show_more() { - if (count($this->deployments) !== 0) { + if ($this->deployments->count() !== 0) { $this->show_next = true; - if (count($this->deployments) < $this->default_take) { + if ($this->deployments->count() < $this->default_take) { $this->show_next = false; } return; @@ -63,7 +63,6 @@ class Index extends Component } public function previous_page(?int $take = null) { - if ($take) { $this->skip = $this->skip - $take; } diff --git a/app/Livewire/Tags/Index.php b/app/Livewire/Tags/Index.php index eba25a750..75ed06f7b 100644 --- a/app/Livewire/Tags/Index.php +++ b/app/Livewire/Tags/Index.php @@ -2,14 +2,73 @@ namespace App\Livewire\Tags; +use App\Http\Controllers\Api\Deploy; +use App\Models\ApplicationDeploymentQueue; use App\Models\Tag; +use Illuminate\Support\Collection; +use Livewire\Attributes\Url; use Livewire\Component; class Index extends Component { - public $tags = []; - public function mount() { - $this->tags = Tag::where('team_id', currentTeam()->id)->get()->unique('name')->sortBy('name'); + #[Url()] + public ?string $tag = null; + + public Collection $tags; + public Collection $applications; + public Collection $services; + public $webhook = null; + public $deployments_per_tag_per_server = []; + + public function updatedTag() + { + $tag = $this->tags->where('name', $this->tag)->first(); + $this->webhook = generatTagDeployWebhook($tag->name); + $this->applications = $tag->applications()->get(); + $this->services = $tag->services()->get(); + $this->get_deployments(); + } + public function get_deployments() + { + try { + $resource_ids = $this->applications->pluck('id'); + $this->deployments_per_tag_per_server = ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->whereIn('application_id', $resource_ids)->get([ + "id", + "application_id", + "application_name", + "deployment_url", + "pull_request_id", + "server_name", + "server_id", + "status" + ])->sortBy('id')->groupBy('server_name')->toArray(); + } catch (\Exception $e) { + return handleError($e, $this); + } + } + public function redeploy_all() + { + try { + $message = collect([]); + $this->applications->each(function ($resource) use ($message) { + $deploy = new Deploy(); + $message->push($deploy->deploy_resource($resource)); + }); + $this->services->each(function ($resource) use ($message) { + $deploy = new Deploy(); + $message->push($deploy->deploy_resource($resource)); + }); + $this->dispatch('success', 'Mass deployment started.'); + } catch (\Exception $e) { + return handleError($e, $this); + } + } + public function mount() + { + $this->tags = Tag::ownedByCurrentTeam()->get()->unique('name')->sortBy('name'); + if ($this->tag) { + $this->updatedTag(); + } } public function render() { diff --git a/app/View/Components/Forms/Checkbox.php b/app/View/Components/Forms/Checkbox.php index 5361be4e7..36b561eda 100644 --- a/app/View/Components/Forms/Checkbox.php +++ b/app/View/Components/Forms/Checkbox.php @@ -19,7 +19,7 @@ class Checkbox extends Component public ?string $helper = null, public string|bool $instantSave = false, public bool $disabled = false, - public string $defaultClass = "border-coolgray-500 text-warning focus:ring-warning bg-coolgray-100 rounded cursor-pointer", + public string $defaultClass = "border-coolgray-500 text-warning focus:ring-warning dark:bg-coolgray-100 rounded cursor-pointer dark:disabled:bg-base dark:disabled:cursor-not-allowed", ) { // } diff --git a/app/View/Components/Forms/Input.php b/app/View/Components/Forms/Input.php index c1c60e8a0..56349f6db 100644 --- a/app/View/Components/Forms/Input.php +++ b/app/View/Components/Forms/Input.php @@ -21,7 +21,7 @@ class Input extends Component public ?string $helper = null, public bool $allowToPeak = true, public bool $isMultiline = false, - public string $defaultClass = "block w-full py-1.5 rounded border-0 text-sm ring-inset ring-1 dark:ring-coolgray-300 dark:placeholder:text-neutral-700 focus:ring-2 focus:ring-inset dark:focus:ring-coolgray-500 dark:bg-coolgray-100 dark:text-white text-black dark:read-only:text-neutral-500 dark:read-only:bg-coolgray-100/20" + public string $defaultClass = "input", ) { } diff --git a/app/View/Components/Forms/Select.php b/app/View/Components/Forms/Select.php index eadb8dcac..99bcf1873 100644 --- a/app/View/Components/Forms/Select.php +++ b/app/View/Components/Forms/Select.php @@ -14,12 +14,12 @@ class Select extends Component * Create a new component instance. */ public function __construct( - public string|null $id = null, - public string|null $name = null, - public string|null $label = null, - public string|null $helper = null, - public bool $required = false, - public string $defaultClass = "block w-full py-1.5 rounded border-0 text-sm ring-inset ring-1 dark:ring-coolgray-300 dark:placeholder:text-neutral-700 focus:ring-2 focus:ring-inset dark:focus:ring-coolgray-500 dark:bg-coolgray-100 dark:text-white text-black " + public ?string $id = null, + public ?string $name = null, + public ?string $label = null, + public ?string $helper = null, + public bool $required = false, + public string $defaultClass = "block w-full py-1.5 rounded border-0 text-sm ring-inset ring-1 dark:ring-coolgray-300 dark:placeholder:text-neutral-700 focus:ring-2 focus:ring-inset dark:focus:ring-coolgray-500 dark:bg-coolgray-100 dark:text-white text-black " ) { // } diff --git a/app/View/Components/Forms/Textarea.php b/app/View/Components/Forms/Textarea.php index 58a1af67a..c9d2c26ba 100644 --- a/app/View/Components/Forms/Textarea.php +++ b/app/View/Components/Forms/Textarea.php @@ -25,8 +25,8 @@ class Textarea extends Component public ?string $helper = null, public bool $realtimeValidation = false, public bool $allowToPeak = true, - public string $defaultClass = "block w-full py-1.5 rounded border-0 text-sm ring-inset ring-1 dark:ring-coolgray-300 dark:placeholder:text-neutral-700 focus:ring-2 focus:ring-inset dark:focus:ring-coolgray-500 dark:bg-coolgray-100 dark:text-white text-black dark:read-only:text-neutral-500 dark:read-only:bg-coolgray-100/20 scrollbar", - public string $defaultClassInput = "block w-full py-1.5 rounded border-0 text-sm ring-inset ring-1 dark:ring-coolgray-300 dark:placeholder:text-neutral-700 focus:ring-2 focus:ring-inset dark:focus:ring-coolgray-500 dark:bg-coolgray-100 dark:text-white text-black dark:read-only:text-neutral-500 dark:read-only:bg-coolgray-100/20" + public string $defaultClass = "block w-full py-1.5 rounded border-0 text-sm ring-inset ring-1 dark:bg-coolgray-100 dark:text-white text-black focus:ring-2 dark:focus:ring-coolgray-300 dark:ring-coolgray-300 scrollbar dark:read-only:text-neutral-500", + public string $defaultClassInput = "block w-full py-1.5 rounded border-0 text-sm ring-inset ring-1 dark:bg-coolgray-100 dark:text-white text-black focus:ring-2 dark:focus:ring-coolgray-300 dark:ring-coolgray-300 dark:read-only:text-neutral-500" ) { // } diff --git a/resources/css/app.css b/resources/css/app.css index b7eec46fb..d0686191b 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -11,16 +11,20 @@ body { @apply text-sm antialiased scrollbar; } -button[isError] { +button[isError]:not(:disabled) { @apply bg-red-600 hover:bg-red-700; } -button[isHighlighted] { +button[isHighlighted]:not(:disabled) { @apply bg-coollabs hover:bg-coollabs-100; } +.button { + @apply px-3 py-1.5 text-sm font-normal normal-case rounded dark:bg-coolgray-200 dark:text-white dark:hover:bg-coolgray-100 dark:disabled:bg-coolgray-100/40 dark:disabled:text-neutral-800 min-w-fit flex items-center justify-center; +} + h1 { - @apply pb-6 text-2xl font-bold dark:text-white text-neutral-800; + @apply text-2xl font-bold dark:text-white text-neutral-800; } h2 { @@ -36,7 +40,7 @@ h4 { } a { - @apply dark:text-neutral-400 text-neutral-600; + @apply dark:hover:text-white dark:text-neutral-400 text-neutral-600; } label { @@ -75,28 +79,44 @@ tr td:first-child { @apply pl-4 pr-3 font-bold sm:pl-6; } -input.input-sm { +input { @apply pr-10; } +.input { + @apply block w-full py-1.5 rounded border-0 text-sm ring-inset ring-1 dark:bg-coolgray-100 dark:text-white text-black focus:ring-2 dark:focus:ring-coolgray-300 dark:ring-coolgray-300 dark:read-only:text-neutral-500 dark:read-only:ring-0 dark:read-only:bg-coolgray-100/40 dark:placeholder:text-neutral-700; +} option { @apply text-white; } -.badge { - @apply inline-block w-3 h-3 text-xs font-bold leading-none border border-black rounded-full ; +.alert-success { + @apply flex items-center gap-2 text-success; } +.alert-error { + @apply flex items-center gap-2 text-error; +} +.dropdown-item { + @apply relative flex cursor-pointer select-none dark:hover:text-white dark:hover:bg-coollabs items-center px-2 py-1.5 text-xs justify-center outline-none transition-colors data-[disabled]:pointer-events-none data-[disabled]:opacity-50 gap-2 +} + +.badge { + @apply inline-block w-3 h-3 text-xs font-bold leading-none border border-black rounded-full; +} + .badge-success { @apply bg-success; } + .badge-warning { @apply bg-warning; } + .badge-error { @apply bg-error; } -.button { - @apply px-3 py-1 text-sm font-normal normal-case rounded dark:bg-coolgray-200 dark:text-white dark:hover:bg-coolgray-100; -} + + + [type='checkbox']:checked { background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='black' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e"); } @@ -104,12 +124,15 @@ option { .menu { @apply flex items-center gap-1; } + .menu-item { @apply flex items-center w-full gap-2 px-4 py-1 min-w-48 hover:bg-coolgray-100 dark:hover:text-white; } + .menu-item-active { - @apply rounded-none bg-coolgray-200 text-warning; + @apply rounded-none dark:bg-coolgray-200 dark:text-warning; } + .icon { @apply w-4 h-4; } @@ -123,10 +146,9 @@ option { } .custom-modal { - @apply flex flex-col gap-2 px-8 py-4 border bg-coolgray-100 border-coolgray-200; + @apply z-50 flex flex-col gap-2 px-8 py-4 border dark:bg-coolgray-100 dark:border-coolgray-200; } - .navbar-main { @apply flex items-end gap-6 py-2 border-b-2 border-solid border-coolgray-200; } @@ -197,12 +219,13 @@ option { @apply inline-block font-bold text-warning; } - - .buyme { @apply block px-3 py-2 mt-10 text-sm font-semibold leading-6 text-center text-white rounded-md shadow-sm bg-coolgray-200 hover:bg-coolgray-300 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-coolgray-200 hover:no-underline; } +.title { + @apply hidden pb-0 lg:block lg:pb-8 ; +} .subtitle { @apply pt-2 pb-10; } diff --git a/resources/views/components/applications/links.blade.php b/resources/views/components/applications/links.blade.php index 7f3bed2da..d6a0d15d5 100644 --- a/resources/views/components/applications/links.blade.php +++ b/resources/views/components/applications/links.blade.php @@ -1,54 +1,76 @@ -
- @if ( - (data_get($application, 'fqdn') || - collect(json_decode($this->application->docker_compose_domains))->count() > 0 || - data_get($application, 'previews', collect([]))->count() > 0 || - data_get($application, 'ports_mappings_array')) && - data_get($application, 'settings.is_raw_compose_deployment_enabled') !== true) - +
- - @endif +
diff --git a/resources/views/components/external-link.blade.php b/resources/views/components/external-link.blade.php index 0ee609a91..7c97d74a1 100644 --- a/resources/views/components/external-link.blade.php +++ b/resources/views/components/external-link.blade.php @@ -1 +1 @@ - + diff --git a/resources/views/components/forms/button.blade.php b/resources/views/components/forms/button.blade.php index f3bec86e9..f1c869217 100644 --- a/resources/views/components/forms/button.blade.php +++ b/resources/views/components/forms/button.blade.php @@ -10,11 +10,10 @@ {{ $slot }} @if ($attributes->get('type') === 'submit') - + @else @if ($attributes->whereStartsWith('wire:click')->first()) - + @endif @endif diff --git a/resources/views/components/forms/checkbox.blade.php b/resources/views/components/forms/checkbox.blade.php index 749c7a21a..cd0b397be 100644 --- a/resources/views/components/forms/checkbox.blade.php +++ b/resources/views/components/forms/checkbox.blade.php @@ -1,4 +1,4 @@ -
+
@@ -38,8 +38,8 @@ merge(['class' => $defaultClass]) }} @required($required) @readonly($readonly) @if ($id !== 'null') wire:model={{ $id }} @endif - wire:dirty.class.remove='dark:text-white text-black' wire:dirty.class="input-warning" wire:loading.attr="disabled" - type="{{ $type }}" @disabled($disabled) + wire:dirty.class.remove='dark:focus:ring-coolgray-300 dark:ring-coolgray-300' wire:dirty.class="dark:focus:ring-warning dark:ring-warning" + wire:loading.attr="disabled" type="{{ $type }}" @disabled($disabled) @if ($id !== 'null') id={{ $id }} @endif name="{{ $name }}" placeholder="{{ $attributes->get('placeholder') }}"> @endif diff --git a/resources/views/components/forms/textarea.blade.php b/resources/views/components/forms/textarea.blade.php index 74845e5e0..ea8865f6c 100644 --- a/resources/views/components/forms/textarea.blade.php +++ b/resources/views/components/forms/textarea.blade.php @@ -25,7 +25,8 @@ merge(['class' => $defaultClassInput]) }} @required($required) @if ($id !== 'null') wire:model={{ $id }} @endif - wire:dirty.class.remove='text-white' wire:dirty.class="input-warning" wire:loading.attr="disabled" + wire:dirty.class.remove='dark:focus:ring-coolgray-300 dark:ring-coolgray-300' + wire:dirty.class="dark:focus:ring-warning dark:ring-warning" wire:loading.attr="disabled" type="{{ $type }}" @readonly($readonly) @disabled($disabled) id="{{ $id }}" name="{{ $name }}" placeholder="{{ $attributes->get('placeholder') }}" aria-placeholder="{{ $attributes->get('placeholder') }}"> @@ -34,7 +35,7 @@ @if ($realtimeValidation) wire:model.debounce.200ms="{{ $id }}" @else wire:model={{ $value ?? $id }} - wire:dirty.class="input-warning" @endif + wire:dirty.class.remove='dark:focus:ring-coolgray-300 dark:ring-coolgray-300' wire:dirty.class="dark:focus:ring-warning dark:ring-warning" @endif @disabled($disabled) @readonly($readonly) @required($required) id="{{ $id }}" name="{{ $name }}" name={{ $id }}> @@ -44,7 +45,7 @@ @if ($realtimeValidation) wire:model.debounce.200ms="{{ $id }}" @else wire:model={{ $value ?? $id }} - wire:dirty.class="input-warning" @endif + wire:dirty.class.remove='dark:focus:ring-coolgray-300 dark:ring-coolgray-300' wire:dirty.class="dark:focus:ring-warning dark:ring-warning" @endif @disabled($disabled) @readonly($readonly) @required($required) id="{{ $id }}" name="{{ $name }}" name={{ $id }}> @endif diff --git a/resources/views/components/loading.blade.php b/resources/views/components/loading.blade.php index b792b292a..ddf3ea2db 100644 --- a/resources/views/components/loading.blade.php +++ b/resources/views/components/loading.blade.php @@ -1,11 +1,11 @@ @props(['text' => null]) - +
{{ $text }}
+
diff --git a/resources/views/components/new-modal.blade.php b/resources/views/components/modal-confirmation.blade.php similarity index 98% rename from resources/views/components/new-modal.blade.php rename to resources/views/components/modal-confirmation.blade.php index 9c9ef7065..eb3868a66 100644 --- a/resources/views/components/new-modal.blade.php +++ b/resources/views/components/modal-confirmation.blade.php @@ -34,7 +34,7 @@ x-transition:leave="ease-in duration-100" x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100" x-transition:leave-end="opacity-0 -translate-y-2 sm:scale-95" - class="relative w-full py-6 border rounded shadow-lg bg-coolgray-100 px-7 border-coolgray-300 sm:max-w-lg"> + class="relative w-full py-6 border rounded shadow-lg dark:bg-base px-7 dark:border-coolgray-300 sm:max-w-lg">

{{ $title }}

{{-- +
+ + --}} + @if (isCloud() && isInstanceAdmin()) + + + + + Admin + + @endif +
+ @if (isInstanceAdmin() && !isCloud()) + @persist('upgrade') + + @endpersist + @endif + + + + + + + + Help us! + + +
+ + + + Feedback +
+
+ @csrf + +
+ + +@endauth diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php index 9cb03de3c..0271f41a0 100644 --- a/resources/views/components/navbar.blade.php +++ b/resources/views/components/navbar.blade.php @@ -1,216 +1,293 @@ -@auth - -@endauth + --}} + + diff --git a/resources/views/components/popup.blade.php b/resources/views/components/popup.blade.php new file mode 100644 index 000000000..a1e2600f6 --- /dev/null +++ b/resources/views/components/popup.blade.php @@ -0,0 +1,30 @@ +@props(['title' => 'Default title', 'description' => 'Default Description', 'buttonText' => 'Default Button Text']) +
+
+
+ +
+

+ {{ $title }} +

+

{{ $description }}

+
+
+
+ +
+
+
diff --git a/resources/views/components/security/navbar.blade.php b/resources/views/components/security/navbar.blade.php index e13a0e4ee..292aa857b 100644 --- a/resources/views/components/security/navbar.blade.php +++ b/resources/views/components/security/navbar.blade.php @@ -1,14 +1,7 @@

Security

- +
Security related settings.
+
-
{{ data_get($server, 'name') }}
+
{{ data_get($server, 'name') }}.
 diff --git a/resources/views/components/status/degraded.blade.php b/resources/views/components/status/degraded.blade.php index 4b687c269..d91051c8e 100644 --- a/resources/views/components/status/degraded.blade.php +++ b/resources/views/components/status/degraded.blade.php @@ -1,13 +1,15 @@ @props([ 'status' => 'Degraded', ]) - -
-
-
- {{ str($status)->before(':')->headline() }} -
- @if (!str($status)->startsWith('Proxy') && !str($status)->contains('(')) -
({{ str($status)->after(':') }})
- @endif +
+ + +
+
+ {{ str($status)->before(':')->headline() }} +
+ @if (!str($status)->startsWith('Proxy') && !str($status)->contains('(')) +
({{ str($status)->after(':') }})
+ @endif +
diff --git a/resources/views/components/status/restarting.blade.php b/resources/views/components/status/restarting.blade.php index 12a99194d..d43a3a719 100644 --- a/resources/views/components/status/restarting.blade.php +++ b/resources/views/components/status/restarting.blade.php @@ -1,13 +1,15 @@ @props([ 'status' => 'Restarting', ]) - -
-
-
- {{ str($status)->before(':')->headline() }} -
- @if (!str($status)->startsWith('Proxy') && !str($status)->contains('(')) -
({{ str($status)->after(':') }})
- @endif +
+ + +
+
+ {{ str($status)->before(':')->headline() }} +
+ @if (!str($status)->startsWith('Proxy') && !str($status)->contains('(')) +
({{ str($status)->after(':') }})
+ @endif +
diff --git a/resources/views/components/status/running.blade.php b/resources/views/components/status/running.blade.php index 37ec2b030..5bcb45cf5 100644 --- a/resources/views/components/status/running.blade.php +++ b/resources/views/components/status/running.blade.php @@ -1,8 +1,9 @@ @props([ 'status' => 'Running', ]) - -
+
+ +
{{ str($status)->before(':')->headline() }} @@ -10,4 +11,5 @@ @if (!str($status)->startsWith('Proxy') && !str($status)->contains('('))
({{ str($status)->after(':') }})
@endif +
diff --git a/resources/views/components/status/stopped.blade.php b/resources/views/components/status/stopped.blade.php index e97cf8f3f..f168fb3c2 100644 --- a/resources/views/components/status/stopped.blade.php +++ b/resources/views/components/status/stopped.blade.php @@ -1,8 +1,10 @@ @props([ 'status' => 'Stopped', ]) - -
-
-
{{ str($status)->before(':')->headline() }}
+
+ + +
+
{{ str($status)->before(':')->headline() }}
+
diff --git a/resources/views/components/version.blade.php b/resources/views/components/version.blade.php index a5ffdac32..8a9a710c1 100644 --- a/resources/views/components/version.blade.php +++ b/resources/views/components/version.blade.php @@ -1,2 +1,2 @@ -merge(['class' => 'text-xs cursor-pointer opacity-60 hover:opacity-100 hover:text-white z-50']) }} +merge(['class' => 'text-xs cursor-pointer opacity-60 hover:opacity-100 hover:text-white z-[60]']) }} href="https://github.com/coollabsio/coolify/releases/tag/v{{ config('version') }}">v{{ config('version') }} diff --git a/resources/views/destination/all.blade.php b/resources/views/destination/all.blade.php index 0a1358f9d..8aac647b9 100644 --- a/resources/views/destination/all.blade.php +++ b/resources/views/destination/all.blade.php @@ -1,6 +1,6 @@

Destinations

-
All Destinations
+
All Destinations.
@forelse ($destinations as $destination) @if ($destination->getMorphClass() === 'App\Models\StandaloneDocker') diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 8c6e4e5dc..f1d100ade 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -1,15 +1,64 @@ @extends('layouts.base') @section('body') @parent - @auth @endauth -
- -
- {{ $slot }} + @auth +
+ + + + +
+ +
Dashboard
+ {{-- + Your profile + + --}} +
+ +
+
+
+ {{ $slot }} +
+
+
-
+ @endauth @endsection diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 91dec5b7b..70a0fed0b 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -40,14 +40,8 @@ {{-- --}} @livewire('wire-elements-modal') - - -
- -
- - + - - - + + + + })) + }) + + @endif
diff --git a/resources/views/livewire/project/application/rollback.blade.php b/resources/views/livewire/project/application/rollback.blade.php index 5d8023391..a5b8f9a90 100644 --- a/resources/views/livewire/project/application/rollback.blade.php +++ b/resources/views/livewire/project/application/rollback.blade.php @@ -3,13 +3,13 @@

Rollback

Reload Available Images
-
You can easily rollback to a previously built (local) images +
You can easily rollback to a previously built (local) images quickly.
@forelse ($images as $image)
-
+
@if (data_get($image, 'is_current')) diff --git a/resources/views/livewire/project/clone-me.blade.php b/resources/views/livewire/project/clone-me.blade.php index 893b5cee5..c7389079d 100644 --- a/resources/views/livewire/project/clone-me.blade.php +++ b/resources/views/livewire/project/clone-me.blade.php @@ -1,7 +1,7 @@

Clone

-
Quickly clone all resources to a new project or environment
+
Quickly clone all resources to a new project or environment.
Clone to a new Project diff --git a/resources/views/livewire/project/database/import.blade.php b/resources/views/livewire/project/database/import.blade.php index 7c7f3e148..fe642c206 100644 --- a/resources/views/livewire/project/database/import.blade.php +++ b/resources/views/livewire/project/database/import.blade.php @@ -1,6 +1,6 @@

Import Backup

-
+
@@ -23,7 +23,7 @@ @endif -
diff --git a/resources/views/livewire/project/database/postgresql/general.blade.php b/resources/views/livewire/project/database/postgresql/general.blade.php index 50201e115..f00a0a870 100644 --- a/resources/views/livewire/project/database/postgresql/general.blade.php +++ b/resources/views/livewire/project/database/postgresql/general.blade.php @@ -82,7 +82,7 @@

Initialization scripts

- + Add + + Add
@forelse(data_get($database,'init_scripts', []) as $script) diff --git a/resources/views/livewire/project/delete-environment.blade.php b/resources/views/livewire/project/delete-environment.blade.php index 6173721a3..30b8235da 100644 --- a/resources/views/livewire/project/delete-environment.blade.php +++ b/resources/views/livewire/project/delete-environment.blade.php @@ -1,3 +1,3 @@ - + This environment will be deleted. It is not reversible.
Please think again. - + diff --git a/resources/views/livewire/project/delete-project.blade.php b/resources/views/livewire/project/delete-project.blade.php index 095c139f4..b49ab4033 100644 --- a/resources/views/livewire/project/delete-project.blade.php +++ b/resources/views/livewire/project/delete-project.blade.php @@ -1,3 +1,3 @@ - + This project will be deleted. It is not reversible.
Please think again. - + diff --git a/resources/views/livewire/project/index.blade.php b/resources/views/livewire/project/index.blade.php index bbfe84c8c..41c17e53c 100644 --- a/resources/views/livewire/project/index.blade.php +++ b/resources/views/livewire/project/index.blade.php @@ -2,10 +2,17 @@

Projects

@if ($servers > 0) - + Add - + + New Project + + + + + @endif
+
All your projects.
@if ($servers === 0)
diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.php index d0a86a245..08dabe9e7 100644 --- a/resources/views/livewire/project/new/select.blade.php +++ b/resources/views/livewire/project/new/select.blade.php @@ -10,13 +10,13 @@
Deploy resources, like Applications, Databases, Services...
-
+
@if ($current_step === 'type') -
    + {{--
    • Select Resource Type
    • Select a Server
    • Select a Destination
      • -
    +
--}}

Applications

@@ -167,7 +167,7 @@

Services

Reload List
@@ -254,11 +254,11 @@ companies, and use of them does not imply any affiliation or endorsement.
@endif @if ($current_step === 'servers') -
    + {{--
    • Select Resource Type
    • Select a Server
    • Select a Destination
      • -
    +
--}} {{-- @if ($isDatabase)
@@ -295,11 +295,11 @@ @endif --}} @endif @if ($current_step === 'destinations') -
    + {{--
    • Select Resource Type
    • Select a Server
    • Select a Destination
      • -
    +
--}}
@if ($server->isSwarm()) diff --git a/resources/views/livewire/project/resource/index.blade.php b/resources/views/livewire/project/resource/index.blade.php index bf70fc6ec..ded4e4370 100644 --- a/resources/views/livewire/project/resource/index.blade.php +++ b/resources/views/livewire/project/resource/index.blade.php @@ -3,15 +3,15 @@

Resources

@if ($environment->isEmpty()) - Clone @else + + class="button">+ New - Clone @@ -45,7 +45,7 @@ class="items-center justify-center box">+ Add New Resource @else
- +