cupcakearmy/coolify
1
0
Fork 0
mirror of https://github.com/cupcakearmy/coolify.git synced 2024-10-22 16:14:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

wip livewire migration

Browse Source
This commit is contained in:
Andras Bacsai 2023-12-07 22:56:55 +01:00
parent 718603e37e
commit f934dfef33
64 changed files with 164 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Livewire/CheckLicense.php
View File

@ -37,7 +37,7 @@ public function submit()
} catch (\Throwable $e) {
session()->flash('error', 'Something went wrong. Please contact support. <br>Error: ' . $e->getMessage());
ray($e->getMessage());
return redirect()->to('/settings/license');
return $this->redirect('/settings/license', navigate: true);
}
}
}

2
app/Livewire/Destination/Form.php
View File

@ -36,7 +36,7 @@ public function delete()
instant_remote_process(['docker network rm -f ' . $this->destination->network], $this->destination->server);
}
$this->destination->delete();
return redirect()->route('dashboard');
return $this->redirectRoute('dashboard', navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

2
app/Livewire/Destination/New/StandaloneDocker.php
View File

@ -70,7 +70,7 @@ public function submit()
]);
}
$this->createNetworkAndAttachToProxy();
return redirect()->route('destination.show', $docker->uuid);
return $this->redirectRoute('destination.show', $docker->uuid, navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

2
app/Livewire/ForcePasswordReset.php
View File

@ -35,7 +35,7 @@ public function submit()
if ($firstLogin) {
send_internal_notification('First login for ' . auth()->user()->email);
}
return redirect()->route('dashboard');
return $this->redirectRoute('dashboard', navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

2
app/Livewire/PrivateKey/Change.php
View File

@ -35,7 +35,7 @@ public function delete()
if ($this->private_key->isEmpty()) {
$this->private_key->delete();
currentTeam()->privateKeys = PrivateKey::where('team_id', currentTeam()->id)->get();
return redirect()->route('security.private-key.index');
return $this->redirectRoute('security.private-key.index', navigate: true);
}
$this->dispatch('error', 'This private key is in use and cannot be deleted. Please delete all servers, applications, and GitHub/GitLab apps that use this private key before deleting it.');
} catch (\Throwable $e) {

4
app/Livewire/PrivateKey/Create.php
View File

@ -67,9 +67,9 @@ public function createPrivateKey()
'team_id' => currentTeam()->id
]);
if ($this->from === 'server') {
return redirect()->route('server.create');
return $this->redirectRoute('server.create', navigate: true);
}
return redirect()->route('security.private-key.show', ['private_key_uuid' => $private_key->uuid]);
return $this->redirectRoute('security.private-key.show', ['private_key_uuid' => $private_key->uuid], navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

2
app/Livewire/Project/AddEmpty.php
View File

@ -27,7 +27,7 @@ public function submit()
'description' => $this->description,
'team_id' => currentTeam()->id,
]);
return redirect()->route('project.show', $project->uuid);
return $this->redirectRoute('project.show', $project->uuid, navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
} finally {

4
app/Livewire/Project/AddEnvironment.php
View File

@ -27,10 +27,10 @@ public function submit()
'project_id' => $this->project->id,
]);
return redirect()->route('project.resources', [
return $this->redirectRoute('project.resources', [
'project_uuid' => $this->project->uuid,
'environment_name' => $environment->name,
]);
], navigate: true);
} catch (\Throwable $e) {
handleError($e, $this);
} finally {

6
app/Livewire/Project/Application/Configuration.php
View File

@ -15,15 +15,15 @@ public function mount()
{
$project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
if (!$project) {
return redirect()->route('dashboard');
return $this->redirectRoute('dashboard', navigate: true);
}
$environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
if (!$environment) {
return redirect()->route('dashboard');
return $this->redirectRoute('dashboard', navigate: true);
}
$application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
if (!$application) {
return redirect()->route('dashboard');
return $this->redirectRoute('dashboard', navigate: true);
}
$this->application = $application;
$mainServer = $this->application->destination->server;

12
app/Livewire/Project/Application/Heading.php
View File

@ -52,12 +52,12 @@ public function deployNew()
force_rebuild: false,
is_new_deployment: true,
);
return redirect()->route('project.application.deployment', [
return $this->redirectRoute('project.application.deployment', [
'project_uuid' => $this->parameters['project_uuid'],
'application_uuid' => $this->parameters['application_uuid'],
'deployment_uuid' => $this->deploymentUuid,
'environment_name' => $this->parameters['environment_name'],
]);
], navigate: true);
}
public function deploy(bool $force_rebuild = false)
{
@ -101,12 +101,12 @@ public function restartNew()
restart_only: true,
is_new_deployment: true,
);
return redirect()->route('project.application.deployment', [
return $this->redirectRoute('project.application.deployment', [
'project_uuid' => $this->parameters['project_uuid'],
'application_uuid' => $this->parameters['application_uuid'],
'deployment_uuid' => $this->deploymentUuid,
'environment_name' => $this->parameters['environment_name'],
]);
], navigate: true);
}
public function restart()
{
@ -116,11 +116,11 @@ public function restart()
deployment_uuid: $this->deploymentUuid,
restart_only: true,
);
return redirect()->route('project.application.deployment', [
return $this->redirectRoute('project.application.deployment', [
'project_uuid' => $this->parameters['project_uuid'],
'application_uuid' => $this->parameters['application_uuid'],
'deployment_uuid' => $this->deploymentUuid,
'environment_name' => $this->parameters['environment_name'],
]);
], navigate: true);
}
}

