From fa1fca7dbdc8a3be73cf79d77f9a86c4b9d998fc Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 12 Jun 2023 13:48:26 +0200
Subject: [PATCH] fix

---
 .../views/components/forms/select.blade.php   |   2 +-
 .../new/github-private-repository.blade.php   | 132 +++++++++---------
 .../new/public-git-repository.blade.php       |  18 +--
 3 files changed, 80 insertions(+), 72 deletions(-)

diff --git a/resources/views/components/forms/select.blade.php b/resources/views/components/forms/select.blade.php
index eff30be75..324b7e038 100644
--- a/resources/views/components/forms/select.blade.php
+++ b/resources/views/components/forms/select.blade.php
@@ -8,7 +8,7 @@
 <div {{ $attributes->merge(['class' => 'flex flex-col']) }}>
     @if ($label)
         <label class="label" for={{ $id }}>
-            <span class="label-text">
+            <span class="flex gap-1 label-text">
                 {{ $label }}
                 @if ($required)
                     <span class="text-warning">*</span>
diff --git a/resources/views/livewire/project/new/github-private-repository.blade.php b/resources/views/livewire/project/new/github-private-repository.blade.php
index 85c1a9451..07c664b38 100644
--- a/resources/views/livewire/project/new/github-private-repository.blade.php
+++ b/resources/views/livewire/project/new/github-private-repository.blade.php
@@ -3,69 +3,75 @@
     <div class="pb-4 text-sm">Deploy any public or private git repositories through a GitHub App.</div>
     @if ($github_apps->count() > 0)
         <form class="flex flex-col" wire:submit.prevent='submit'>
-            <h3 class="py-2">Select a GitHub App</h3>
-            @foreach ($github_apps as $ghapp)
-                @if ($selected_github_app_id == $ghapp->id)
-                    <x-forms.button class="bg-coollabs hover:bg-coollabs-100 h-7" wire:key="{{ $ghapp->id }}"
-                        wire:click.prevent="loadRepositories({{ $ghapp->id }})">
-                        {{ $ghapp->name }}
-                    </x-forms.button>
-                @else
-                    <x-forms.button wire:key="{{ $ghapp->id }}"
-                        wire:click.prevent="loadRepositories({{ $ghapp->id }})">
-                        {{ $ghapp->name }}
-                    </x-forms.button>
-                @endif
-            @endforeach
-            <div class="flex flex-col">
-                @if ($repositories->count() > 0)
-                    <div class="flex items-end gap-2">
-                        <x-forms.select class="w-full" label="Repository URL" helper="{!! __('repository.url') !!}"
-                            wire:model.defer="selected_repository_id">
-                            @foreach ($repositories as $repo)
-                                @if ($loop->first)
-                                    <option selected value="{{ data_get($repo, 'id') }}">{{ data_get($repo, 'name') }}
-                                    </option>
-                                @else
-                                    <option value="{{ data_get($repo, 'id') }}">{{ data_get($repo, 'name') }}</option>
-                                @endif
-                            @endforeach
-                        </x-forms.select>
-                        <x-forms.button wire:click.prevent="loadBranches"> Check
-                            repository</x-forms.button>
-                    </div>
-                @endif
-            </div>
-            <div>
-                @if ($branches->count() > 0)
-                    <div class="flex gap-2">
-                        <x-forms.select id="selected_branch_name" label="Branch">
-                            <option value="default" disabled selected>Select a branch</option>
-                            @foreach ($branches as $branch)
-                                @if ($loop->first)
-                                    <option selected value="{{ data_get($branch, 'name') }}">
-                                        {{ data_get($branch, 'name') }}
-                                    </option>
-                                @else
-                                    <option value="{{ data_get($branch, 'name') }}">{{ data_get($branch, 'name') }}
-                                    </option>
-                                @endif
-                            @endforeach
-                        </x-forms.select>
-                        @if ($is_static)
-                            <x-forms.input class="h-8" id="publish_directory" label="Publish Directory"
-                                helper="If there is a build process involved (like Svelte, React, Next, etc..), please specify the output directory for the build assets." />
-                        @else
-                            <x-forms.input class="h-8" type="number" id="port" label="Port" :readonly="$is_static"
-                                helper="The port your application listens on." />
-                        @endif
-                    </div>
-                    <x-forms.checkbox instantSave id="is_static" label="Is it a static site?"
-                        helper="If your application is a static site or the final build assets should be served as a static site, enable this." />
-                    <x-forms.button type="submit">
-                        Save New Application
-                    </x-forms.button>
-                @endif
+            <div class="flex flex-col gap-2">
+                <h3 class="py-2">Select a GitHub App</h3>
+                @foreach ($github_apps as $ghapp)
+                    @if ($selected_github_app_id == $ghapp->id)
+                        <x-forms.button class="bg-coollabs hover:bg-coollabs-100 h-7" wire:key="{{ $ghapp->id }}"
+                            wire:click.prevent="loadRepositories({{ $ghapp->id }})">
+                            {{ $ghapp->name }}
+                        </x-forms.button>
+                    @else
+                        <x-forms.button wire:key="{{ $ghapp->id }}"
+                            wire:click.prevent="loadRepositories({{ $ghapp->id }})">
+                            {{ $ghapp->name }}
+                        </x-forms.button>
+                    @endif
+                @endforeach
+                <div class="flex flex-col">
+                    @if ($repositories->count() > 0)
+                        <div class="flex items-end gap-2">
+                            <x-forms.select class="w-full" label="Repository URL" helper="{!! __('repository.url') !!}"
+                                wire:model.defer="selected_repository_id">
+                                @foreach ($repositories as $repo)
+                                    @if ($loop->first)
+                                        <option selected value="{{ data_get($repo, 'id') }}">
+                                            {{ data_get($repo, 'name') }}
+                                        </option>
+                                    @else
+                                        <option value="{{ data_get($repo, 'id') }}">{{ data_get($repo, 'name') }}
+                                        </option>
+                                    @endif
+                                @endforeach
+                            </x-forms.select>
+                            <x-forms.button wire:click.prevent="loadBranches"> Check
+                                repository</x-forms.button>
+                        </div>
+                    @endif
+                </div>
+                <div>
+                    @if ($branches->count() > 0)
+                        <div class="flex items-end gap-2 pb-4">
+                            <x-forms.checkbox instantSave id="is_static" label="Is it a static site?"
+                                helper="If your application is a static site or the final build assets should be served as a static site, enable this." />
+                            <x-forms.select id="selected_branch_name" label="Branch">
+                                <option value="default" disabled selected>Select a branch</option>
+                                @foreach ($branches as $branch)
+                                    @if ($loop->first)
+                                        <option selected value="{{ data_get($branch, 'name') }}">
+                                            {{ data_get($branch, 'name') }}
+                                        </option>
+                                    @else
+                                        <option value="{{ data_get($branch, 'name') }}">
+                                            {{ data_get($branch, 'name') }}
+                                        </option>
+                                    @endif
+                                @endforeach
+                            </x-forms.select>
+                            @if ($is_static)
+                                <x-forms.input id="publish_directory" label="Publish Directory"
+                                    helper="If there is a build process involved (like Svelte, React, Next, etc..), please specify the output directory for the build assets." />
+                            @else
+                                <x-forms.input type="number" id="port" label="Port" :readonly="$is_static"
+                                    helper="The port your application listens on." />
+                            @endif
+                        </div>
+
+                        <x-forms.button type="submit">
+                            Save New Application
+                        </x-forms.button>
+                    @endif
+                </div>
             </div>
         </form>
     @else
