Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Update button label and server retrieval logic***

Browse Source 
***Refactor email settings form***
***Update project index view layout
This commit is contained in:
Andras Bacsai 2024-03-25 12:47:10 +01:00
parent 89cc4d1df4
commit 995197cad9
6 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Livewire/Destination/New/Docker.php
View File

@ -35,7 +35,7 @@ class Docker extends Component
public function mount() public function mount()
{ {
if (is_null($this->servers)) { if (is_null($this->servers)) {
$this->servers = Server::ownedByCurrentTeam()->get(); $this->servers = Server::isReachable()->get();
} }
if (request()->query('server_id')) { if (request()->query('server_id')) {
$this->server_id = request()->query('server_id'); $this->server_id = request()->query('server_id');

2
resources/views/auth/register.blade.php
View File

@ -5,7 +5,7 @@
Coolify Coolify
</a> </a>
<div <div
class="w-full bg-white rounded-lg shadow dark:border md:mt-0 sm:max-w-md xl:p-0 dark:bg-base dark:border-coolgray-200"> class="w-full bg-white rounded-lg shadow md:mt-0 sm:max-w-md xl:p-0 dark:bg-base">
<div class="p-6 space-y-4 md:space-y-6 sm:p-8"> <div class="p-6 space-y-4 md:space-y-6 sm:p-8">
<h1 class="text-xl font-bold leading-tight tracking-tight text-gray-900 md:text-2xl dark:text-white"> <h1 class="text-xl font-bold leading-tight tracking-tight text-gray-900 md:text-2xl dark:text-white">
Create an account Create an account

2
resources/views/livewire/project/index.blade.php
View File

@ -8,7 +8,7 @@
<div class="subtitle">All your projects are here.</div> <div class="subtitle">All your projects are here.</div>
<div class="grid gap-2 lg:grid-cols-2"> <div class="grid gap-2 lg:grid-cols-2">
@forelse ($projects as $project) @forelse ($projects as $project)
<div class="gap-2 border border-transparent cursor-pointer box group" x-data <div class="box group" x-data
x-on:click="goto('{{ $project->uuid }}')"> x-on:click="goto('{{ $project->uuid }}')">
<a class="flex flex-col flex-1 mx-6 hover:no-underline" <a class="flex flex-col flex-1 mx-6 hover:no-underline"
href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}"> href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">

22
resources/views/livewire/settings/email.blade.php
View File

@ -2,16 +2,18 @@
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<h2>Transactional Email</h2> <h2>Transactional Email</h2>
</div> </div>
<div class="pb-4 ">Email settings for password resets, invitations, shared with Pro+ subscribers etc.</div> @if (isCloud())
<form wire:submit='submitFromFields' class="pb-4"> <div class="pb-4 ">Email settings for password resets, invitations, shared with Pro+ subscribers etc.</div>
<div class="flex gap-2"> @else
<x-forms.input required id="settings.smtp_from_name" helper="Name used in emails." label="From Name" /> <div class="pb-4 ">Email settings for password resets, invitations, etc.</div>
<x-forms.input required id="settings.smtp_from_address" helper="Email address used in emails." @endif
label="From Address" /> <form wire:submit='submitFromFields' class="flex flex-col gap-2 pb-4">
<x-forms.button type="submit"> <x-forms.input required id="settings.smtp_from_name" helper="Name used in emails." label="From Name" />
Save <x-forms.input required id="settings.smtp_from_address" helper="Email address used in emails."
</x-forms.button> label="From Address" />
</div> <x-forms.button type="submit">
Save
</x-forms.button>
</form> </form>
<div class="flex flex-col gap-4"> <div class="flex flex-col gap-4">
<div class="p-4 border dark:border-coolgray-300"> <div class="p-4 border dark:border-coolgray-300">

60
resources/views/livewire/tags/index.blade.php
View File

@ -24,20 +24,25 @@
</div> </div>
<div class="grid grid-cols-1 gap-2 pt-4 lg:grid-cols-2 xl:grid-cols-3"> <div class="grid grid-cols-1 gap-2 pt-4 lg:grid-cols-2 xl:grid-cols-3">
@foreach ($applications as $application) @foreach ($applications as $application)
<a href="{{ $application->link() }}" class="flex flex-col box group"> <div class="box group">
<span <a href="{{ $application->link() }}" class="flex flex-col ">
class="font-bold dark:text-white">{{ $application->project()->name }}/{{ $application->environment->name }}</span> <div class="box-title">{{ $application->name }}</div>
<span class="dark:text-white ">{{ $application->name }}</span> <div class="box-description">
<span class="description">{{ $application->description }}</span> {{ $application->project()->name }}/{{ $application->environment->name }}
</a> </div>
<div class="box-description">{{ $application->description }}</div>
</a>
</div>
@endforeach @endforeach
@foreach ($services as $service) @foreach ($services as $service)
<a href="{{ $service->link() }}" class="flex flex-col box group"> <div class="box group">
<span <a href="{{ $service->link() }}" class="flex flex-col ">
class="font-bold dark:text-white">{{ $service->project()->name }}/{{ $service->environment->name }}</span> <div class="box-title">{{ $service->name }}</div>
<span class="dark:text-white ">{{ $service->name }}</span> <div class="box-description">
<span class="description">{{ $service->description }}</span> {{ $service->project()->name }}/{{ $service->environment->name }}</div>
</a> <div class="box-description">{{ $service->description }}</div>
</a>
</div>
@endforeach @endforeach
</div> </div>
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
@ -51,22 +56,23 @@
<h4 class="py-4">{{ $server_name }}</h4> <h4 class="py-4">{{ $server_name }}</h4>
<div class="grid grid-cols-1 gap-2 lg:grid-cols-3"> <div class="grid grid-cols-1 gap-2 lg:grid-cols-3">
@foreach ($deployments as $deployment) @foreach ($deployments as $deployment)
<a href="{{ data_get($deployment, 'deployment_url') }}" <div @class([
@class([ 'box-without-bg dark:bg-coolgray-100 bg-white gap-2 cursor-pointer group border-l-2 border-dotted',
'gap-2 cursor-pointer box group border-l-2 border-dotted', 'dark:border-coolgray-300' => data_get($deployment, 'status') === 'queued',
'dark:border-coolgray-300' => data_get($deployment, 'status') === 'queued', 'border-yellow-500' => data_get($deployment, 'status') === 'in_progress',
'border-yellow-500' => data_get($deployment, 'status') === 'in_progress', ])>
])> <a href="{{ data_get($deployment, 'deployment_url') }}">
<div class="flex flex-col mx-6"> <div class="flex flex-col mx-6">
<div class="font-bold dark:text-white"> <div class="box-title">
{{ data_get($deployment, 'application_name') }} {{ data_get($deployment, 'application_name') }}
</div>
<div class="box-description">
{{ str(data_get($deployment, 'status'))->headline() }}
</div>
</div> </div>
<div class="description"> <div class="flex-1"></div>
{{ str(data_get($deployment, 'status'))->headline() }} </a>
</div> </div>
</div>
<div class="flex-1"></div>
</a>
@endforeach @endforeach
</div> </div>
@empty @empty

2
resources/views/livewire/team/storage/create.blade.php
View File

@ -16,7 +16,7 @@
</div> </div>
<x-forms.button type="submit"> <x-forms.button type="submit">
Continue Validate Connection & Continue
</x-forms.button> </x-forms.button>
</form> </form>
</div> </div>