4
app/Livewire/Project/Application/Previews.php
View File

@ -52,12 +52,12 @@ public function deploy(int $pull_request_id, string|null $pull_request_html_url
force_rebuild: true,
pull_request_id: $pull_request_id,
);
return redirect()->route('project.application.deployment', [
return $this->redirectRoute('project.application.deployment', [
'project_uuid' => $this->parameters['project_uuid'],
'application_uuid' => $this->parameters['application_uuid'],
'deployment_uuid' => $this->deployment_uuid,
'environment_name' => $this->parameters['environment_name'],
]);
], navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

5
app/Livewire/Project/Application/Rollback.php
View File

@ -29,13 +29,12 @@ public function rollbackImage($commit)
commit: $commit,
force_rebuild: false,
);
return redirect()->route('project.application.deployment', [
return $this->redirectRoute('project.application.deployment', [
'project_uuid' => $this->parameters['project_uuid'],
'application_uuid' => $this->parameters['application_uuid'],
'deployment_uuid' => $deployment_uuid,
'environment_name' => $this->parameters['environment_name'],
]);
], navigate: true);
}
public function loadImages($showToast = false)

4
app/Livewire/Project/CloneProject.php
View File

@ -148,10 +148,10 @@ public function clone()
}
$newService->parse();
}
return redirect()->route('project.resources', [
return $this->redirectRoute('project.resources', [
'project_uuid' => $newProject->uuid,
'environment_name' => $newEnvironment->name,
]);
], navigate: true);
} catch (\Exception $e) {
return handleError($e, $this);
}

4
app/Livewire/Project/Database/BackupEdit.php
View File

@ -50,9 +50,9 @@ public function delete()
$url = $url->withoutQueryParameter('selectedBackupId');
$url = $url->withFragment('backups');
$url = $url->getPath() . "#{$url->getFragment()}";
return redirect()->to($url);
return $this->redirect($url,navigate: true);
} else {
redirect()->route('project.database.backups.all', $this->parameters);
return $this->redirectRoute('project.database.backups.all', $this->parameters);
}
}

2
app/Livewire/Project/DeleteEnvironment.php
View File

@ -23,7 +23,7 @@ public function delete()
$environment = Environment::findOrFail($this->environment_id);
if ($environment->isEmpty()) {
$environment->delete();
return redirect()->route('project.show', ['project_uuid' => $this->parameters['project_uuid']]);
return $this->redirectRoute('project.show', ['project_uuid' => $this->parameters['project_uuid']], navigate: true);
}
return $this->dispatch('error', 'Environment has defined resources, please delete them first.');
}

2
app/Livewire/Project/DeleteProject.php
View File

@ -25,6 +25,6 @@ public function delete()
return $this->dispatch('error', 'Project has resources defined, please delete them first.');
}
$project->delete();
return redirect()->route('projects');
return $this->redirectRoute('projects', navigate: true);
}
}

3
app/Livewire/Project/New/DockerCompose.php
View File

@ -69,11 +69,12 @@ public function submit()
$service->parse(isNew: true);
return redirect()->route('project.service.configuration', [
return $this->redirectRoute('project.service.configuration', [
'service_uuid' => $service->uuid,
'environment_name' => $environment->name,
'project_uuid' => $project->uuid,
]);
} catch (\Throwable $e) {
return handleError($e, $this);
}

5
app/Livewire/Project/New/DockerImage.php
View File

@ -64,12 +64,11 @@ public function submit()
'name' => 'docker-image-' . $application->uuid,
'fqdn' => $fqdn
]);
redirect()->route('project.application.configuration', [
return $this->redirectRoute('project.application.configuration', [
'application_uuid' => $application->uuid,
'environment_name' => $environment->name,
'project_uuid' => $project->uuid,
]);
], navigate: true);
}
public function render()
{

2
app/Livewire/Project/New/EmptyProject.php
View File

@ -13,6 +13,6 @@ public function createEmptyProject()
'name' => generate_random_name(),
'team_id' => currentTeam()->id,
]);
return redirect()->route('project.show', ['project_uuid' => $project->uuid, 'environment_name' => 'production']);
return $this->redirectRoute('project.show', ['project_uuid' => $project->uuid, 'environment_name' => 'production'], navigate: true);
}
}

4
app/Livewire/Project/New/GithubPrivateRepository.php
View File

