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

Merge branch 'next' of https://github.com/coollabsio/coolify into next

Browse Source
This commit is contained in:
peaklabs-dev
2024-11-08 15:10:10 +01:00
parent 78a96b4efe 31dd2176b2
commit a6d71bb7ee
9 changed files with 11 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Livewire/Source/Github/Create.php
View File

@@ -23,7 +23,7 @@ class Create extends Component
public function mount() public function mount()
{ {
$this->name = substr(generate_random_name(), 0, 34); // GitHub Apps names can only be 34 characters long $this->name = substr(generate_random_name(), 0, 30);
} }
public function createGitHubApp() public function createGitHubApp()

2
config/sentry.php
View File

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

2
config/version.php
View File

@@ -1,3 +1,3 @@
<?php <?php
return '4.0.0-beta.363'; return '4.0.0-beta.364';

2
resources/views/livewire/project/new/github-private-repository.blade.php
View File

@@ -1,7 +1,7 @@
<div> <div>
<div class="flex items-end gap-2"> <div class="flex items-end gap-2">
<h1>Create a new Application</h1> <h1>Create a new Application</h1>
<x-modal-input buttonTitle="+ Add GitHub App" title="New GitHub App"> <x-modal-input buttonTitle="+ Add GitHub App" title="New GitHub App" closeOutside="false">
<livewire:source.github.create /> <livewire:source.github.create />
</x-modal-input> </x-modal-input>
@if ($repositories->count() > 0) @if ($repositories->count() > 0)

6
resources/views/livewire/project/shared/scheduled-task/all.blade.php
View File

@@ -1,11 +1,11 @@
<div> <div>
<div class="flex gap-2"> <div class="flex gap-2">
<h2>Scheduled Tasks</h2> <h2>Scheduled Tasks</h2>
<x-modal-input buttonTitle="+ Add" title="New Scheduled Task" :closeOutside=false> <x-modal-input buttonTitle="+ Add" title="New Scheduled Task" :closeOutside="false">
@if ($resource->type() == 'application') @if ($resource->type() == 'application')
<livewire:project.shared.scheduled-task.add :type="$resource->type()" :containerNames="$containerNames"/> <livewire:project.shared.scheduled-task.add :type="$resource->type()" :containerNames="$containerNames" />
@elseif ($resource->type() == 'service') @elseif ($resource->type() == 'service')
<livewire:project.shared.scheduled-task.add :type="$resource->type()" :containerNames="$containerNames"/> <livewire:project.shared.scheduled-task.add :type="$resource->type()" :containerNames="$containerNames" />
@endif @endif
</x-modal-input> </x-modal-input>
</div> </div>

2
resources/views/source/all.blade.php
View File

@@ -4,7 +4,7 @@
</x-slot> </x-slot>
<div class="flex items-start gap-2"> <div class="flex items-start gap-2">
<h1>Sources</h1> <h1>Sources</h1>
<x-modal-input buttonTitle="+ Add" title="New GitHub App"> <x-modal-input buttonTitle="+ Add" title="New GitHub App" :closeOutside="false">
<livewire:source.github.create /> <livewire:source.github.create />
</x-modal-input> </x-modal-input>
</div> </div>

4
resources/views/source/github/new.blade.php
View File

@@ -1,4 +0,0 @@
<x-layout>
<h1>New GitHub Source</h1>
</x-layout>

22
resources/views/source/new.blade.php
View File

@@ -1,22 +0,0 @@
<x-layout>
<h1>New Source</h1>
<div class="subtitle ">Add source providers for your applications.</div>
<div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'github' }">
{{-- <div class="flex justify-center h-full gap-2 pb-6">
<a class="flex items-center justify-center w-1/2 p-2 transition-colors rounded-none min-h-12 bg-coolgray-200 hover:bg-coollabs-100 hover:dark:text-white hover:no-underline"
:class="activeTab === 'github' && 'bg-coollabs dark:text-white'"
@click.prevent="activeTab = 'github'; window.location.hash = 'github'" href="#">GitHub
</a>
<a class="flex items-center justify-center w-1/2 p-2 transition-colors rounded-none min-h-12 bg-coolgray-200 hover:bg-coollabs-100 hover:dark:text-white hover:no-underline"
:class="activeTab === 'gitlab' && 'bg-coollabs dark:text-white'"
@click.prevent="activeTab = 'gitlab'; window.location.hash = 'gitlab'" href="#">GitLab
</a>
</div> --}}
<div x-cloak x-show="activeTab === 'github'" class="h-full">
<livewire:source.github.create />
</div>
{{-- <div x-cloak x-show="activeTab === 'gitlab'" class="h-full">
WIP
</div> --}}
</div>
</x-layout>

6
versions.json
View File

@@ -1,10 +1,10 @@
{ {
"coolify": { "coolify": {
"v4": { "v4": {
"version": "4.0.0-beta.363" "version": "4.0.0-beta.364"
}, },
"nightly": { "nightly": {
"version": "4.0.0-beta.364" "version": "4.0.0-beta.365"
}, },
"helper": { "helper": {
"version": "1.0.3" "version": "1.0.3"
@@ -16,4 +16,4 @@
"version": "0.0.15" "version": "0.0.15"
} }
} }
} }