From c295a3e90b628ab32790e7ce99e971c5d1cd6a7b Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 May 2023 10:41:25 +0200 Subject: [PATCH 01/15] wip --- .../Livewire/Project/New/PublicGitRepository.php | 6 +++++- app/View/Components/FormInput.php | 1 + resources/views/components/form-input.blade.php | 11 ++++++----- .../project/new/public-git-repository.blade.php | 13 ++++++++++--- resources/views/project/new.blade.php | 3 --- 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/app/Http/Livewire/Project/New/PublicGitRepository.php b/app/Http/Livewire/Project/New/PublicGitRepository.php index b676b463c..0f00ccf38 100644 --- a/app/Http/Livewire/Project/New/PublicGitRepository.php +++ b/app/Http/Livewire/Project/New/PublicGitRepository.php @@ -43,7 +43,11 @@ class PublicGitRepository extends Component $this->port = 3000; } $this->parameters = Route::current()->parameters(); - $this->servers = session('currentTeam')->load(['servers'])->servers; + $this->servers = session('currentTeam')->load(['servers'])->servers->reject(function ($server) { + if ($server->standaloneDockers->count() === 0 && $server->swarmDockers->count() === 0) { + return true; + } + }); } public function chooseServer($server_id) { diff --git a/app/View/Components/FormInput.php b/app/View/Components/FormInput.php index efe511b6a..6030c2681 100644 --- a/app/View/Components/FormInput.php +++ b/app/View/Components/FormInput.php @@ -17,6 +17,7 @@ class FormInput extends Component public bool $readonly = false, public string|null $label = null, public string|null $type = 'text', + public string|null $class = "", public bool $instantSave = false, public bool $disabled = false, public bool $hidden = false diff --git a/resources/views/components/form-input.blade.php b/resources/views/components/form-input.blade.php index d4dd79631..c09365694 100644 --- a/resources/views/components/form-input.blade.php +++ b/resources/views/components/form-input.blade.php @@ -26,12 +26,13 @@ @endif @if ($type === 'textarea') - + @else - @endif diff --git a/resources/views/livewire/project/new/public-git-repository.blade.php b/resources/views/livewire/project/new/public-git-repository.blade.php index b40697727..b1da74fe8 100644 --- a/resources/views/livewire/project/new/public-git-repository.blade.php +++ b/resources/views/livewire/project/new/public-git-repository.blade.php @@ -1,11 +1,17 @@
+ @if ($servers->count() > 0) +

Choose a server

+ @endif @forelse ($servers as $server) @empty - No servers + No servers found. +

Did you forget to add a destination on the server?

@endforelse + @isset($chosenServer) +

Choose a destination

@foreach ($standalone_docker as $standalone)
From 4eb1c0412b5a4fb6d345e775f2134f4df4a8450d Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 May 2023 11:16:08 +0200 Subject: [PATCH 02/15] flow to add new destinations --- .../Project/New/PublicGitRepository.php | 14 +++---- resources/views/destination/new.blade.php | 2 +- .../new/public-git-repository.blade.php | 37 +++++++++++++------ resources/views/server/show.blade.php | 2 +- routes/web.php | 11 +++++- 5 files changed, 42 insertions(+), 24 deletions(-) diff --git a/app/Http/Livewire/Project/New/PublicGitRepository.php b/app/Http/Livewire/Project/New/PublicGitRepository.php index 0f00ccf38..bd7f18a41 100644 --- a/app/Http/Livewire/Project/New/PublicGitRepository.php +++ b/app/Http/Livewire/Project/New/PublicGitRepository.php @@ -43,17 +43,13 @@ class PublicGitRepository extends Component $this->port = 3000; } $this->parameters = Route::current()->parameters(); - $this->servers = session('currentTeam')->load(['servers'])->servers->reject(function ($server) { - if ($server->standaloneDockers->count() === 0 && $server->swarmDockers->count() === 0) { - return true; - } - }); + $this->servers = session('currentTeam')->load(['servers'])->servers; } - public function chooseServer($server_id) + public function chooseServer($server) { - $this->chosenServer = $server_id; - $this->standalone_docker = StandaloneDocker::where('server_id', $server_id)->get(); - $this->swarm_docker = SwarmDocker::where('server_id', $server_id)->get(); + $this->chosenServer = $server; + $this->standalone_docker = StandaloneDocker::where('server_id', $server['id'])->get(); + $this->swarm_docker = SwarmDocker::where('server_id', $server['id'])->get(); } public function setDestination($destination_uuid, $destination_type) { diff --git a/resources/views/destination/new.blade.php b/resources/views/destination/new.blade.php index a3be8a53b..55bb270e2 100644 --- a/resources/views/destination/new.blade.php +++ b/resources/views/destination/new.blade.php @@ -1,4 +1,4 @@

New Destination

- + diff --git a/resources/views/livewire/project/new/public-git-repository.blade.php b/resources/views/livewire/project/new/public-git-repository.blade.php index b1da74fe8..c340e0a82 100644 --- a/resources/views/livewire/project/new/public-git-repository.blade.php +++ b/resources/views/livewire/project/new/public-git-repository.blade.php @@ -4,24 +4,37 @@ @endif @forelse ($servers as $server) + wire:click="chooseServer({{ $server }})">{{ $server->name }} @empty No servers found.

Did you forget to add a destination on the server?

@endforelse @isset($chosenServer) -

Choose a destination

-
- @foreach ($standalone_docker as $standalone) - - @endforeach - @foreach ($swarm_docker as $standalone) - - @endforeach -
+ @if ($standalone_docker->count() > 0 || $swarm_docker->count() > 0) +

Choose a destination

+
+ @foreach ($standalone_docker as $standalone) + + @endforeach + @foreach ($swarm_docker as $standalone) + + @endforeach +
+
+ Add + a new + destination +
+ @else +

No destinations found on this server.

+ Add + a + destination + @endif + @endisset @isset($chosenDestination) diff --git a/resources/views/server/show.blade.php b/resources/views/server/show.blade.php index 1fb710c42..3cf9c8cf3 100644 --- a/resources/views/server/show.blade.php +++ b/resources/views/server/show.blade.php @@ -1,7 +1,7 @@

Server

-

Destinations

+

Destinations

@if ($server->standaloneDockers) @foreach ($server->standaloneDockers as $docker)

Network: {{ data_get($docker, 'network') }}

diff --git a/routes/web.php b/routes/web.php index deb7be6f0..d50f74e04 100644 --- a/routes/web.php +++ b/routes/web.php @@ -74,7 +74,16 @@ Route::middleware(['auth'])->group(function () { }); Route::middleware(['auth'])->group(function () { - Route::get('/destination/new', fn () => view('destination.new'))->name('destination.new'); + Route::get('/destination/new', function () { + $query_params = request()->query(); + $server_id = null; + if (isset($query_params['server_id'])) { + $server_id = $query_params['server_id']; + } + return view('destination.new', [ + 'server_id' => $server_id, + ]); + })->name('destination.new'); Route::get('/destination/{destination_uuid}', function () { $standalone_dockers = StandaloneDocker::where('uuid', request()->destination_uuid)->first(); $swarm_dockers = SwarmDocker::where('uuid', request()->destination_uuid)->first(); From 34a935f75741d824d09c888032eb0173e7271c70 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 May 2023 11:19:57 +0200 Subject: [PATCH 03/15] fix --- resources/views/server/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/server/show.blade.php b/resources/views/server/show.blade.php index 3cf9c8cf3..6874693f4 100644 --- a/resources/views/server/show.blade.php +++ b/resources/views/server/show.blade.php @@ -1,7 +1,7 @@

Server

-

Destinations

+

Destinations

@if ($server->standaloneDockers) @foreach ($server->standaloneDockers as $docker)

Network: {{ data_get($docker, 'network') }}

From c420f89d48b4799d888b6dd84c271911dbe3ee11 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 May 2023 11:23:31 +0200 Subject: [PATCH 04/15] fix --- .../views/livewire/project/new/public-git-repository.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/livewire/project/new/public-git-repository.blade.php b/resources/views/livewire/project/new/public-git-repository.blade.php index c340e0a82..f2bffc93d 100644 --- a/resources/views/livewire/project/new/public-git-repository.blade.php +++ b/resources/views/livewire/project/new/public-git-repository.blade.php @@ -3,7 +3,7 @@

Choose a server

@endif @forelse ($servers as $server) - @empty No servers found. From 59d69587ddb4ee80c84305a4ddd3602b67cd1755 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 May 2023 11:28:13 +0200 Subject: [PATCH 05/15] server keepalive --- bootstrap/helpers.php | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap/helpers.php b/bootstrap/helpers.php index 51aff79a7..f4ece52b0 100644 --- a/bootstrap/helpers.php +++ b/bootstrap/helpers.php @@ -79,6 +79,7 @@ if (!function_exists('generateSshCommand')) { . '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ' . '-o PasswordAuthentication=no ' . '-o ConnectTimeout=3600 ' + . '-o ServerAliveInterval=60 ' . '-o RequestTTY=no ' . '-o LogLevel=ERROR ' . "-p {$port} " From 906b4ce158e0dd124f453d3f3cab9ed908c3c060 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 May 2023 11:30:58 +0200 Subject: [PATCH 06/15] fail the job manually --- app/Jobs/DeployApplicationJob.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Jobs/DeployApplicationJob.php b/app/Jobs/DeployApplicationJob.php index 501f45039..5eb1f5f75 100644 --- a/app/Jobs/DeployApplicationJob.php +++ b/app/Jobs/DeployApplicationJob.php @@ -222,10 +222,10 @@ COPY --from={$this->application->uuid}:{$this->git_commit}-build /app/{$this->ap Storage::disk('deployments')->put(Str::kebab($this->application->name) . '/docker-compose.yml', $this->docker_compose); } catch (\Exception $e) { $this->executeNow([ - "echo 'Oops something is not okay, are you okay? 😢'", + "echo '\nOops something is not okay, are you okay? 😢'", "echo '\n\n{$e->getMessage()}'", ]); - throw new \Exception('Deployment finished'); + $this->fail($e->getMessage()); } finally { $this->executeNow(["docker rm -f {$this->deployment_uuid} >/dev/null 2>&1"], hideFromOutput: true); dispatch(new ContainerStatusJob($this->application_uuid)); From 612460ca1632ff7febd2daf0a0ca347b71546094 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 May 2023 12:38:57 +0200 Subject: [PATCH 07/15] change/modify/delete/add private keys --- app/Http/Livewire/PrivateKey/Change.php | 39 +++++++++++++++++++ app/Http/Livewire/PrivateKey/Create.php | 27 +++++++++++++ app/Http/Livewire/Server/New/ByIp.php | 16 +------- app/Http/Livewire/Server/PrivateKey.php | 26 +++++++++++++ app/Models/Team.php | 4 ++ resources/views/dashboard.blade.php | 6 +++ .../livewire/private-key/change.blade.php | 14 +++++++ .../livewire/private-key/create.blade.php | 10 +++++ .../views/livewire/server/form.blade.php | 3 +- .../views/livewire/server/new/by-ip.blade.php | 9 +---- .../livewire/server/private-key.blade.php | 7 ++++ resources/views/private-key/new.blade.php | 4 ++ resources/views/private-key/show.blade.php | 4 ++ resources/views/server/private-key.blade.php | 4 ++ resources/views/server/show.blade.php | 4 ++ routes/web.php | 16 ++++++++ 16 files changed, 169 insertions(+), 24 deletions(-) create mode 100644 app/Http/Livewire/PrivateKey/Change.php create mode 100644 app/Http/Livewire/PrivateKey/Create.php create mode 100644 app/Http/Livewire/Server/PrivateKey.php create mode 100644 resources/views/livewire/private-key/change.blade.php create mode 100644 resources/views/livewire/private-key/create.blade.php create mode 100644 resources/views/livewire/server/private-key.blade.php create mode 100644 resources/views/private-key/new.blade.php create mode 100644 resources/views/private-key/show.blade.php create mode 100644 resources/views/server/private-key.blade.php diff --git a/app/Http/Livewire/PrivateKey/Change.php b/app/Http/Livewire/PrivateKey/Change.php new file mode 100644 index 000000000..bede7aca4 --- /dev/null +++ b/app/Http/Livewire/PrivateKey/Change.php @@ -0,0 +1,39 @@ +delete(); + session('currentTeam')->privateKeys = PrivateKey::where('team_id', session('currentTeam')->id)->get(); + redirect()->route('dashboard'); + } + public function changePrivateKey() + { + try { + $this->private_key_value = trim($this->private_key_value); + if (!str_ends_with($this->private_key_value, "\n")) { + $this->private_key_value .= "\n"; + } + PrivateKey::where('uuid', $this->private_key_uuid)->update([ + 'name' => $this->private_key_name, + 'description' => $this->private_key_description, + 'private_key' => $this->private_key_value, + ]); + session('currentTeam')->privateKeys = PrivateKey::where('team_id', session('currentTeam')->id)->get(); + } catch (\Exception $e) { + $this->addError('private_key_value', $e->getMessage()); + } + } +} diff --git a/app/Http/Livewire/PrivateKey/Create.php b/app/Http/Livewire/PrivateKey/Create.php new file mode 100644 index 000000000..e21f02309 --- /dev/null +++ b/app/Http/Livewire/PrivateKey/Create.php @@ -0,0 +1,27 @@ +private_key_value = trim($this->private_key_value); + if (!str_ends_with($this->private_key_value, "\n")) { + $this->private_key_value .= "\n"; + } + PrivateKey::create([ + 'name' => $this->private_key_name, + 'description' => $this->private_key_description, + 'private_key' => $this->private_key_value, + 'team_id' => session('currentTeam')->id + ]); + session('currentTeam')->privateKeys = PrivateKey::where('team_id', session('currentTeam')->id)->get(); + } +} diff --git a/app/Http/Livewire/Server/New/ByIp.php b/app/Http/Livewire/Server/New/ByIp.php index e5fdafa98..baf638a2f 100644 --- a/app/Http/Livewire/Server/New/ByIp.php +++ b/app/Http/Livewire/Server/New/ByIp.php @@ -15,7 +15,7 @@ class ByIp extends Component public $new_private_key_value; public string $name; - public string $description; + public string|null $description = null; public string $ip; public string $user = 'root'; public int $port = 22; @@ -29,20 +29,6 @@ class ByIp extends Component { $this->private_key_id = $private_key_id; } - public function addPrivateKey() - { - $this->new_private_key_value = trim($this->new_private_key_value); - if (!str_ends_with($this->new_private_key_value, "\n")) { - $this->new_private_key_value .= "\n"; - } - PrivateKey::create([ - 'name' => $this->new_private_key_name, - 'description' => $this->new_private_key_description, - 'private_key' => $this->new_private_key_value, - 'team_id' => session('currentTeam')->id - ]); - session('currentTeam')->privateKeys = $this->private_keys = PrivateKey::where('team_id', session('currentTeam')->id)->get(); - } public function submit() { if (!$this->private_key_id) { diff --git a/app/Http/Livewire/Server/PrivateKey.php b/app/Http/Livewire/Server/PrivateKey.php new file mode 100644 index 000000000..6e57f4ad2 --- /dev/null +++ b/app/Http/Livewire/Server/PrivateKey.php @@ -0,0 +1,26 @@ +parameters['server_uuid'])->update([ + 'private_key_id' => $private_key_id + ]); + return redirect()->route('server.show', $this->parameters['server_uuid']); + } + public function mount() + { + $this->parameters = Route::current()->parameters(); + $this->private_keys = ModelsPrivateKey::where('team_id', session('currentTeam')->id)->get(); + } +} diff --git a/app/Models/Team.php b/app/Models/Team.php index 4c9938c5b..aaadcbb5a 100644 --- a/app/Models/Team.php +++ b/app/Models/Team.php @@ -24,4 +24,8 @@ class Team extends BaseModel { return $this->hasManyThrough(Application::class, Project::class); } + public function privateKeys() + { + return $this->hasMany(PrivateKey::class); + } } diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 22a1b8310..c13cfd80a 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -14,6 +14,12 @@

Destinations

@forelse ($destinations as $destination) {{ data_get($destination, 'name') }} + @empty +

No destinations found.

+ @endforelse +

Private Keys

+ @forelse ($private_keys as $private_key) + {{ data_get($private_key, 'name') }} @empty

No servers found.

@endforelse diff --git a/resources/views/livewire/private-key/change.blade.php b/resources/views/livewire/private-key/change.blade.php new file mode 100644 index 000000000..9513c6c85 --- /dev/null +++ b/resources/views/livewire/private-key/change.blade.php @@ -0,0 +1,14 @@ +
+ + + + + + + +
diff --git a/resources/views/livewire/private-key/create.blade.php b/resources/views/livewire/private-key/create.blade.php new file mode 100644 index 000000000..040ecf975 --- /dev/null +++ b/resources/views/livewire/private-key/create.blade.php @@ -0,0 +1,10 @@ +
+
+ + + + + +
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php index 926fcae96..12cf4856e 100644 --- a/resources/views/livewire/server/form.blade.php +++ b/resources/views/livewire/server/form.blade.php @@ -21,7 +21,8 @@ - + diff --git a/resources/views/livewire/server/new/by-ip.blade.php b/resources/views/livewire/server/new/by-ip.blade.php index e4505b04e..9f6827fdb 100644 --- a/resources/views/livewire/server/new/by-ip.blade.php +++ b/resources/views/livewire/server/new/by-ip.blade.php @@ -20,14 +20,7 @@

Add a new One

-
- - - - - +
diff --git a/resources/views/livewire/server/private-key.blade.php b/resources/views/livewire/server/private-key.blade.php new file mode 100644 index 000000000..ab5b30036 --- /dev/null +++ b/resources/views/livewire/server/private-key.blade.php @@ -0,0 +1,7 @@ +
+ @forelse ($private_keys as $private_key) + + @empty +

No private keys found

+ @endforelse +
diff --git a/resources/views/private-key/new.blade.php b/resources/views/private-key/new.blade.php new file mode 100644 index 000000000..631789b86 --- /dev/null +++ b/resources/views/private-key/new.blade.php @@ -0,0 +1,4 @@ + +

New Private Key

+ + diff --git a/resources/views/private-key/show.blade.php b/resources/views/private-key/show.blade.php new file mode 100644 index 000000000..0e6c01de1 --- /dev/null +++ b/resources/views/private-key/show.blade.php @@ -0,0 +1,4 @@ + +

Private Key

+ + diff --git a/resources/views/server/private-key.blade.php b/resources/views/server/private-key.blade.php new file mode 100644 index 000000000..5799eb522 --- /dev/null +++ b/resources/views/server/private-key.blade.php @@ -0,0 +1,4 @@ + +

Select a private Key

+ + diff --git a/resources/views/server/show.blade.php b/resources/views/server/show.blade.php index 6874693f4..757bf32bb 100644 --- a/resources/views/server/show.blade.php +++ b/resources/views/server/show.blade.php @@ -1,6 +1,10 @@

Server

+

Private Key +

+

{{ $server->privateKey->name }}

Destinations

@if ($server->standaloneDockers) @foreach ($server->standaloneDockers as $docker) diff --git a/routes/web.php b/routes/web.php index d50f74e04..291633b4c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -4,6 +4,7 @@ use App\Http\Controllers\ApplicationController; use App\Http\Controllers\HomeController; use App\Http\Controllers\ProjectController; use App\Models\InstanceSettings; +use App\Models\PrivateKey; use App\Models\StandaloneDocker; use App\Models\SwarmDocker; use Illuminate\Support\Facades\Route; @@ -28,10 +29,13 @@ Route::middleware(['auth'])->group(function () { $destinations = $servers->map(function ($server) { return $server->standaloneDockers->merge($server->swarmDockers); })->flatten(); + $private_keys = session('currentTeam')->load(['privateKeys'])->privateKeys; + return view('dashboard', [ 'servers' => $servers->sortBy('name'), 'projects' => $projects->sortBy('name'), 'destinations' => $destinations->sortBy('name'), + 'private_keys' => $private_keys->sortBy('name'), ]); })->name('dashboard'); @@ -60,6 +64,15 @@ Route::middleware(['auth'])->group(function () { })->name('demo'); }); +Route::middleware(['auth'])->group(function () { + Route::get('/private-key/new', fn () => view('private-key.new'))->name('private-key.new'); + Route::get('/private-key/{private_key_uuid}', function () { + $private_key = PrivateKey::where('uuid', request()->private_key_uuid)->first(); + return view('private-key.show', [ + 'private_key' => $private_key, + ]); + })->name('private-key.show'); +}); Route::middleware(['auth'])->group(function () { Route::get('/server/new', fn () => view('server.new'))->name('server.new'); Route::get('/server/{server_uuid}', function () { @@ -71,6 +84,9 @@ Route::middleware(['auth'])->group(function () { 'server' => $server, ]); })->name('server.show'); + Route::get('/server/{server_uuid}/private-key', function () { + return view('server.private-key'); + })->name('server.private-key'); }); Route::middleware(['auth'])->group(function () { From abf778ce867109e456caa2eded172e45909c9289 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 May 2023 14:09:10 +0200 Subject: [PATCH 08/15] button components --- app/Http/Livewire/PrivateKey/Create.php | 3 +- app/View/Components/FormInput.php | 34 ------------- app/View/Components/Input.php | 30 ------------ resources/views/auth/login.blade.php | 2 +- resources/views/auth/register.blade.php | 2 +- .../views/components/confirm-modal.blade.php | 4 +- resources/views/components/input.blade.php | 11 ----- .../views/components/inputs/button.blade.php | 13 +++++ .../input.blade.php} | 12 +++++ resources/views/components/navbar.blade.php | 2 +- resources/views/dashboard.blade.php | 16 +++++-- .../views/livewire/check-update.blade.php | 3 +- .../new/standalone-docker.blade.php | 20 +++++--- .../views/livewire/force-upgrade.blade.php | 3 +- .../livewire/private-key/change.blade.php | 16 +++---- .../livewire/private-key/create.blade.php | 10 ++-- .../project/application/deploy.blade.php | 17 +++---- .../project/application/general.blade.php | 48 +++++++++---------- .../project/application/source.blade.php | 10 ++-- .../project/new/empty-project.blade.php | 2 +- .../new/public-git-repository.blade.php | 40 +++++++++++----- .../views/livewire/run-command.blade.php | 13 ++--- .../views/livewire/server/form.blade.php | 30 +++++------- .../views/livewire/server/new/by-ip.blade.php | 25 ++++++---- .../livewire/server/private-key.blade.php | 2 +- .../views/livewire/settings/form.blade.php | 20 ++++---- .../views/livewire/switch-team.blade.php | 4 +- resources/views/private-key/new.blade.php | 2 +- resources/views/project/new.blade.php | 5 +- resources/views/project/resources.blade.php | 4 +- resources/views/server/show.blade.php | 9 ++-- 31 files changed, 198 insertions(+), 214 deletions(-) delete mode 100644 app/View/Components/FormInput.php delete mode 100644 app/View/Components/Input.php delete mode 100644 resources/views/components/input.blade.php create mode 100644 resources/views/components/inputs/button.blade.php rename resources/views/components/{form-input.blade.php => inputs/input.blade.php} (85%) diff --git a/app/Http/Livewire/PrivateKey/Create.php b/app/Http/Livewire/PrivateKey/Create.php index e21f02309..ee73827ea 100644 --- a/app/Http/Livewire/PrivateKey/Create.php +++ b/app/Http/Livewire/PrivateKey/Create.php @@ -16,12 +16,13 @@ class Create extends Component if (!str_ends_with($this->private_key_value, "\n")) { $this->private_key_value .= "\n"; } - PrivateKey::create([ + $new_private_key = PrivateKey::create([ 'name' => $this->private_key_name, 'description' => $this->private_key_description, 'private_key' => $this->private_key_value, 'team_id' => session('currentTeam')->id ]); session('currentTeam')->privateKeys = PrivateKey::where('team_id', session('currentTeam')->id)->get(); + redirect()->route('private-key.show', $new_private_key->uuid); } } diff --git a/app/View/Components/FormInput.php b/app/View/Components/FormInput.php deleted file mode 100644 index 6030c2681..000000000 --- a/app/View/Components/FormInput.php +++ /dev/null @@ -1,34 +0,0 @@ - - + Login @if ($errors->any())
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index a2494ff3a..515f47509 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -9,7 +9,7 @@ - + Register @if ($errors->any())
diff --git a/resources/views/components/confirm-modal.blade.php b/resources/views/components/confirm-modal.blade.php index d25996123..24fad1ff0 100644 --- a/resources/views/components/confirm-modal.blade.php +++ b/resources/views/components/confirm-modal.blade.php @@ -16,8 +16,8 @@
- - + Confirm + Cancel
diff --git a/resources/views/components/input.blade.php b/resources/views/components/input.blade.php deleted file mode 100644 index 0acf572ce..000000000 --- a/resources/views/components/input.blade.php +++ /dev/null @@ -1,11 +0,0 @@ - diff --git a/resources/views/components/inputs/button.blade.php b/resources/views/components/inputs/button.blade.php new file mode 100644 index 000000000..9d9faaa65 --- /dev/null +++ b/resources/views/components/inputs/button.blade.php @@ -0,0 +1,13 @@ +@props([ + 'defaultClass' => 'bg-indigo-500', + 'confirm' => null, + 'confirmAction' => null, +]) + + diff --git a/resources/views/components/form-input.blade.php b/resources/views/components/inputs/input.blade.php similarity index 85% rename from resources/views/components/form-input.blade.php rename to resources/views/components/inputs/input.blade.php index c09365694..f899cb64e 100644 --- a/resources/views/components/form-input.blade.php +++ b/resources/views/components/inputs/input.blade.php @@ -1,3 +1,15 @@ +@props([ + 'id' => null, + 'required' => false, + 'readonly' => false, + 'label' => null, + 'type' => 'text', + 'class' => '', + 'instantSave' => false, + 'disabled' => false, + 'hidden' => false, +]) + @if ($type === 'checkbox')