@ -151,11 +151,11 @@ public function submit()
$application->name = generate_application_name($this->selected_repository_owner . '/' . $this->selected_repository_repo, $this->selected_branch_name, $application->uuid);
$application->save();
redirect()->route('project.application.configuration', [
return $this->redirectRoute('project.application.configuration', [
'application_uuid' => $application->uuid,
'environment_name' => $environment->name,
'project_uuid' => $project->uuid,
]);
], navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

8
app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
View File

@ -132,11 +132,11 @@ public function submit()
$application->name = generate_random_name($application->uuid);
$application->save();
return redirect()->route('project.application.configuration', [
'project_uuid' => $project->uuid,
'environment_name' => $environment->name,
return $this->redirectRoute('project.application.configuration', [
'application_uuid' => $application->uuid,
]);
'environment_name' => $environment->name,
'project_uuid' => $project->uuid,
], navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

8
app/Livewire/Project/New/PublicGitRepository.php
View File

@ -184,11 +184,11 @@ public function submit()
$application->fqdn = $fqdn;
$application->save();
return redirect()->route('project.application.configuration', [
'project_uuid' => $project->uuid,
'environment_name' => $environment->name,
return $this->redirectRoute('project.application.configuration', [
'application_uuid' => $application->uuid,
]);
'environment_name' => $environment->name,
'project_uuid' => $project->uuid,
], navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

8
app/Livewire/Project/New/Select.php
View File

@ -53,10 +53,10 @@ public function render()
public function updatedSelectedEnvironment()
{
return redirect()->route('project.resources.new', [
return $this->redirectRoute('project.resources.new', [
'project_uuid' => $this->parameters['project_uuid'],
'environment_name' => $this->selectedEnvironment,
]);
], navigate: true);
}
// public function addExistingPostgresql()
@ -133,13 +133,13 @@ public function setServer(Server $server)
public function setDestination(string $destination_uuid)
{
$this->destination_uuid = $destination_uuid;
redirect()->route('project.resources.new', [
return $this->redirectRoute('project.resources.new', [
'project_uuid' => $this->parameters['project_uuid'],
'environment_name' => $this->parameters['environment_name'],
'type' => $this->type,
'destination' => $this->destination_uuid,
'server_id' => $this->server_id,
]);
], navigate: true);
}
public function loadServers()

4
app/Livewire/Project/New/SimpleDockerfile.php
View File

@ -70,10 +70,10 @@ public function submit()
'fqdn' => $fqdn
]);
redirect()->route('project.application.configuration', [
return $this->redirectRoute('project.application.configuration', [
'application_uuid' => $application->uuid,
'environment_name' => $environment->name,
'project_uuid' => $project->uuid,
]);
], navigate: true);
}
}

2
app/Livewire/Project/Service/Application.php
View File