diff --git a/resources/views/livewire/project/new/public-git-repository.blade.php b/resources/views/livewire/project/new/public-git-repository.blade.php
index 0f63cf074..a86c87fe3 100644
--- a/resources/views/livewire/project/new/public-git-repository.blade.php
+++ b/resources/views/livewire/project/new/public-git-repository.blade.php
@@ -1,10 +1,10 @@
 <div>
     <h1>Create a new Application</h1>
     <div class="pb-4 text-sm">Deploy any public git repositories.</div>
-    <form class="flex flex-col gap-2" wire:submit.prevent='submit'>
+    <form class="flex flex-col gap-2" wire:submit.prevent>
         <div class="flex flex-col gap-2">
             <div class="flex flex-col">
-                <div class="flex flex-col gap-2">
+                <div class="flex items-end gap-2">
                     <x-forms.input wire:keydown.enter='load_branches' id="repository_url" label="Repository URL"
                         helper="{!! __('repository.url') !!}" />
                     <x-forms.button wire:click.prevent="load_branches">
@@ -12,7 +12,9 @@
                     </x-forms.button>
                 </div>
                 @if (count($branches) > 0)
-                    <div class="flex gap-2">
+                    <div class="flex items-end gap-2 pb-4">
+                        <x-forms.checkbox instantSave id="is_static" label="Is it a static site?"
+                            helper="If your application is a static site or the final build assets should be served as a static site, enable this." />
                         <x-forms.select id="selected_branch" label="Branch">
                             <option value="default" disabled selected>Select a branch</option>
                             @foreach ($branches as $branch)
@@ -20,16 +22,16 @@
                             @endforeach
                         </x-forms.select>
                         @if ($is_static)
-                            <x-forms.input class="h-8" id="publish_directory" label="Publish Directory"
+                            <x-forms.input id="publish_directory" label="Publish Directory"
                                 helper="If there is a build process involved (like Svelte, React, Next, etc..), please specify the output directory for the build assets." />
                         @else
-                            <x-forms.input class="h-8" type="number" id="port" label="Port" :readonly="$is_static"
+                            <x-forms.input type="number" id="port" label="Port" :readonly="$is_static"
                                 helper="The port your application listens on." />
                         @endif
+
                     </div>
-                    <x-forms.checkbox instantSave id="is_static" label="Is it a static site?"
-                        helper="If your application is a static site or the final build assets should be served as a static site, enable this." />
-                    <x-forms.button type="submit">
+
+                    <x-forms.button wire:click.prevent='submit'>
                         Save New Application
                     </x-forms.button>
                 @endif