mirror of
https://github.com/coollabsio/coolify.git
synced 2026-11-12 15:53:46 -04:00
fix(domains): remove the in-page title and domain count
- The sidebar already names the page; resource pages have no in-flow heading - Toolbar puts search on the left and actions on the right Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
141d2c67c8
commit
0ae8faa07b
@@ -1,6 +1,4 @@
|
||||
@php
|
||||
$configuredCount = collect($domainRows)->where('is_suggested', false)->count();
|
||||
$suggestedCount = collect($domainRows)->where('is_suggested', true)->count();
|
||||
$hasRows = count($domainRows) > 0;
|
||||
$hasDnsChecksInProgress = collect($domainRows)->contains(fn ($row) => $row['dns_status'] === 'checking');
|
||||
$composeDomainGroups = collect($domainRows)
|
||||
@@ -81,25 +79,16 @@
|
||||
@endcannot
|
||||
|
||||
{{-- Toolbar --}}
|
||||
<div class="flex flex-wrap items-center gap-2">
|
||||
<div class="min-w-0 flex-1">
|
||||
<h2 id="domains-section">Domains</h2>
|
||||
<p class="text-[13px] text-neutral-500 dark:text-fg-dim">
|
||||
{{ $configuredCount }} domain{{ $configuredCount === 1 ? '' : 's' }}
|
||||
@if ($suggestedCount > 0)
|
||||
· {{ $suggestedCount }} not added
|
||||
@endif
|
||||
</p>
|
||||
</div>
|
||||
<div id="domains-section" class="flex flex-wrap items-center gap-2">
|
||||
@if ($hasRows)
|
||||
<div class="relative w-full sm:w-64">
|
||||
<x-reicon name="search"
|
||||
class="pointer-events-none absolute top-1/2 left-2.5 z-10 size-3.5 -translate-y-1/2 text-neutral-400 dark:text-fg-faint" />
|
||||
<input type="search" x-model="domainSearch" aria-label="Search services or domains"
|
||||
class="input h-8! w-full pl-8! text-[13px]!" placeholder="Search services or domains" />
|
||||
</div>
|
||||
@endif
|
||||
<div class="ml-auto flex flex-wrap items-center gap-2">
|
||||
@if ($hasRows)
|
||||
<div class="relative w-full sm:w-64">
|
||||
<x-reicon name="search"
|
||||
class="pointer-events-none absolute top-1/2 left-2.5 z-10 size-3.5 -translate-y-1/2 text-neutral-400 dark:text-fg-faint" />
|
||||
<input type="search" x-model="domainSearch" aria-label="Search services or domains"
|
||||
class="input h-8! w-full pl-8! text-[13px]!" placeholder="Search services or domains" />
|
||||
</div>
|
||||
@endif
|
||||
@can('update', $application)
|
||||
<x-forms.button wire:click="checkAllDns" :showLoadingIndicator="false" wire:loading.attr="disabled" wire:target="checkAllDns,checkDomainDns">
|
||||
<x-reicon name="refresh" class="size-3.5" />
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
@php
|
||||
$configuredCount = collect($domainRows)->where('is_suggested', false)->count();
|
||||
$suggestedCount = collect($domainRows)->where('is_suggested', true)->count();
|
||||
$hasRows = count($domainRows) > 0;
|
||||
$hasDnsChecksInProgress = collect($domainRows)->contains(fn ($row) => $row['dns_status'] === 'checking');
|
||||
$serviceAppCount = count($serviceApps);
|
||||
@@ -69,25 +68,16 @@
|
||||
@endcannot
|
||||
|
||||
{{-- Toolbar --}}
|
||||
<div class="flex flex-wrap items-center gap-2">
|
||||
<div class="min-w-0 flex-1">
|
||||
<h2 id="domains-section">Domains</h2>
|
||||
<p class="text-[13px] text-neutral-500 dark:text-fg-dim">
|
||||
{{ $configuredCount }} domain{{ $configuredCount === 1 ? '' : 's' }} across {{ $domainGroups->count() }} service{{ $domainGroups->count() === 1 ? '' : 's' }}
|
||||
@if ($suggestedCount > 0)
|
||||
· {{ $suggestedCount }} not added
|
||||
@endif
|
||||
</p>
|
||||
</div>
|
||||
<div id="domains-section" class="flex flex-wrap items-center gap-2">
|
||||
@if ($domainGroups->isNotEmpty())
|
||||
<div class="relative w-full sm:w-64">
|
||||
<x-reicon name="search"
|
||||
class="pointer-events-none absolute top-1/2 left-2.5 z-10 size-3.5 -translate-y-1/2 text-neutral-400 dark:text-fg-faint" />
|
||||
<input type="search" x-model="domainSearch" aria-label="Search services or domains"
|
||||
class="input h-8! w-full pl-8! text-[13px]!" placeholder="Search services or domains" />
|
||||
</div>
|
||||
@endif
|
||||
<div class="ml-auto flex flex-wrap items-center gap-2">
|
||||
@if ($domainGroups->isNotEmpty())
|
||||
<div class="relative w-full sm:w-64">
|
||||
<x-reicon name="search"
|
||||
class="pointer-events-none absolute top-1/2 left-2.5 z-10 size-3.5 -translate-y-1/2 text-neutral-400 dark:text-fg-faint" />
|
||||
<input type="search" x-model="domainSearch" aria-label="Search services or domains"
|
||||
class="input h-8! w-full pl-8! text-[13px]!" placeholder="Search services or domains" />
|
||||
</div>
|
||||
@endif
|
||||
@can('update', $service)
|
||||
@if ($configuredCount > 0)
|
||||
<x-forms.button wire:click="checkAllDns" :showLoadingIndicator="false" wire:loading.attr="disabled"
|
||||
|
||||
@@ -160,7 +160,6 @@ it('groups configured domains and shows redirect settings in the table', functio
|
||||
->toContain('<span>DNS status</span>')
|
||||
->not->toContain('<span>Last checked</span>')
|
||||
->not->toContain("service-domain-group-{$this->webApp->id}")
|
||||
->and(substr_count($html, '2 domains'))->toBe(1)
|
||||
->and(substr_count($html, '<span>Domain</span>'))->toBe(1)
|
||||
->and(substr_count($html, "id=\"service-domain-group-{$this->apiApp->id}\""))->toBe(1);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user