@ -41,7 +41,7 @@ public function delete()
try {
$this->application->delete();
$this->dispatch('success', 'Application deleted successfully.');
return redirect()->route('project.service.configuration', $this->parameters);
return $this->redirectRoute('project.service.configuration', $this->parameters, navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

4
app/Livewire/Project/Shared/Danger.php
View File

@ -22,10 +22,10 @@ public function delete()
{
try {
DeleteResourceJob::dispatchSync($this->resource);
return redirect()->route('project.resources', [
return $this->redirectRoute('project.resources', [
'project_uuid' => $this->parameters['project_uuid'],
'environment_name' => $this->parameters['environment_name']
]);
], navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

36
app/Livewire/Project/Shared/GetLogs.php
View File

@ -19,7 +19,7 @@ class GetLogs extends Component
{
public string $outputs = '';
public string $errors = '';
public Application|Service|StandalonePostgresql|StandaloneRedis|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $resource;
public Application|Service|StandalonePostgresql|StandaloneRedis|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|null $resource = null;
public ServiceApplication|ServiceDatabase|null $servicesubtype = null;
public Server $server;
public ?string $container = null;
@ -29,13 +29,15 @@ class GetLogs extends Component
public function mount()
{
if ($this->resource->getMorphClass() === 'App\Models\Application') {
$this->showTimeStamps = $this->resource->settings->is_include_timestamps;
} else {
if ($this->servicesubtype) {
$this->showTimeStamps = $this->servicesubtype->is_include_timestamps;
if (!is_null($this->resource)) {
if ($this->resource->getMorphClass() === 'App\Models\Application') {
$this->showTimeStamps = $this->resource->settings->is_include_timestamps;
} else {
$this->showTimeStamps = $this->resource->is_include_timestamps;
if ($this->servicesubtype) {
$this->showTimeStamps = $this->servicesubtype->is_include_timestamps;
} else {
$this->showTimeStamps = $this->resource->is_include_timestamps;
}
}
}
}
@ -45,16 +47,18 @@ public function doSomethingWithThisChunkOfOutput($output)
}
public function instantSave()
{
if ($this->resource->getMorphClass() === 'App\Models\Application') {
$this->resource->settings->is_include_timestamps = $this->showTimeStamps;
$this->resource->settings->save();
} else {
if ($this->servicesubtype) {
$this->servicesubtype->is_include_timestamps = $this->showTimeStamps;
$this->servicesubtype->save();
if (!is_null($this->resource)) {
if ($this->resource->getMorphClass() === 'App\Models\Application') {
$this->resource->settings->is_include_timestamps = $this->showTimeStamps;
$this->resource->settings->save();
} else {
$this->resource->is_include_timestamps = $this->showTimeStamps;
$this->resource->save();
if ($this->servicesubtype) {
$this->servicesubtype->is_include_timestamps = $this->showTimeStamps;
$this->servicesubtype->save();
} else {
$this->resource->is_include_timestamps = $this->showTimeStamps;
$this->resource->save();
}
}
}
}

2
app/Livewire/Server/Delete.php
View File

@ -19,7 +19,7 @@ public function delete()
return;
}
$this->server->delete();
return redirect()->route('server.all');
return $this->redirectRoute('server.all', navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

4
app/Livewire/Server/Destination/Show.php
View File

@ -13,9 +13,9 @@ public function mount()
{
$this->parameters = get_route_parameters();
try {
$this->server = Server::ownedByCurrentTeam(['name', 'proxy'])->whereUuid(request()->server_uuid)->first();
$this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
if (is_null($this->server)) {
return redirect()->route('server.all');
return $this->redirectRoute('server.all', navigate: true);
}
} catch (\Throwable $e) {
return handleError($e, $this);

4
app/Livewire/Server/Form.php
View File

@ -44,7 +44,9 @@ public function mount()
{
$this->wildcard_domain = $this->server->settings->wildcard_domain;
$this->cleanup_after_percentage = $this->server->settings->cleanup_after_percentage;
$this->validateServer();
if (!$this->server->isFunctional()) {
$this->validateServer();
}
}
public function serverRefresh($install = true)
{

4
app/Livewire/Server/LogDrains.php
View File

@ -41,9 +41,9 @@ public function mount()
{
$this->parameters = get_route_parameters();
try {
$server = Server::ownedByCurrentTeam(['name', 'description', 'ip', 'port', 'user', 'proxy'])->whereUuid(request()->server_uuid)->first();
$server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
if (is_null($server)) {
return redirect()->route('server.all');
return $this->redirectRoute('server.all', navigate: true);
}
$this->server = $server;
} catch (\Throwable $e) {

2
app/Livewire/Server/New/ByIp.php
View File

@ -79,7 +79,7 @@ public function submit()
$server->settings->is_swarm_manager = $this->is_swarm_manager;
$server->settings->save();
$server->addInitialNetwork();
return redirect()->route('server.show', $server->uuid);
return $this->redirectRoute('server.show', $server->uuid, navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

2
app/Livewire/Server/PrivateKey/Show.php
View File

@ -17,7 +17,7 @@ public function mount()
try {
$this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
if (is_null($this->server)) {
return redirect()->route('server.all');
return $this->redirectRoute('server.all', navigate: true);
}
$this->privateKeys = PrivateKey::ownedByCurrentTeam()->get()->where('is_git_related', false);
} catch (\Throwable $e) {

4
app/Livewire/Server/Proxy/Logs.php
View File

@ -13,9 +13,9 @@ public function mount()
{
$this->parameters = get_route_parameters();
try {
$this->server = Server::ownedByCurrentTeam(['name', 'proxy'])->whereUuid(request()->server_uuid)->first();
$this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
if (is_null($this->server)) {
return redirect()->route('server.all');
return $this->redirectRoute('server.all', navigate: true);
}
} catch (\Throwable $e) {
return handleError($e, $this);

4
app/Livewire/Server/Proxy/Show.php
View File

@ -18,9 +18,9 @@ public function mount()
{
$this->parameters = get_route_parameters();
try {
$this->server = Server::ownedByCurrentTeam(['name', 'proxy'])->whereUuid(request()->server_uuid)->first();
$this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
if (is_null($this->server)) {
return redirect()->route('server.all');
return $this->redirectRoute('server.all', navigate: true);
}
} catch (\Throwable $e) {
return handleError($e, $this);

4
app/Livewire/Server/Show.php
View File

@ -15,9 +15,9 @@ public function mount()
{
$this->parameters = get_route_parameters();
try {
$this->server = Server::ownedByCurrentTeam(['name', 'description', 'ip', 'port', 'user', 'proxy'])->whereUuid(request()->server_uuid)->first();
$this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
if (is_null($this->server)) {
return redirect()->route('server.all');
return $this->redirectRoute('server.all', navigate: true);
}
} catch (\Throwable $e) {

6
app/Livewire/Source/Github/Change.php
View File

@ -41,7 +41,7 @@ public function mount()
$github_app_uuid = request()->github_app_uuid;
$this->github_app = GithubApp::where('uuid', $github_app_uuid)->first();
if (!$this->github_app) {
return redirect()->route('source.all');
return $this->redirectRoute('source.all', navigate: true);
}
$settings = InstanceSettings::get();
$this->github_app->makeVisible('client_secret')->makeVisible('webhook_secret');
@ -67,7 +67,7 @@ public function mount()
$type = data_get($parameters, 'type');
$destination = data_get($parameters, 'destination');
session()->forget('from');
return redirect()->route($back, [
return $this->redirectRoute($back, [
'environment_name' => $environment_name,
'project_uuid' => $project_uuid,
'type' => $type,
@ -105,7 +105,7 @@ public function delete()
{
try {
$this->github_app->delete();
redirect()->route('source.all');
return $this->redirectRoute('source.all', navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

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

@ -48,7 +48,7 @@ public function createGitHubApp()
if (session('from')) {
session(['from' => session('from') + ['source_id' => $github_app->id]]);
}
redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]);
return $this->redirectRoute('source.github.show', ['github_app_uuid' => $github_app->uuid], navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

2
app/Livewire/Subscription/Show.php
View File

@ -11,7 +11,7 @@ class Show extends Component
public bool $alreadySubscribed = false;
public function mount() {
if (!isCloud()) {
return redirect('/');
return $this->redirect('/', navigate: true);
}
$this->settings = InstanceSettings::get();
$this->alreadySubscribed = currentTeam()->subscription()->exists();

2
app/Livewire/Team/Create.php
View File

@ -30,7 +30,7 @@ public function submit()
]);
auth()->user()->teams()->attach($team, ['role' => 'admin']);
refreshSession();
return redirect()->route('team.index');
return $this->redirectRoute('team.index', navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

2
app/Livewire/Team/Delete.php
View File

@ -24,6 +24,6 @@ public function delete()
});
refreshSession();
return redirect()->route('team.index');
return $this->redirectRoute('team.index', navigate: true);
}
}

2
app/Livewire/Team/Storage/Create.php
View File

@ -65,7 +65,7 @@ public function submit()
$this->storage->team_id = currentTeam()->id;
$this->storage->testConnection();
$this->storage->save();
return redirect()->route('team.storages.show', $this->storage->uuid);
return $this->redirectRoute('team.storages.show', $this->storage->uuid, navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

2
app/Livewire/Team/Storage/Form.php
View File

@ -43,7 +43,7 @@ public function delete()
{
try {
$this->storage->delete();
return redirect()->route('team.storages.all');
return $this->redirectRoute('team.storages.all', navigate: true);
} catch (\Throwable $e) {
return handleError($e, $this);
}

2
app/Livewire/Waitlist/Index.php
View File

@ -24,7 +24,7 @@ public function render()
public function mount()
{
if (config('coolify.waitlist') == false) {
return redirect()->route('register');
return $this->redirectRoute('register', navigate: true);
}
$this->waitingInLine = Waitlist::whereVerified(true)->count();
$this->users = User::count();

1
bootstrap/helpers/remoteProcess.php
View File

@ -61,6 +61,7 @@ function remote_process(
// }
function savePrivateKeyToFs(Server $server)
{
ray(data_get($server, 'privateKey.private_key'));
if (data_get($server, 'privateKey.private_key') === null) {
throw new \Exception("Server {$server->name} does not have a private key");
}

23
bootstrap/helpers/subscriptions.php
View File

@ -128,11 +128,12 @@ function allowedPathsForUnsubscribedAccounts()
'logout',
'waitlist',
'force-password-reset',
'livewire/message/force-password-reset',
'livewire/message/check-license',
'livewire/message/switch-team',
'livewire/message/subscription.pricing-plans',
'livewire/message/help'
// 'livewire/message/force-password-reset',
// 'livewire/message/check-license',
// 'livewire/message/switch-team',
// 'livewire/message/subscription.pricing-plans',
// 'livewire/message/help',
'livewire/update'
];
}
function allowedPathsForBoardingAccounts()
@ -140,8 +141,9 @@ function allowedPathsForBoardingAccounts()
return [
...allowedPathsForUnsubscribedAccounts(),
'boarding',
'livewire/message/boarding.index',
'livewire/message/activity-monitor'
// 'livewire/message/boarding.index',
// 'livewire/message/activity-monitor',
'livewire/update'
];
}
function allowedPathsForInvalidAccounts() {
@ -149,8 +151,9 @@ function allowedPathsForInvalidAccounts() {
'logout',
'verify',
'force-password-reset',
'livewire/message/force-password-reset',
'livewire/message/verify-email',
'livewire/message/help'
// 'livewire/message/force-password-reset',
// 'livewire/message/verify-email',
// 'livewire/message/help',
'livewire/update'
];
}

2
database/seeders/PrivateKeySeeder.php
View File

@ -28,6 +28,7 @@ public function run(): void
]);
PrivateKey::create([
"id" => 1,
"team_id" => 0,
"name" => "development-github-app",
"description" => "This is the key for using the development GitHub app",
@ -61,6 +62,7 @@ public function run(): void
"is_git_related" => true
]);
PrivateKey::create([
"id" => 2,
"team_id" => 0,
"name" => "development-gitlab-app",
"description" => "This is the key for using the development Gitlab app",

8
resources/views/components/databases/navbar.blade.php
View File

@ -1,13 +1,13 @@
<div class="navbar-main">
<a class="{{ request()->routeIs('project.database.configuration') ? 'text-white' : '' }}"
<a wire:navigate class="{{ request()->routeIs('project.database.configuration') ? 'text-white' : '' }}"
href="{{ route('project.database.configuration', $parameters) }}">
<button>Configuration</button>
</a>
<a class="{{ request()->routeIs('project.database.command') ? 'text-white' : '' }}"
<a wire:navigate class="{{ request()->routeIs('project.database.command') ? 'text-white' : '' }}"
href="{{ route('project.database.command', $parameters) }}">
<button>Execute Command</button>
</a>
<a class="{{ request()->routeIs('project.database.logs') ? 'text-white' : '' }}"
<a wire:navigate class="{{ request()->routeIs('project.database.logs') ? 'text-white' : '' }}"
href="{{ route('project.database.logs', $parameters) }}">
<button>Logs</button>
</a>
@ -16,7 +16,7 @@
$database->getMorphClass() === 'App\Models\StandaloneMongodb' ||
$database->getMorphClass() === 'App\Models\StandaloneMysql' ||
$database->getMorphClass() === 'App\Models\StandaloneMariadb')
<a class="{{ request()->routeIs('project.database.backups.all') ? 'text-white' : '' }}"
<a wire:navigate class="{{ request()->routeIs('project.database.backups.all') ? 'text-white' : '' }}"
href="{{ route('project.database.backups.all', $parameters) }}">
<button>Backups</button>
</a>

2
resources/views/components/resources/breadcrumbs.blade.php
View File

@ -13,7 +13,7 @@
d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
clip-rule="evenodd"></path>
</svg>
<a wire:nagivate class="text-xs truncate lg:text-sm"
<a wire:navigate wire:nagivate class="text-xs truncate lg:text-sm"
href="{{ route('project.resources', ['environment_name' => $this->parameters['environment_name'], 'project_uuid' => $this->parameters['project_uuid']]) }}">{{ $this->parameters['environment_name'] }}</a>
</div>
</li>

4
resources/views/components/security/navbar.blade.php
View File

@ -10,10 +10,10 @@
</ol>
</nav>
<nav class="navbar-main">
<a href="{{ route('security.private-key.index') }}">
<a wire:navigate href="{{ route('security.private-key.index') }}">
<button>Private Keys</button>
</a>
<a href="{{ route('security.api-tokens') }}">
<a wire:navigate href="{{ route('security.api-tokens') }}">
<button>API tokens</button>
</a>
<div class="flex-1"></div>

10
resources/views/components/server/navbar.blade.php
View File

@ -8,31 +8,31 @@
</div>
<div class="subtitle ">{{ data_get($server, 'name') }}</div>
<nav class="navbar-main">
<a class="{{ request()->routeIs('server.show') ? 'text-white' : '' }}"
<a wire:navigate class="{{ request()->routeIs('server.show') ? 'text-white' : '' }}"
href="{{ route('server.show', [
'server_uuid' => data_get($parameters, 'server_uuid'),
]) }}">
<button>General</button>
</a>
<a class="{{ request()->routeIs('server.private-key') ? 'text-white' : '' }}"
<a wire:navigate class="{{ request()->routeIs('server.private-key') ? 'text-white' : '' }}"
href="{{ route('server.private-key', [
'server_uuid' => data_get($parameters, 'server_uuid'),
]) }}">
<button>Private Key</button>
</a>
<a class="{{ request()->routeIs('server.proxy') ? 'text-white' : '' }}"
<a wire:navigate class="{{ request()->routeIs('server.proxy') ? 'text-white' : '' }}"
href="{{ route('server.proxy', [
'server_uuid' => data_get($parameters, 'server_uuid'),
]) }}">
<button>Proxy</button>
</a>
<a class="{{ request()->routeIs('server.destinations') ? 'text-white' : '' }}"
<a wire:navigate class="{{ request()->routeIs('server.destinations') ? 'text-white' : '' }}"
href="{{ route('server.destinations', [
'server_uuid' => data_get($parameters, 'server_uuid'),
]) }}">
<button>Destinations</button>
</a>
<a class="{{ request()->routeIs('server.log-drains') ? 'text-white' : '' }}"
<a wire:navigate class="{{ request()->routeIs('server.log-drains') ? 'text-white' : '' }}"
href="{{ route('server.log-drains', [
'server_uuid' => data_get($parameters, 'server_uuid'),
]) }}">

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

@ -1,5 +1,5 @@
<div class="navbar-main">
<a class="{{ request()->routeIs('project.service.configuration') ? 'text-white' : '' }}"
<a wire:navigate class="{{ request()->routeIs('project.service.configuration') ? 'text-white' : '' }}"
href="{{ route('project.service.configuration', $parameters) }}">
<button>Configuration</button>
</a>

10
resources/views/components/team/navbar.blade.php
View File

@ -1,7 +1,7 @@
<div class="pb-6">
<div class="flex items-end gap-2">
<h1>Team</h1>
<a href="/team/new"><x-forms.button>+ New Team</x-forms.button></a>
<a wire:navigate href="/team/new"><x-forms.button>+ New Team</x-forms.button></a>
</div>
<nav class="flex pt-2 pb-10">
<ol class="inline-flex items-center">
@ -14,17 +14,17 @@ class="text-warning">{{ session('currentTeam.name') }}</span></span>
</ol>
</nav>
<nav class="navbar-main">
<a class="{{ request()->routeIs('team.index') ? 'text-white' : '' }}" href="{{ route('team.index') }}">
<a wire:navigate class="{{ request()->routeIs('team.index') ? 'text-white' : '' }}" href="{{ route('team.index') }}">
<button>General</button>
</a>
<a class="{{ request()->routeIs('team.members') ? 'text-white' : '' }}" href="{{ route('team.members') }}">
<a wire:navigate class="{{ request()->routeIs('team.members') ? 'text-white' : '' }}" href="{{ route('team.members') }}">
<button>Members</button>
</a>
<a class="{{ request()->routeIs('team.storages.all') ? 'text-white' : '' }}"
<a wire:navigate class="{{ request()->routeIs('team.storages.all') ? 'text-white' : '' }}"
href="{{ route('team.storages.all') }}">
<button>S3 Storages</button>
</a>
<a class="{{ request()->routeIs('team.notifications') ? 'text-white' : '' }}"
<a wire:navigate class="{{ request()->routeIs('team.notifications') ? 'text-white' : '' }}"
href="{{ route('team.notifications') }}">
<button>Notifications</button>
</a>

22
resources/views/livewire/project/application/configuration.blade.php
View File

@ -57,39 +57,39 @@
<livewire:project.application.general :application="$application" />
</div>
<div x-cloak x-show="activeTab === 'advanced'" class="h-full">
<livewire:project.application.advanced :application="$application" lazy />
<livewire:project.application.advanced :application="$application" />
</div>
<div x-cloak x-show="activeTab === 'environment-variables'">
<livewire:project.shared.environment-variable.all :resource="$application" lazy />
<livewire:project.shared.environment-variable.all :resource="$application" />
</div>
@if ($application->git_based())
<div x-cloak x-show="activeTab === 'source'">
<livewire:project.application.source :application="$application" lazy />
<livewire:project.application.source :application="$application" />
</div>
@endif
<div x-cloak x-show="activeTab === 'server'">
<livewire:project.shared.destination :resource="$application" :servers="$servers" lazy />
<livewire:project.shared.destination :resource="$application" :servers="$servers" />
</div>
<div x-cloak x-show="activeTab === 'storages'">
<livewire:project.service.storage :resource="$application" lazy />
<livewire:project.service.storage :resource="$application" />
</div>
<div x-cloak x-show="activeTab === 'webhooks'">
<livewire:project.shared.webhooks :resource="$application" lazy />
<livewire:project.shared.webhooks :resource="$application" />
</div>
<div x-cloak x-show="activeTab === 'previews'">
<livewire:project.application.previews :application="$application" lazy />
<livewire:project.application.previews :application="$application" />
</div>
<div x-cloak x-show="activeTab === 'health'">
<livewire:project.shared.health-checks :resource="$application" lazy />
<livewire:project.shared.health-checks :resource="$application" />
</div>
<div x-cloak x-show="activeTab === 'rollback'">
<livewire:project.application.rollback :application="$application" lazy />
<livewire:project.application.rollback :application="$application" />
</div>
<div x-cloak x-show="activeTab === 'resource-limits'">
<livewire:project.shared.resource-limits :resource="$application" lazy />
<livewire:project.shared.resource-limits :resource="$application" />
</div>
<div x-cloak x-show="activeTab === 'danger'">
<livewire:project.shared.danger :resource="$application" lazy />
<livewire:project.shared.danger :resource="$application" />
</div>
</div>
</div>

10
resources/views/livewire/project/service/index.blade.php
View File

@ -42,9 +42,8 @@
$application->status)->contains(['starting']),
'flex gap-2 box group',
])>
<a class="flex flex-col flex-1 group-hover:text-white hover:no-underline"
<a wire:navigate class="flex flex-col flex-1 group-hover:text-white hover:no-underline"
href="{{ route('project.service.show', [...$parameters, 'service_name' => $application->name]) }}">
@if ($application->human_name)
{{ Str::headline($application->human_name) }}
@else
@ -61,7 +60,7 @@
@endif
<div class="text-xs">{{ $application->status }}</div>
</a>
<a class="flex items-center gap-2 p-1 mx-4 font-bold rounded group-hover:text-white hover:no-underline"
<a wire:navigate class="flex items-center gap-2 p-1 mx-4 font-bold rounded group-hover:text-white hover:no-underline"
href="{{ route('project.service.logs', [...$parameters, 'service_name' => $application->name]) }}"><span
class="hover:text-warning">Logs</span></a>
</div>
@ -76,7 +75,7 @@ class="hover:text-warning">Logs</span></a>
$database->status)->contains(['restarting']),
'flex gap-2 box group',
])>
<a class="flex flex-col flex-1 group-hover:text-white hover:no-underline"
<a wire:navigate class="flex flex-col flex-1 group-hover:text-white hover:no-underline"
href="{{ route('project.service.show', [...$parameters, 'service_name' => $database->name]) }}">
@if ($database->human_name)
{{ Str::headline($database->human_name) }}
@ -91,13 +90,12 @@ class="hover:text-warning">Logs</span></a>
@endif
<div class="text-xs">{{ $database->status }}</div>
</a>
<a class="flex items-center gap-2 p-1 mx-4 font-bold rounded hover:no-underline group-hover:text-white"
<a wire:navigate class="flex items-center gap-2 p-1 mx-4 font-bold rounded hover:no-underline group-hover:text-white"
href="{{ route('project.service.logs', [...$parameters, 'service_name' => $database->name]) }}"><span
class="hover:text-warning">Logs</span></a>
</div>
@endforeach
</div>
</div>
<div x-cloak x-show="activeTab === 'storages'">
<div class="flex items-center gap-2">

