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

Merge pull request #1304 from coollabsio/next

Browse Source 
v4.0.0-beta.76
This commit is contained in:
Andras Bacsai 2023-10-11 12:57:35 +02:00 committed by GitHub
commit 725c3fd547
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Livewire/Project/Application/General.php
View File

@ -76,6 +76,9 @@ class General extends Component
];
public function updatedApplicationBuildPack(){
$this->submit();
}
public function instantSave()
{
// @TODO: find another way - if possible
@ -125,6 +128,12 @@ class General extends Component
{
try {
$this->validate();
if (data_get($this->application,'build_pack') === 'dockerimage') {
$this->validate([
'application.docker_registry_image_name' => 'required',
'application.docker_registry_image_tag' => 'required',
]);
}
if (data_get($this->application, 'fqdn')) {
$domains = Str::of($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
return Str::of($domain)->trim()->lower();

6
app/Http/Livewire/Project/New/PublicGitRepository.php
View File

@ -72,10 +72,14 @@ class PublicGitRepository extends Component
public function load_branch()
{
try {
$this->branch_found = false;
$this->validate([
'repository_url' => 'required|url'
]);
} catch (\Throwable $e) {
return handleError($e, $this);
}
try {
$this->branch_found = false;
$this->get_git_source();
$this->get_branch();
$this->selected_branch = $this->git_branch;

2
config/sentry.php
View File

@ -7,7 +7,7 @@ return [
// The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => '4.0.0-beta.75',
'release' => '4.0.0-beta.76',
// When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'),

2
config/version.php
View File

@ -1,3 +1,3 @@
<?php
return '4.0.0-beta.75';
return '4.0.0-beta.76';

6
resources/views/livewire/project/application/general.blade.php
View File

@ -21,7 +21,7 @@
@if (!$application->dockerfile)
<div class="flex flex-col gap-2">
<div class="flex gap-2">
<x-forms.select id="application.build_pack" label="Build Pack" required>
<x-forms.select wire:model="application.build_pack" label="Build Pack" required>
<option value="nixpacks">Nixpacks</option>
<option value="dockerfile">Dockerfile</option>
<option value="dockerimage">Docker Image</option>
@ -73,8 +73,8 @@
</div>
@else
<div class="flex flex-col gap-2 xl:flex-row">
<x-forms.input id="application.docker_registry_image_name" required label="Docker Image" />
<x-forms.input id="application.docker_registry_image_tag" required label="Docker Image Tag" />
<x-forms.input id="application.docker_registry_image_name" label="Docker Image" />
<x-forms.input id="application.docker_registry_image_tag" label="Docker Image Tag" />
</div>
@endif

9
resources/views/livewire/project/new/public-git-repository.blade.php
View File

@ -1,13 +1,13 @@
<div>
<h1>Create a new Application</h1>
<div class="pb-4">Deploy any public Git repositories.</div>
<form class="flex flex-col gap-2" wire:submit.prevent>
<form class="flex flex-col gap-2" wire:submit.prevent='load_branch'>
<div class="flex flex-col gap-2">
<div class="flex flex-col">
<div class="flex items-end gap-2">
<x-forms.input wire:keydown.enter='load_branch' id="repository_url" label="Repository URL"
<x-forms.input required id="repository_url" label="Repository URL"
helper="{!! __('repository.url') !!}" />
<x-forms.button wire:click.prevent="load_branch">
<x-forms.button type="submit">
Check repository
</x-forms.button>
</div>
@ -16,10 +16,9 @@
<div class="flex gap-2 py-2">
<div>Rate Limit</div>
<x-helper
helper="Rate limit remaining: {{ $rate_limit_remaining }}<br>Rate limit reset at: {{ $rate_limit_reset }}" />
helper="Rate limit remaining: {{ $rate_limit_remaining }}<br>Rate limit reset at: {{ $rate_limit_reset }} UTC" />
</div>
@endif
<h3 class="pt-8 pb-2">Details</h3>
<div class="flex flex-col gap-2 pb-6">
<div class="flex gap-2">
@if ($git_source === 'other')

2
resources/views/livewire/project/new/select.blade.php
View File

@ -25,7 +25,7 @@
Public Repository
</div>
<div class="text-xs group-hover:text-white">
You can deploy any kind of public repositories from the supported git servers.
You can deploy any kind of public repositories from the supported git providers.
</div>
</div>
</div>

2
versions.json
View File

@ -4,7 +4,7 @@
"version": "3.12.36"
},
"v4": {
"version": "4.0.0-beta.75"
"version": "4.0.0-beta.76"
}
}
}