rename instance settings
This commit is contained in:
parent
85a311b3ae
commit
07c952d75b
@ -6,7 +6,7 @@
|
|||||||
use App\Data\RemoteProcessArgs;
|
use App\Data\RemoteProcessArgs;
|
||||||
use App\Enums\ActivityTypes;
|
use App\Enums\ActivityTypes;
|
||||||
use App\Models\Application;
|
use App\Models\Application;
|
||||||
use App\Models\CoolifyInstanceSettings;
|
use App\Models\InstanceSettings;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Illuminate\Bus\Queueable;
|
use Illuminate\Bus\Queueable;
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
@ -77,7 +77,7 @@ public function __construct(
|
|||||||
public function handle(): void
|
public function handle(): void
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
$coolify_instance_settings = CoolifyInstanceSettings::find(1);
|
$coolify_instance_settings = InstanceSettings::find(0);
|
||||||
$this->source = $this->application->source->getMorphClass()::where('id', $this->application->source->id)->first();
|
$this->source = $this->application->source->getMorphClass()::where('id', $this->application->source->id)->first();
|
||||||
|
|
||||||
// Get Wildcard Domain
|
// Get Wildcard Domain
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class CoolifyInstanceSettings extends Model
|
class InstanceSettings extends Model
|
||||||
{
|
{
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
}
|
}
|
@ -52,7 +52,9 @@ protected static function boot()
|
|||||||
$model->uuid = (string) new Cuid2(7);
|
$model->uuid = (string) new Cuid2(7);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
public function isRoot() {
|
||||||
|
return $this->id == 0;
|
||||||
|
}
|
||||||
public function teams()
|
public function teams()
|
||||||
{
|
{
|
||||||
return $this->belongsToMany(Team::class);
|
return $this->belongsToMany(Team::class);
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
*/
|
*/
|
||||||
public function up(): void
|
public function up(): void
|
||||||
{
|
{
|
||||||
Schema::create('coolify_instance_settings', function (Blueprint $table) {
|
Schema::create('instance_settings', function (Blueprint $table) {
|
||||||
$table->id();
|
$table->id();
|
||||||
$table->string('fqdn')->nullable();
|
$table->string('fqdn')->nullable();
|
||||||
$table->string('wildcard_domain')->nullable();
|
$table->string('wildcard_domain')->nullable();
|
||||||
@ -36,6 +36,6 @@ public function up(): void
|
|||||||
*/
|
*/
|
||||||
public function down(): void
|
public function down(): void
|
||||||
{
|
{
|
||||||
Schema::dropIfExists('coolify_instance_settings');
|
Schema::dropIfExists('instance_settings');
|
||||||
}
|
}
|
||||||
};
|
};
|
@ -1,28 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace Database\Seeders;
|
|
||||||
|
|
||||||
use App\Models\Application;
|
|
||||||
use App\Models\ApplicationSetting;
|
|
||||||
use App\Models\CoolifyInstanceSettings;
|
|
||||||
use App\Models\Environment;
|
|
||||||
use App\Models\GithubApp;
|
|
||||||
use App\Models\StandaloneDocker;
|
|
||||||
use App\Models\SwarmDocker;
|
|
||||||
use Illuminate\Database\Seeder;
|
|
||||||
|
|
||||||
class CoolifyInstanceSettingsSeeder extends Seeder
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Run the database seeds.
|
|
||||||
*/
|
|
||||||
public function run(): void
|
|
||||||
{
|
|
||||||
CoolifyInstanceSettings::create([
|
|
||||||
'id' => 1,
|
|
||||||
'wildcard_domain' => 'coolify.io',
|
|
||||||
'is_https_forced' => false,
|
|
||||||
'is_registration_enabled' => true,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
}
|
|
@ -9,7 +9,7 @@ class DatabaseSeeder extends Seeder
|
|||||||
public function run(): void
|
public function run(): void
|
||||||
{
|
{
|
||||||
$this->call([
|
$this->call([
|
||||||
CoolifyInstanceSettingsSeeder::class,
|
InstanceSettingsSeeder::class,
|
||||||
UserSeeder::class,
|
UserSeeder::class,
|
||||||
TeamSeeder::class,
|
TeamSeeder::class,
|
||||||
PrivateKeySeeder::class,
|
PrivateKeySeeder::class,
|
||||||
|
22
database/seeders/InstanceSettingsSeeder.php
Normal file
22
database/seeders/InstanceSettingsSeeder.php
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Database\Seeders;
|
||||||
|
|
||||||
|
use App\Models\InstanceSettings;
|
||||||
|
use Illuminate\Database\Seeder;
|
||||||
|
|
||||||
|
class InstanceSettingsSeeder extends Seeder
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the database seeds.
|
||||||
|
*/
|
||||||
|
public function run(): void
|
||||||
|
{
|
||||||
|
InstanceSettings::create([
|
||||||
|
'id' => 0,
|
||||||
|
'wildcard_domain' => 'coolify.io',
|
||||||
|
'is_https_forced' => false,
|
||||||
|
'is_registration_enabled' => true,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
@ -10,6 +10,9 @@
|
|||||||
<a href="/demo">Demo</a>
|
<a href="/demo">Demo</a>
|
||||||
@endenv
|
@endenv
|
||||||
<a href="/profile">Profile</a>
|
<a href="/profile">Profile</a>
|
||||||
|
@if (auth()->user()->isRoot())
|
||||||
|
<a href="/settings">Settings</a>
|
||||||
|
@endif
|
||||||
<form action="/logout" method="POST">
|
<form action="/logout" method="POST">
|
||||||
@csrf
|
@csrf
|
||||||
<button type="submit">Logout</button>
|
<button type="submit">Logout</button>
|
||||||
|
4
resources/views/settings.blade.php
Normal file
4
resources/views/settings.blade.php
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<x-layout>
|
||||||
|
<h1>Settings</h1>
|
||||||
|
|
||||||
|
</x-layout>
|
@ -3,6 +3,7 @@
|
|||||||
use App\Http\Controllers\ApplicationController;
|
use App\Http\Controllers\ApplicationController;
|
||||||
use App\Http\Controllers\HomeController;
|
use App\Http\Controllers\HomeController;
|
||||||
use App\Http\Controllers\ProjectController;
|
use App\Http\Controllers\ProjectController;
|
||||||
|
use App\Models\InstanceSettings;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -19,26 +20,63 @@
|
|||||||
|
|
||||||
|
|
||||||
Route::middleware(['auth'])->group(function () {
|
Route::middleware(['auth'])->group(function () {
|
||||||
Route::get('/', [HomeController::class, 'show'])->name('home');
|
Route::get('/', function () {
|
||||||
Route::get('/project/{project_uuid}', [ProjectController::class, 'environments'])->name('project.environments');
|
$projects = session('currentTeam')->load(['projects'])->projects;
|
||||||
|
$servers = session('currentTeam')->load(['servers'])->servers;
|
||||||
Route::get('/project/{project_uuid}/{environment_name}', [ProjectController::class, 'resources'])->name('project.resources');
|
return view('home', [
|
||||||
|
'servers' => $servers,
|
||||||
Route::get('/project/{project_uuid}/{environment_name}/application/{application_uuid}', [ApplicationController::class, 'configuration'])->name('project.applications.configuration');
|
'projects' => $projects
|
||||||
Route::get('/project/{project_uuid}/{environment_name}/application/{application_uuid}/deployment', [ApplicationController::class, 'deployments'])->name('project.applications.deployments');
|
]);
|
||||||
Route::get('/project/{project_uuid}/{environment_name}/application/{application_uuid}/deployment/{deployment_uuid}', [ApplicationController::class, 'deployment'])->name('project.applications.deployment');
|
})->name('home');
|
||||||
|
|
||||||
|
|
||||||
// Route::get('/database/{database_uuid}', [ProjectController::class, 'database'])->name('project.database');
|
|
||||||
// Route::get('//service/{service_uuid}', [ProjectController::class, 'service'])->name('project.service');
|
|
||||||
|
|
||||||
Route::get('/profile', function () {
|
Route::get('/profile', function () {
|
||||||
return view('profile');
|
return view('profile');
|
||||||
});
|
})->name('profile');
|
||||||
|
|
||||||
|
Route::get('/settings', function () {
|
||||||
|
$isRoot = auth()->user()->isRoot();
|
||||||
|
if ($isRoot) {
|
||||||
|
$settings = InstanceSettings::find(0);
|
||||||
|
return view('settings', [
|
||||||
|
'settings' => $settings
|
||||||
|
]);
|
||||||
|
} else {
|
||||||
|
return redirect()->route('home');
|
||||||
|
}
|
||||||
|
})->name('settings');
|
||||||
|
|
||||||
Route::get('/update', function () {
|
Route::get('/update', function () {
|
||||||
return view('update');
|
return view('update');
|
||||||
});
|
})->name('update');
|
||||||
|
|
||||||
Route::get('/demo', function () {
|
Route::get('/demo', function () {
|
||||||
return view('demo');
|
return view('demo');
|
||||||
});
|
})->name('demo');
|
||||||
|
});
|
||||||
|
|
||||||
|
Route::middleware(['auth'])->group(function () {
|
||||||
|
Route::get(
|
||||||
|
'/project/{project_uuid}',
|
||||||
|
[ProjectController::class, 'environments']
|
||||||
|
)->name('project.environments');
|
||||||
|
|
||||||
|
Route::get(
|
||||||
|
'/project/{project_uuid}/{environment_name}',
|
||||||
|
[ProjectController::class, 'resources']
|
||||||
|
)->name('project.resources');
|
||||||
|
|
||||||
|
Route::get(
|
||||||
|
'/project/{project_uuid}/{environment_name}/application/{application_uuid}',
|
||||||
|
[ApplicationController::class, 'configuration']
|
||||||
|
)->name('project.applications.configuration');
|
||||||
|
|
||||||
|
Route::get(
|
||||||
|
'/project/{project_uuid}/{environment_name}/application/{application_uuid}/deployment',
|
||||||
|
[ApplicationController::class, 'deployments']
|
||||||
|
)->name('project.applications.deployments');
|
||||||
|
|
||||||
|
Route::get(
|
||||||
|
'/project/{project_uuid}/{environment_name}/application/{application_uuid}/deployment/{deployment_uuid}',
|
||||||
|
[ApplicationController::class, 'deployment']
|
||||||
|
)->name('project.applications.deployment');
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user