4
resources/views/livewire/project/service/show.blade.php
View File

@ -2,7 +2,7 @@
<livewire:project.service.navbar :service="$service" :parameters="$parameters" :query="$query" />
<div class="flex h-full pt-6">
<div class="flex flex-col gap-4 min-w-fit">
<a class="{{ request()->routeIs('project.service.configuration') ? 'text-white' : '' }}"
<a wire:navigate class="{{ request()->routeIs('project.service.configuration') ? 'text-white' : '' }}"
href="{{ route('project.service.configuration', [...$parameters, 'service_name' => null]) }}">
<button><- Back</button>
</a>
@ -21,7 +21,7 @@
@click.prevent="activeTab = 'backups'; window.location.hash = 'backups'" href="#">Backups</a>
@endif
@if (data_get($parameters, 'service_name'))
<a class="{{ request()->routeIs('project.service.logs') ? 'text-white' : '' }}"
<a wire:navigate class="{{ request()->routeIs('project.service.logs') ? 'text-white' : '' }}"
href="{{ route('project.service.logs', $parameters) }}">
<button>Logs</button>
</a>

2
resources/views/livewire/project/shared/logs.blade.php
View File

@ -22,7 +22,7 @@
<livewire:project.service.navbar :service="$resource" :parameters="$parameters" :query="$query" />
<div class="flex gap-4 pt-6">
<div>
<a class="{{ request()->routeIs('project.service.show') ? 'text-white' : '' }}"
<a wire:navigate class="{{ request()->routeIs('project.service.show') ? 'text-white' : '' }}"
href="{{ route('project.service.show', $parameters) }}">
<button><- Back</button>
</a>

