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

format muhahaha

Browse Source
This commit is contained in:
Andras Bacsai 2023-08-11 20:48:52 +02:00
parent c762195c8a
commit 82a01b4483
109 changed files with 295 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Actions/CoolifyTask/RunRemoteProcess.php
View File

@ -66,8 +66,8 @@ public static function decodeOutput(?Activity $activity = null): string
}
return collect($decoded)
->sortBy(fn($i) => $i['order'])
->map(fn($i) => $i['output'])
->sortBy(fn ($i) => $i['order'])
->map(fn ($i) => $i['output'])
->implode("");
}

6
app/Actions/Database/StartPostgresql.php
View File

@ -134,15 +134,15 @@ private function generate_environment_variables()
$environment_variables->push("$env->key=$env->value");
}
if ($environment_variables->filter(fn($env) => Str::of($env)->contains('POSTGRES_USER'))->isEmpty()) {
if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('POSTGRES_USER'))->isEmpty()) {
$environment_variables->push("POSTGRES_USER={$this->database->postgres_user}");
}
if ($environment_variables->filter(fn($env) => Str::of($env)->contains('POSTGRES_PASSWORD'))->isEmpty()) {
if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('POSTGRES_PASSWORD'))->isEmpty()) {
$environment_variables->push("POSTGRES_PASSWORD={$this->database->postgres_password}");
}
if ($environment_variables->filter(fn($env) => Str::of($env)->contains('POSTGRES_DB'))->isEmpty()) {
if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('POSTGRES_DB'))->isEmpty()) {
$environment_variables->push("POSTGRES_DB={$this->database->postgres_db}");
}
return $environment_variables->all();

6
app/Actions/Fortify/UpdateUserProfileInformation.php
View File

@ -29,8 +29,10 @@ public function update(User $user, array $input): void
],
])->validateWithBag('updateProfileInformation');
if ($input['email'] !== $user->email &&
$user instanceof MustVerifyEmail) {
if (
$input['email'] !== $user->email &&
$user instanceof MustVerifyEmail
) {
$this->updateVerifiedUser($user, $input);
} else {
$user->forceFill([

1
app/Actions/Proxy/CheckConfigurationSync.php
View File

@ -22,5 +22,4 @@ public function __invoke(Server $server, bool $reset = false)
return $proxy_configuration;
}
}

7
app/Console/Commands/NotifyDemo.php
View File

@ -43,15 +43,16 @@ private function showHelp()
style('coolify')->color('#9333EA');
style('title-box')->apply('mt-1 px-2 py-1 bg-coolify');
render(<<<'HTML'
render(
<<<'HTML'
<div>
<div class="title-box">
Coolify
</div>
<p class="ml-1 mt-1 ">
<p class="mt-1 ml-1 ">
Demo Notify <strong class="text-coolify">=></strong> Send a demo notification to a given channel.
</p>
<p class="ml-1 mt-1 bg-coolify px-1">
<p class="px-1 mt-1 ml-1 bg-coolify">
php artisan app:demo-notify {channel}
</p>
<div class="my-1">

4
app/Console/Commands/SyncBunny.php
View File

@ -64,7 +64,7 @@ public function handle()
]);
});
try {
Http::pool(fn(Pool $pool) => [
Http::pool(fn (Pool $pool) => [
$pool->storage(file: "$parent_dir/$compose_file")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$compose_file"),
$pool->storage(file: "$parent_dir/$compose_file_prod")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$compose_file_prod"),
$pool->storage(file: "$parent_dir/$production_env")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$production_env"),
@ -73,7 +73,7 @@ public function handle()
$pool->storage(file: "$parent_dir/$versions")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$versions"),
]);
ray("{$bunny_cdn}/{$bunny_cdn_path}");
Http::pool(fn(Pool $pool) => [
Http::pool(fn (Pool $pool) => [
$pool->purge("$bunny_cdn/$bunny_cdn_path/$compose_file"),
$pool->purge("$bunny_cdn/$bunny_cdn_path/$compose_file_prod"),
$pool->purge("$bunny_cdn/$bunny_cdn_path/$production_env"),

3
app/Console/Kernel.php
View File

@ -17,7 +17,7 @@ class Kernel extends ConsoleKernel
{
protected function schedule(Schedule $schedule): void
{
// $schedule->call(fn() => $this->check_scheduled_backups($schedule))->everyTenSeconds();
// $schedule->call(fn() => $this->check_scheduled_backups($schedule))->everyTenSeconds();
if (is_dev()) {
$schedule->command('horizon:snapshot')->everyMinute();
$schedule->job(new InstanceApplicationsStatusJob)->everyMinute();
@ -54,7 +54,6 @@ private function check_scheduled_backups($schedule)
backup: $scheduled_backup
))->cron($scheduled_backup->frequency);
}
}
protected function commands(): void

3
app/Data/CoolifyTaskArgs.php
View File

@ -22,7 +22,6 @@ public function __construct(
public ?Model $model = null,
public string $status = ProcessStatus::QUEUED->value,
public bool $ignore_errors = false,
)
{
) {
}
}

3
app/Data/ServerMetadata.php
View File

@ -11,7 +11,6 @@ class ServerMetadata extends Data
public function __construct(
public ?ProxyTypes $type,
public ?ProxyStatus $status
)
{
) {
}
}

6
app/Http/Controllers/Controller.php
View File

@ -24,7 +24,7 @@ public function subscription()
abort(404);
}
return view('subscription', [
'settings' => InstanceSettings::get()
'settings' => InstanceSettings::get(),
]);
}
@ -34,7 +34,7 @@ public function license()
abort(404);
}
return view('settings.license', [
'settings' => InstanceSettings::get()
'settings' => InstanceSettings::get(),
]);
}
@ -63,13 +63,11 @@ public function settings()
$settings = InstanceSettings::get();
$database = StandalonePostgresql::whereName('coolify-db')->first();
if ($database) {
$backup = $database->scheduledBackups->first();
$s3s = S3Storage::whereTeamId(0)->get();
}
return view('settings.configuration', [
'settings' => $settings,
'database' => $database,
'backup' => $backup ?? null,
's3s' => $s3s ?? [],
]);
} else {

1
app/Http/Livewire/Dev/S3Test.php
View File

@ -31,7 +31,6 @@ public function save()
} catch (\Throwable $th) {
return general_error_handler($th, $this, false);
}
}
public function get_files()

