dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Andras Bacsai
2023-06-12 14:38:32 +02:00
parent 7ef4d8dccb
commit d96cae2fff
7 changed files with 112 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/components/applications/navbar.blade.php
View File

@@ -25,7 +25,7 @@
<li>
<a target="_blank" class="text-xs text-white rounded-none hover:no-underline hover:bg-coollabs"
href="{{ $application->gitBranchLocation }}">
<x-git-icon git="{{ $application->source->getMorphClass() }}" />
<x-git-icon git="{{ $application->source?->getMorphClass() }}" />
Git Repository
</a>
</li>

13
resources/views/components/git-icon.blade.php
View File

@@ -15,4 +15,17 @@
<path stroke="none" d="M0 0h24v24H0z" fill="none" />
<path d="M21 14l-9 7l-9 -7l3 -11l3 7h6l3 -7z" />
</svg>
@else
<svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
fill="none" stroke-linecap="round" stroke-linejoin="round">
<path stroke="none" d="M0 0h24v24H0z" fill="none" />
<path d="M16 12m-1 0a1 1 0 1 0 2 0a1 1 0 1 0 -2 0" />
<path d="M12 8m-1 0a1 1 0 1 0 2 0a1 1 0 1 0 -2 0" />
<path d="M12 16m-1 0a1 1 0 1 0 2 0a1 1 0 1 0 -2 0" />
<path d="M12 15v-6" />
<path d="M15 11l-2 -2" />
<path d="M11 7l-1.9 -1.9" />
<path
d="M13.446 2.6l7.955 7.954a2.045 2.045 0 0 1 0 2.892l-7.955 7.955a2.045 2.045 0 0 1 -2.892 0l-7.955 -7.955a2.045 2.045 0 0 1 0 -2.892l7.955 -7.955a2.045 2.045 0 0 1 2.892 0z" />
</svg>
@endif

20
resources/views/livewire/project/application/source.blade.php
View File

@@ -1,11 +1,11 @@
<div>
<form wire:submit.prevent='submit' class="flex flex-col w-96">
<form wire:submit.prevent='submit' class="flex flex-col">
<div class="flex items-center gap-2">
<h2>Source</h2>
<x-forms.button type="submit">Save</x-forms.button>
<a target="_blank" class="hover:no-underline" href="{{ $application->gitBranchLocation }}">
<a target="_blank" class="hover:no-underline" href="{{ $application?->gitBranchLocation }}">
<x-forms.button>
<x-git-icon git="{{ $application->source->getMorphClass() }}" />Open Repository on Git
<x-git-icon git="{{ $application->source?->getMorphClass() }}" />Open Repository on Git
<x-external-link />
</x-forms.button>
</a>
@@ -15,7 +15,7 @@
<x-forms.input placeholder="main" id="application.git_branch" label="Branch" />
<div class="flex items-end gap-2 w-96">
<x-forms.input placeholder="HEAD" id="application.git_commit_sha" placeholder="HEAD" label="Commit SHA" />
<a target="_blank" class="flex hover:no-underline" href="{{ $application->gitCommits }}">
<a target="_blank" class="flex hover:no-underline" href="{{ $application?->gitCommits }}">
<x-forms.button><svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24"
stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
stroke-linejoin="round">
@@ -28,5 +28,17 @@
</x-forms.button>
</a>
</div>
@if ($application->private_key_id)
<h4 class="py-2 pt-4">Current Deploy Key: <span
class="text-warning">{{ $application->private_key->name }}</span></h4>
<div class="py-2 text-sm">Select another Deploy Key</div>
<div class="flex gap-2">
@foreach ($private_keys as $key)
<x-forms.button wire:click.defer="setPrivateKey('{{ $key->id }}')">{{ $key->name }}
</x-forms.button>
@endforeach
</div>
@endif
</form>
</div>

28
resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php
View File

@@ -1,7 +1,7 @@
<div>
<h1>Create a new Application</h1>
<div class="pb-4 text-sm">Deploy any public or private git repositories through a Deploy Key.</div>
<h3 class="py-2">Select a private key</h3>
<div class="pt-2 pb-10 text-sm">Deploy any public or private GIT repositories through a Deploy Key.</div>
<h3 class="py-2">Select a Private Key</h3>
@foreach ($private_keys as $key)
@if ($private_key_id == $key->id)
<x-forms.button class="bg-coollabs hover:bg-coollabs-100"
@@ -12,19 +12,21 @@
</x-forms.button>
@endif
@endforeach
<a href="{{ route('private-key.new') }}">
<x-forms.button isHighlighted>+</x-forms.button>
</a>
@isset($private_key_id)
<form class="pt-6" wire:submit.prevent='submit'>
<div class="flex items-end gap-2 pb-2">
<x-forms.input class="w-96" id="repository_url" label="Repository URL" />
@if ($is_static)
<x-forms.input id="publish_directory" label="Publish Directory" />
@else
<x-forms.input type="number" id="port" label="Port" :readonly="$is_static" />
@endif
<x-forms.checkbox instantSave id="is_static" label="Static Site?" />
</div>
<form class="flex flex-col gap-2" wire:submit.prevent='submit'>
<x-forms.input id="repository_url" label="Repository URL" helper="{!! __('repository.url') !!}" />
<x-forms.input id="branch" label="Branch" />
<x-forms.checkbox instantSave id="is_static" label="Static Site?" />
@if ($is_static)
<x-forms.input id="publish_directory" label="Publish Directory" />
@else
<x-forms.input type="number" id="port" label="Port" :readonly="$is_static" />
@endif
<x-forms.button type="submit">
Add New Application
Save New Application
</x-forms.button>
</form>
@endisset