4
resources/views/livewire/server/all.blade.php
View File

@ -1,14 +1,14 @@
<div>
<div class="flex items-start gap-2">
<h1>Servers</h1>
<a class="text-white hover:no-underline" href="{{ route('server.create') }}">
<a wire:navigate class="text-white hover:no-underline" href="{{ route('server.create') }}">
<x-forms.button class="btn">+ Add</x-forms.button>
</a>
</div>
<div class="subtitle ">All Servers</div>
<div class="grid gap-2 lg:grid-cols-2">
@forelse ($servers as $server)
<a href="{{ route('server.show', ['server_uuid' => data_get($server, 'uuid')]) }}"
<a wire:navigate href="{{ route('server.show', ['server_uuid' => data_get($server, 'uuid')]) }}"
@class([
'gap-2 border cursor-pointer box group',
'border-transparent' => $server->settings->is_reachable,

8
resources/views/livewire/server/delete.blade.php
View File

@ -23,10 +23,10 @@
<div class="flex flex-col">
@forelse ($server->definedResources() as $resource)
@if ($loop->first)
<h3 class="pt-4">Defined resources</h3>
<h3 class="pt-4">Resources</h3>
@endif
@if ($resource->link())
<a class="flex gap-2 p-1 hover:bg-coolgray-100 hover:no-underline" href="{{ $resource->link() }}">
<a wire:navigate class="flex gap-2 p-1 hover:bg-coolgray-100 hover:no-underline" href="{{ $resource->link() }}">
<div class="w-64">{{ str($resource->type())->headline() }}</div>
<div>{{ $resource->name }}</div>
</a>
@ -43,10 +43,10 @@
<div class="flex flex-col">
@forelse ($server->definedResources() as $resource)
@if ($loop->first)
<h3 class="pt-4">Defined resources</h3>
<h3 class="pt-4">Resources</h3>
@endif
@if ($resource->link())
<a class="flex gap-2 p-1 hover:bg-coolgray-100 hover:no-underline" href="{{ $resource->link() }}">
<a wire:navigate class="flex gap-2 p-1 hover:bg-coolgray-100 hover:no-underline" href="{{ $resource->link() }}">
<div class="w-64">{{ str($resource->type())->headline() }}</div>
<div>{{ $resource->name }}</div>
</a>

2
resources/views/livewire/switch-team.blade.php
View File

@ -1,5 +1,5 @@
<div class="w-64">
<x-forms.select wire:model="selectedTeamId">
<x-forms.select wire:model.live="selectedTeamId">
<option value="default" disabled selected>Switch team</option>
@foreach (auth()->user()->teams as $team)
<option value="{{ $team->id }}">{{ $team->name }}</option>

2
resources/views/project/resources.blade.php
View File

@ -41,7 +41,7 @@ class="font-normal text-white normal-case border-none rounded hover:no-underline
</nav>
</div>
@if ($environment->isEmpty())
<a href="{{ route('project.resources.new', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }} "
<a wire:navigate href="{{ route('project.resources.new', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }} "
class="items-center justify-center box">+ Add New Resource</a>
@endif
<div class="grid gap-2 lg:grid-cols-2">

4
resources/views/security/private-key/index.blade.php
View File

@ -2,11 +2,11 @@
<x-security.navbar />
<div class="flex gap-2">
<h2 class="pb-4">Private Keys</h2>
<a href="{{ route('security.private-key.new') }}"><x-forms.button>+ Add</x-forms.button></a>
<a wire:navigate href="{{ route('security.private-key.new') }}"><x-forms.button>+ Add</x-forms.button></a>
</div>
<div class="grid gap-2 lg:grid-cols-2">
@forelse ($privateKeys as $key)
<a class="text-center hover:no-underline box group"
<a wire:navigate class="text-center hover:no-underline box group"
href="{{ route('security.private-key.show', ['private_key_uuid' => data_get($key, 'uuid')]) }}">
<div class="group-hover:text-white">
<div>{{ $key->name }}</div>

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

@ -9,7 +9,7 @@
<div class="grid gap-2 lg:grid-cols-2">
@forelse ($sources as $source)
@if ($source->getMorphClass() === 'App\Models\GithubApp')
<a class="flex gap-4 text-center hover:no-underline box group"
<a wire:navigate class="flex gap-4 text-center hover:no-underline box group"
href="{{ route('source.github.show', ['github_app_uuid' => data_get($source, 'uuid')]) }}">
<x-git-icon class="text-white w-9 h-9" git="{{ $source->getMorphClass() }}" />
<div class="text-left group-hover:text-white">
@ -21,7 +21,7 @@
</a>
@endif
@if ($source->getMorphClass() === 'App\Models\GitlabApp')
<a class="flex gap-4 text-center hover:no-underline box group"
<a wire:navigate class="flex gap-4 text-center hover:no-underline box group"
href="{{ route('source.gitlab.show', ['gitlab_app_uuid' => data_get($source, 'uuid')]) }}">
<x-git-icon class="text-white w-9 h-9" git="{{ $source->getMorphClass() }}" />
<div class="text-left group-hover:text-white">

2
resources/views/team/storages/all.blade.php
View File

@ -4,7 +4,7 @@
->currentTeam()" />
<div class="flex items-start gap-2">
<h2 class="pb-4">S3 Storages</h2>
<a class="text-white hover:no-underline" href="/team/storages/new"> <x-forms.button class="btn">+ Add
<a wire:navigate class="text-white hover:no-underline" href="/team/storages/new"> <x-forms.button class="btn">+ Add
</x-forms.button></a>
</div>
<div class="grid gap-2 lg:grid-cols-2">