11
app/Http/Livewire/Project/Database/BackupEdit.php
View File

@ -54,18 +54,13 @@ public function instantSave()
} catch (\Exception $e) {
$this->emit('error', $e->getMessage());
}
}
private function custom_validate()
{
// if ($this->backup->save_s3) {
// if (!is_numeric($this->selected_storage_id)) {
// throw new \Exception('Invalid S3 Storage');
// } else {
// $this->backup->s3_storage_id = $this->selected_storage_id;
// }
// }
if (!is_numeric($this->backup->s3_storage_id)) {
$this->backup->s3_storage_id = null;
}
$isValid = validate_cron_expression($this->backup->frequency);
if (!$isValid) {
throw new \Exception('Invalid Cron / Human expression');

1
app/Http/Livewire/Project/Database/BackupExecution.php
View File

@ -11,7 +11,6 @@ class BackupExecution extends Component
public function download()
{
}
public function delete(): void

18
app/Http/Livewire/Project/Database/BackupNow.php Normal file
View File

@ -0,0 +1,18 @@
<?php
namespace App\Http\Livewire\Project\Database;
use App\Jobs\DatabaseBackupJob;
use Livewire\Component;
class BackupNow extends Component
{
public $backup;
public function backup_now()
{
dispatch(new DatabaseBackupJob(
backup: $this->backup
));
$this->emit('success', 'Backup queued. It will be available in a few minutes');
}
}

6
app/Http/Livewire/Project/Database/Postgresql/General.php
View File

@ -42,7 +42,7 @@ class General extends Component
public function save_init_script($script)
{
$this->database->init_scripts = filter($this->database->init_scripts, fn($s) => $s['filename'] !== $script['filename']);
$this->database->init_scripts = filter($this->database->init_scripts, fn ($s) => $s['filename'] !== $script['filename']);
$this->database->init_scripts = array_merge($this->database->init_scripts, [$script]);
$this->database->save();
$this->emit('success', 'Init script saved successfully.');
@ -53,8 +53,8 @@ public function delete_init_script($script)
$collection = collect($this->database->init_scripts);
$found = $collection->firstWhere('filename', $script['filename']);
if ($found) {
ray($collection->filter(fn($s) => $s['filename'] !== $script['filename'])->toArray());
$this->database->init_scripts = $collection->filter(fn($s) => $s['filename'] !== $script['filename'])->toArray();
ray($collection->filter(fn ($s) => $s['filename'] !== $script['filename'])->toArray());
$this->database->init_scripts = $collection->filter(fn ($s) => $s['filename'] !== $script['filename'])->toArray();
$this->database->save();
$this->refresh();
$this->emit('success', 'Init script deleted successfully.');

13
app/Http/Livewire/Settings/Backup.php
View File

@ -2,12 +2,12 @@
namespace App\Http\Livewire\Settings;
use App\Jobs\DatabaseBackupJob;
use App\Models\InstanceSettings;
use App\Models\S3Storage;
use App\Models\ScheduledDatabaseBackup;
use App\Models\Server;
use App\Models\StandalonePostgresql;
use App\Jobs\DatabaseBackupJob;
use Livewire\Component;
class Backup extends Component
@ -16,6 +16,7 @@ class Backup extends Component
public $s3s;
public StandalonePostgresql|null $database = null;
public ScheduledDatabaseBackup|null $backup = null;
public $executions = [];
protected $rules = [
'database.uuid' => 'required',
@ -33,9 +34,13 @@ class Backup extends Component
'database.postgres_password' => 'postgres password',
];
public function mount()
{
$this->backup = $this->database->scheduledBackups->first();
$this->executions = $this->backup->executions;
}
public function add_coolify_database()
{
ray('add_coolify_database');
$server = Server::find(0);
$out = instant_remote_process(['docker inspect coolify-db'], $server);
$envs = format_docker_envs_to_json($out);
@ -68,7 +73,8 @@ public function add_coolify_database()
$this->s3s = S3Storage::whereTeamId(0)->get();
}
public function backup_now() {
public function backup_now()
{
dispatch(new DatabaseBackupJob(
backup: $this->backup
));
@ -78,5 +84,4 @@ public function submit()
{
$this->emit('success', 'Backup updated successfully');
}
}

1
app/Http/Livewire/Team/Storage/Create.php
View File

@ -70,7 +70,6 @@ public function submit()
} catch (\Throwable $th) {
return general_error_handler($th, $this);
}
}
private function test_s3_connection()

2
app/Jobs/ApplicationDeploymentJob.php
View File

@ -434,7 +434,7 @@ private function generate_environment_variables($ports)
}
}
// Add PORT if not exists, use the first port as default
if ($environment_variables->filter(fn($env) => Str::of($env)->contains('PORT'))->isEmpty()) {
if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('PORT'))->isEmpty()) {
$environment_variables->push("PORT={$ports[0]}");
}
return $environment_variables->all();

3
app/Jobs/ApplicationPullRequestUpdateJob.php
View File

@ -25,8 +25,7 @@ public function __construct(
public int $pull_request_id,
public string $deployment_uuid,
public string $status
)
{
) {
}
public function handle()

3
app/Jobs/CoolifyTask.php
View File

@ -20,8 +20,7 @@ class CoolifyTask implements ShouldQueue
public function __construct(
public Activity $activity,
public bool $ignore_errors = false,
)
{
) {
}
/**

3
app/Jobs/DatabaseBackupJob.php
View File

@ -157,7 +157,7 @@ private function upload_to_s3(): void
}
$key = $this->s3->key;
$secret = $this->s3->secret;
// $region = $this->s3->region;
// $region = $this->s3->region;
$bucket = $this->s3->bucket;
$endpoint = $this->s3->endpoint;
@ -183,6 +183,5 @@ private function save_backup_logs(): void
'message' => $this->backup_output,
'size' => $this->size,
]);
}
}

3
app/Jobs/SendMessageToDiscordJob.php
View File

@ -28,8 +28,7 @@ class SendMessageToDiscordJob implements ShouldQueue
public function __construct(
public string $text,
public string $webhookUrl
)
{
) {
}
/**

10
app/Models/Application.php
View File

@ -41,7 +41,7 @@ public function type()
public function publishDirectory(): Attribute
{
return Attribute::make(
set: fn($value) => $value ? '/' . ltrim($value, '/') : null,
set: fn ($value) => $value ? '/' . ltrim($value, '/') : null,
);
}
@ -71,14 +71,14 @@ public function gitCommits(): Attribute
public function baseDirectory(): Attribute
{
return Attribute::make(
set: fn($value) => '/' . ltrim($value, '/'),
set: fn ($value) => '/' . ltrim($value, '/'),
);
}
public function portsMappings(): Attribute
{
return Attribute::make(
set: fn($value) => $value === "" ? null : $value,
set: fn ($value) => $value === "" ? null : $value,
);
}
@ -87,7 +87,7 @@ public function portsMappings(): Attribute
public function portsMappingsArray(): Attribute
{
return Attribute::make(
get: fn() => is_null($this->ports_mappings)
get: fn () => is_null($this->ports_mappings)
? []
: explode(',', $this->ports_mappings),
@ -97,7 +97,7 @@ public function portsMappingsArray(): Attribute
public function portsExposesArray(): Attribute
{
return Attribute::make(
get: fn() => is_null($this->ports_exposes)
get: fn () => is_null($this->ports_exposes)
? []
: explode(',', $this->ports_exposes)
);

2
app/Models/Environment.php
View File

@ -45,7 +45,7 @@ public function services()
protected function name(): Attribute
{
return Attribute::make(
set: fn(string $value) => strtolower($value),
set: fn (string $value) => strtolower($value),
);
}
}

6
app/Models/EnvironmentVariable.php
View File

@ -34,8 +34,8 @@ protected static function booted()
protected function value(): Attribute
{
return Attribute::make(
get: fn(string $value) => $this->get_environment_variables($value),
set: fn(string $value) => $this->set_environment_variables($value),
get: fn (string $value) => $this->get_environment_variables($value),
set: fn (string $value) => $this->set_environment_variables($value),
);
}
@ -67,7 +67,7 @@ private function set_environment_variables(string $environment_variable): string
protected function key(): Attribute
{
return Attribute::make(
set: fn(string $value) => Str::of($value)->trim(),
set: fn (string $value) => Str::of($value)->trim(),
);
}
}

4
app/Models/LocalPersistentVolume.php
View File

@ -23,14 +23,14 @@ public function standalone_postgresql()
protected function name(): Attribute
{
return Attribute::make(
set: fn(string $value) => Str::of($value)->trim()->value,
set: fn (string $value) => Str::of($value)->trim()->value,
);
}
protected function mountPath(): Attribute
{
return Attribute::make(
set: fn(string $value) => Str::of($value)->trim()->start('/')->value
set: fn (string $value) => Str::of($value)->trim()->start('/')->value
);
}

4
app/Models/StandalonePostgresql.php
View File

@ -33,7 +33,7 @@ protected static function booted()
public function portsMappings(): Attribute
{
return Attribute::make(
set: fn($value) => $value === "" ? null : $value,
set: fn ($value) => $value === "" ? null : $value,
);
}
@ -42,7 +42,7 @@ public function portsMappings(): Attribute
public function portsMappingsArray(): Attribute
{
return Attribute::make(
get: fn() => is_null($this->ports_mappings)
get: fn () => is_null($this->ports_mappings)
? []
: explode(',', $this->ports_mappings),

2
app/Notifications/Channels/EmailChannel.php
View File

@ -23,7 +23,7 @@ public function send(SendsEmail $notifiable, Notification $notification): void
Mail::send(
[],
[],
fn(Message $message) => $message
fn (Message $message) => $message
->from(
data_get($notifiable, 'smtp_from_address'),
data_get($notifiable, 'smtp_from_name'),

2
app/Notifications/Channels/TransactionalEmailChannel.php
View File

@ -25,7 +25,7 @@ public function send(User $notifiable, Notification $notification): void
Mail::send(
[],
[],
fn(Message $message) => $message
fn (Message $message) => $message
->from(
data_get($settings, 'smtp_from_address'),
data_get($settings, 'smtp_from_name')

1
app/Notifications/TransactionalEmails/ResetPassword.php
View File

@ -49,7 +49,6 @@ public function via($notifiable)
return ['mail'];
}
throw new \Exception('SMTP is not enabled');
}
public function toMail($notifiable)

3
app/Providers/FortifyServiceProvider.php
View File

@ -23,7 +23,8 @@ class FortifyServiceProvider extends ServiceProvider
*/
public function register(): void
{
$this->app->instance(RegisterResponse::class, new class implements RegisterResponse {
$this->app->instance(RegisterResponse::class, new class implements RegisterResponse
{
public function toResponse($request)
{
// First user (root) will be redirected to /settings instead of / on registration.

3
app/View/Components/Forms/Button.php
View File

@ -17,8 +17,7 @@ public function __construct(
public bool $noStyle = false,
public string|null $modalId = null,
public string $defaultClass = "btn btn-primary btn-sm font-normal text-white normal-case no-animation rounded border-none"
)
{
) {
if ($this->noStyle) {
$this->defaultClass = "";
}

3
app/View/Components/Forms/Checkbox.php
View File

@ -20,8 +20,7 @@ public function __construct(
public bool $instantSave = false,
public bool $disabled = false,
public string $defaultClass = "toggle toggle-xs toggle-warning rounded disabled:bg-coolgray-200 disabled:opacity-50 placeholder:text-neutral-700"
)
{
) {
//
}

3
app/View/Components/Forms/Input.php
View File

@ -21,8 +21,7 @@ public function __construct(
public string|null $helper = null,
public bool $allowToPeak = true,
public string $defaultClass = "input input-sm bg-coolgray-200 rounded text-white w-full disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
)
{
) {
}
public function render(): View|Closure|string

3
app/View/Components/Forms/Select.php
View File

@ -20,8 +20,7 @@ public function __construct(
public string|null $helper = null,
public bool $required = false,
public string $defaultClass = "select select-sm w-full rounded text-white text-sm bg-coolgray-200 font-normal disabled:bg-coolgray-200/50 disabled:border-none"
)
{
) {
//
}

3
app/View/Components/Forms/Textarea.php
View File

@ -25,8 +25,7 @@ public function __construct(
public bool $readonly = false,
public string|null $helper = null,
public string $defaultClass = "textarea bg-coolgray-200 rounded text-white scrollbar disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
)
{
) {
//
}

3
app/View/Components/Modal.php
View File

@ -18,8 +18,7 @@ public function __construct(
public string|null $modalSubmit = null,
public bool $yesOrNo = false,
public string $action = 'delete'
)
{
) {
//
}

6
bootstrap/helpers/docker.php
View File

@ -8,8 +8,8 @@ function format_docker_command_output_to_json($rawOutput): Collection
$outputLines = explode(PHP_EOL, $rawOutput);
return collect($outputLines)
->reject(fn($line) => empty($line))
->map(fn($outputLine) => json_decode($outputLine, true, flags: JSON_THROW_ON_ERROR));
->reject(fn ($line) => empty($line))
->map(fn ($outputLine) => json_decode($outputLine, true, flags: JSON_THROW_ON_ERROR));
}
function format_docker_labels_to_json($rawOutput): Collection
@ -17,7 +17,7 @@ function format_docker_labels_to_json($rawOutput): Collection
$outputLines = explode(PHP_EOL, $rawOutput);
return collect($outputLines)
->reject(fn($line) => empty($line))
->reject(fn ($line) => empty($line))
->map(function ($outputLine) {
$outputArray = explode(',', $outputLine);
return collect($outputArray)

7
bootstrap/helpers/remoteProcess.php
View File

@ -27,8 +27,7 @@ function remote_process(
?string $type_uuid = null,
?Model $model = null,
bool $ignore_errors = false,
): Activity
{
): Activity {
$command_string = implode("\n", $command);
if (auth()->user()) {
@ -141,10 +140,10 @@ function decode_remote_command_output(?ApplicationDeploymentQueue $application_d
}
$formatted = collect($decoded);
if (!$is_debug_enabled) {
$formatted = $formatted->filter(fn($i) => $i['hidden'] === false ?? false);
$formatted = $formatted->filter(fn ($i) => $i['hidden'] === false ?? false);
}
$formatted = $formatted
->sortBy(fn($i) => $i['order'])
->sortBy(fn ($i) => $i['order'])
->map(function ($i) {
$i['timestamp'] = Carbon::parse($i['timestamp'])->format('Y-M-d H:i:s.u');
return $i;

2
bootstrap/helpers/shared.php
View File

@ -178,5 +178,3 @@ function validate_cron_expression($expression_to_validate): bool
}
return $isValid;
}

2
database/factories/UserFactory.php
View File

@ -30,7 +30,7 @@ public function definition(): array
*/
public function unverified(): static
{
return $this->state(fn(array $attributes) => [
return $this->state(fn (array $attributes) => [
'email_verified_at' => null,
]);
}

3
database/migrations/2014_10_12_000000_create_users_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2014_10_12_100000_create_password_reset_tokens_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2014_10_12_200000_add_two_factor_columns_to_users_table.php
View File

@ -5,7 +5,8 @@
use Illuminate\Support\Facades\Schema;
use Laravel\Fortify\Fortify;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_20_112809_create_sessions_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_20_112811_create_teams_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_20_112812_create_team_user_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_20_112813_create_team_invitations_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_20_112814_create_instance_settings_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_24_140711_create_servers_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_24_140712_create_server_settings_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_24_140853_create_private_keys_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_27_075351_create_projects_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_27_075443_create_project_settings_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_27_075444_create_environments_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_27_081716_create_applications_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_27_081717_create_application_settings_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_27_081718_create_application_previews_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_27_083621_create_services_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_27_085020_create_standalone_dockers_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_27_085022_create_swarm_dockers_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_28_062150_create_kubernetes_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_28_083723_create_github_apps_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_03_28_083726_create_gitlab_apps_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_04_03_111012_create_local_persistent_volumes_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_05_04_194548_create_environment_variables_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_05_17_104039_create_failed_jobs_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_05_24_083426_create_application_deployment_queues_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_06_22_131459_move_wildcard_to_server.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_06_23_084605_remove_wildcard_domain_from_instancesettings.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_06_23_110548_next_channel_updates.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_06_23_114131_change_env_var_value_length.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_06_23_114132_remove_default_redirect_from_instance_settings.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_06_23_114133_use_application_deployment_queues_as_activity.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_06_23_114134_add_disk_usage_percentage_to_servers.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_07_13_115117_create_subscriptions_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_07_13_120719_create_webhooks_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_07_13_120721_add_license_to_instance_settings.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_07_27_182013_smtp_discord_schemaless_to_normal.php
View File

@ -6,7 +6,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_08_06_142951_add_description_field_to_applications_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_08_06_142952_remove_foreignId_environment_variables.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_08_06_142954_add_readonly_localpersistentvolumes.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_08_07_073651_create_s3_storages_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_08_07_142950_create_standalone_postgresqls_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/2023_08_08_150103_create_scheduled_database_backups_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
public function up(): void
{
Schema::create('scheduled_database_backups', function (Blueprint $table) {

3
database/migrations/2023_08_10_113306_create_scheduled_database_backup_executions_table.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
public function up(): void
{
Schema::create('scheduled_database_backup_executions', function (Blueprint $table) {

3
database/migrations/2023_08_10_201311_add_backup_notifications_to_teams.php
View File

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
return new class extends Migration
{
public function up(): void
{
Schema::table('teams', function (Blueprint $table) {

12
database/seeders/EnvironmentVariableSeeder.php
View File

@ -11,11 +11,11 @@ class EnvironmentVariableSeeder extends Seeder
*/
public function run(): void
{
// EnvironmentVariable::create([
// 'key' => 'NODE_ENV',
// 'value' => 'production',
// 'is_build_time' => true,
// 'application_id' => 1,
// ]);
// EnvironmentVariable::create([
// 'key' => 'NODE_ENV',
// 'value' => 'production',
// 'is_build_time' => true,
// 'application_id' => 1,
// ]);
}
}

4
database/seeders/ProjectSettingSeeder.php
View File

@ -8,8 +8,8 @@ class ProjectSettingSeeder extends Seeder
{
public function run(): void
{
// $first_project = Project::find(1);
// $first_project = Project::find(1);
// $first_project->settings->wildcard_domain = 'wildcard.example.com';
// $first_project->settings->save();
// $first_project->settings->save();
}
}

3
resources/views/emails/application-deployment-failed.php
View File

@ -1,6 +1,5 @@
@if ($pull_request_id !== 0)
Pull Request #{{ $pull_request_id }} of {{ $name }} (<a target="_blank"
href="{{ $fqdn }}">{{ $fqdn }}</a>) deployment failed:
Pull Request #{{ $pull_request_id }} of {{ $name }} (<a target="_blank" href="{{ $fqdn }}">{{ $fqdn }}</a>) deployment failed:
@else
Deployment failed of {{ $name }} (<a target="_blank" href="{{ $fqdn }}">{{ $fqdn }}</a>):
@endif

3
resources/views/emails/application-deployment-success.php
View File

@ -1,8 +1,7 @@
@if ($pull_request_id === 0)
A new version of <a target="_blank" href="{{ $fqdn }}">{{ $fqdn }}</a> is available:
@else
Pull request #{{ $pull_request_id }} of {{ $name }} deployed successfully: <a target="_blank"
href="{{ $fqdn }}">Application Link</a> |
Pull request #{{ $pull_request_id }} of {{ $name }} deployed successfully: <a target="_blank" href="{{ $fqdn }}">Application Link</a> |
@endif
<a target="_blank" href="{{ $deployment_url }}">View
Deployment Logs</a><br><br>

1
resources/views/livewire/project/database/backup-edit.blade.php
View File

@ -4,6 +4,7 @@
<x-forms.button type="submit">
Save
</x-forms.button>
<livewire:project.database.backup-now :backup="$backup" />
@if ($backup->database_id !== 0)
<x-forms.button isError wire:click="delete">Delete</x-forms.button>
@endif

1
resources/views/livewire/project/database/backup-execution.blade.php
View File

@ -1,5 +1,6 @@
<div class="flex gap-2">
<div class="flex-1"></div>
{{-- @if (data_get($execution, 'status') !== 'failed') --}}
{{-- <x-forms.button class="bg-coollabs-100 hover:bg-coollabs" wire:click="download">Download</x-forms.button> --}}
{{-- @endif --}}

1
resources/views/livewire/project/database/backup-now.blade.php Normal file
View File

@ -0,0 +1 @@
<x-forms.button wire:click='backup_now'>Backup Now</x-forms.button>

5
resources/views/livewire/settings/backup.blade.php
View File

@ -6,7 +6,6 @@
<x-forms.button type="submit" wire:click="submit">
Save
</x-forms.button>
<x-forms.button wire:click="backup_now">Backup Now</x-forms.button>
@endif
</div>
<div class="pb-4">Backup your Coolify instance settings</div>
@ -30,5 +29,9 @@
<x-forms.button wire:click="add_coolify_database">Add Database</x-forms.button>
@endif
</div>
<div class="py-4">
<h2 class="pb-4">Executions</h2>
<livewire:project.database.backup-executions :backup="$backup" :executions="$executions" />
</div>
</div>
</div>

2
resources/views/settings/configuration.blade.php
View File

@ -14,7 +14,7 @@
<livewire:settings.configuration :settings="$settings" />
</div>
<div x-cloak x-show="activeTab === 'backup'" class="h-full">
<livewire:settings.backup :settings="$settings" :database="$database" :backup="$backup" :s3s="$s3s" />
<livewire:settings.backup :settings="$settings" :database="$database" :s3s="$s3s" />
</div>
<div x-cloak x-show="activeTab === 'smtp'" class="h-full">
<livewire:settings.email :settings="$settings" />

30
routes/web.php
View File

@ -68,23 +68,23 @@
});
Route::middleware(['auth'])->group(function () {
Route::get('/servers', fn() => view('server.all', [
Route::get('/servers', fn () => view('server.all', [
'servers' => Server::ownedByCurrentTeam()->get()
]))->name('server.all');
Route::get('/server/new', fn() => view('server.create', [
Route::get('/server/new', fn () => view('server.create', [
'private_keys' => PrivateKey::ownedByCurrentTeam()->get(),
]))->name('server.create');
Route::get('/server/{server_uuid}', fn() => view('server.show', [
Route::get('/server/{server_uuid}', fn () => view('server.show', [
'server' => Server::ownedByCurrentTeam(['name', 'description', 'ip', 'port', 'user', 'proxy'])->whereUuid(request()->server_uuid)->firstOrFail(),
]))->name('server.show');
Route::get('/server/{server_uuid}/proxy', fn() => view('server.proxy', [
Route::get('/server/{server_uuid}/proxy', fn () => view('server.proxy', [
'server' => Server::ownedByCurrentTeam(['name', 'proxy'])->whereUuid(request()->server_uuid)->firstOrFail(),
]))->name('server.proxy');
Route::get('/server/{server_uuid}/private-key', fn() => view('server.private-key', [
Route::get('/server/{server_uuid}/private-key', fn () => view('server.private-key', [
'server' => Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->firstOrFail(),
'privateKeys' => PrivateKey::ownedByCurrentTeam()->get(),
]))->name('server.private-key');
Route::get('/server/{server_uuid}/destinations', fn() => view('server.destinations', [
Route::get('/server/{server_uuid}/destinations', fn () => view('server.destinations', [
'server' => Server::ownedByCurrentTeam(['name', 'proxy'])->whereUuid(request()->server_uuid)->firstOrFail()
]))->name('server.destinations');
});
@ -95,32 +95,32 @@
Route::get('/subscription', [Controller::class, 'subscription'])->name('subscription');
Route::get('/settings', [Controller::class, 'settings'])->name('settings.configuration');
Route::get('/settings/license', [Controller::class, 'license'])->name('settings.license');
Route::get('/profile', fn() => view('profile', ['request' => request()]))->name('profile');
Route::get('/profile', fn () => view('profile', ['request' => request()]))->name('profile');
Route::get('/team', [Controller::class, 'team'])->name('team.show');
Route::get('/team/new', fn() => view('team.create'))->name('team.create');
Route::get('/team/notifications', fn() => view('team.notifications'))->name('team.notifications');
Route::get('/team/new', fn () => view('team.create'))->name('team.create');
Route::get('/team/notifications', fn () => view('team.notifications'))->name('team.notifications');
Route::get('/team/storages', [Controller::class, 'storages'])->name('team.storages.all');
Route::get('/team/storages/new', fn() => view('team.storages.create'))->name('team.storages.new');
Route::get('/team/storages/new', fn () => view('team.storages.create'))->name('team.storages.new');
Route::get('/team/storages/{storage_uuid}', [Controller::class, 'storages_show'])->name('team.storages.show');
Route::get('/team/members', [Controller::class, 'members'])->name('team.members');
Route::get('/command-center', fn() => view('command-center', ['servers' => Server::isReachable()->get()]))->name('command-center');
Route::get('/command-center', fn () => view('command-center', ['servers' => Server::isReachable()->get()]))->name('command-center');
Route::get('/invitations/{uuid}', [Controller::class, 'acceptInvitation'])->name('team.invitation.accept');
Route::get('/invitations/{uuid}/revoke', [Controller::class, 'revokeInvitation'])->name('team.invitation.revoke');
});
Route::middleware(['auth'])->group(function () {
Route::get('/private-keys', fn() => view('private-key.all', [
Route::get('/private-keys', fn () => view('private-key.all', [
'privateKeys' => PrivateKey::ownedByCurrentTeam(['name', 'uuid', 'is_git_related'])->where('is_git_related', false)->get()
]))->name('private-key.all');
Route::get('/private-key/new', fn() => view('private-key.new'))->name('private-key.new');
Route::get('/private-key/{private_key_uuid}', fn() => view('private-key.show', [
Route::get('/private-key/new', fn () => view('private-key.new'))->name('private-key.new');
Route::get('/private-key/{private_key_uuid}', fn () => view('private-key.show', [
'private_key' => PrivateKey::ownedByCurrentTeam(['name', 'description', 'private_key', 'is_git_related'])->whereUuid(request()->private_key_uuid)->firstOrFail()
]))->name('private-key.show');
});
Route::middleware(['auth'])->group(function () {
Route::get('/source/new', fn() => view('source.new'))->name('source.new');
Route::get('/source/new', fn () => view('source.new'))->name('source.new');
Route::get('/sources', function () {
$sources = auth()->user()->currentTeam()->sources();
return view('source.all', [

3
tests/DuskTestCase.php
View File

@ -41,7 +41,8 @@ protected function driver(): RemoteWebDriver
return RemoteWebDriver::create(
$_ENV['DUSK_DRIVER_URL'] ?? 'http://localhost:9515',
DesiredCapabilities::chrome()->setCapability(
ChromeOptions::CAPABILITY, $options
ChromeOptions::CAPABILITY,
$options
)
);
}

2
tests/Pest.php
View File

@ -13,7 +13,7 @@
uses(
Tests\TestCase::class,
// Illuminate\Foundation\Testing\RefreshDatabase::class,
// Illuminate\Foundation\Testing\RefreshDatabase::class,
)->in('Feature');
/*