diff --git a/app/Http/Livewire/PrivateKey/Change.php b/app/Http/Livewire/PrivateKey/Change.php index bd9332ca2..528c44506 100644 --- a/app/Http/Livewire/PrivateKey/Change.php +++ b/app/Http/Livewire/PrivateKey/Change.php @@ -27,7 +27,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('private-key.all'); + return redirect()->route('security.private-key.index'); } $this->emit('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 (\Exception $e) { diff --git a/resources/js/components/MagicBar.vue b/resources/js/components/MagicBar.vue index 5719bc1d6..8f052e96e 100644 --- a/resources/js/components/MagicBar.vue +++ b/resources/js/components/MagicBar.vue @@ -593,7 +593,7 @@ async function redirect() { targetUrl.pathname = `/source/new` break; case 7: - targetUrl.pathname = `/private-key/new` + targetUrl.pathname = `/security/private-key/new` break; case 8: targetUrl.pathname = `/destination/new` @@ -612,7 +612,7 @@ async function redirect() { targetUrl.pathname = `/servers` break; case 13: - targetUrl.pathname = `/private-keys` + targetUrl.pathname = `/security/private-key` break; case 14: targetUrl.pathname = `/projects` diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php index 65cbc482b..2b30acab1 100644 --- a/resources/views/components/navbar.blade.php +++ b/resources/views/components/navbar.blade.php @@ -50,6 +50,23 @@ class="{{ request()->is('command-center') ? 'text-warning icon' : 'icon' }}" vie +
  • + + + + + +
    • +
  • + + + + + +
    • +
    @if (isInstanceAdmin() && !isCloud()) diff --git a/resources/views/components/security/navbar.blade.php b/resources/views/components/security/navbar.blade.php new file mode 100644 index 000000000..1d2296cc1 --- /dev/null +++ b/resources/views/components/security/navbar.blade.php @@ -0,0 +1,17 @@ +
    +

    Security

    + + +
    diff --git a/resources/views/livewire/private-key/change.blade.php b/resources/views/livewire/private-key/change.blade.php index 26772c425..7fe31776f 100644 --- a/resources/views/livewire/private-key/change.blade.php +++ b/resources/views/livewire/private-key/change.blade.php @@ -6,7 +6,7 @@
    -

    Private Key

    +

    Private Key

    Save @@ -16,7 +16,6 @@ @endif
    -
    Private Key used for SSH connection
    diff --git a/resources/views/livewire/server/show-private-key.blade.php b/resources/views/livewire/server/show-private-key.blade.php index ae5877e97..15aecb4f4 100644 --- a/resources/views/livewire/server/show-private-key.blade.php +++ b/resources/views/livewire/server/show-private-key.blade.php @@ -1,7 +1,7 @@

    Private Key

    - + Add a new Private Key @@ -13,7 +13,7 @@ @if (data_get($server, 'privateKey.uuid'))
    Currently attached Private Key: - +
    diff --git a/resources/views/private-key/new.blade.php b/resources/views/private-key/new.blade.php deleted file mode 100644 index 65f163390..000000000 --- a/resources/views/private-key/new.blade.php +++ /dev/null @@ -1,5 +0,0 @@ - -

    Create a new Private Key

    -
    Private Keys are used for connection to servers.
    - -     diff --git a/resources/views/security/index.blade.php b/resources/views/security/index.blade.php new file mode 100644 index 000000000..aed0712e1 --- /dev/null +++ b/resources/views/security/index.blade.php @@ -0,0 +1,9 @@ + + + +
    +
    Private Keys
    +
    +     +     diff --git a/resources/views/private-key/all.blade.php b/resources/views/security/private-key/index.blade.php similarity index 52% rename from resources/views/private-key/all.blade.php rename to resources/views/security/private-key/index.blade.php index 23cf45f9a..207c6a270 100644 --- a/resources/views/private-key/all.blade.php +++ b/resources/views/security/private-key/index.blade.php @@ -1,10 +1,13 @@ -

    Private Keys

    -
    All Private Keys
    + +
    +

    Private Keys

    + + Add +
    @forelse ($privateKeys as $key) + href="{{ route('security.private-key.show', ['private_key_uuid' => data_get($key, 'uuid')]) }}">
    {{ $key->name }}
    @@ -12,7 +15,7 @@ @empty
    No private keys found.
    - +
    @endforelse
    diff --git a/resources/views/security/private-key/new.blade.php b/resources/views/security/private-key/new.blade.php new file mode 100644 index 000000000..b5e59eea2 --- /dev/null +++ b/resources/views/security/private-key/new.blade.php @@ -0,0 +1,5 @@ + +

    Create a new Private Key

    +
    Private Keys are used to connect to your servers without passwords.
    + +     diff --git a/resources/views/private-key/show.blade.php b/resources/views/security/private-key/show.blade.php similarity index 76% rename from resources/views/private-key/show.blade.php rename to resources/views/security/private-key/show.blade.php index f3efc02a1..82cf634f0 100644 --- a/resources/views/private-key/show.blade.php +++ b/resources/views/security/private-key/show.blade.php @@ -1,3 +1,4 @@ + diff --git a/resources/views/team/index.blade.php b/resources/views/team/index.blade.php index 3bb81512b..d0b2d0a65 100644 --- a/resources/views/team/index.blade.php +++ b/resources/views/team/index.blade.php @@ -1,7 +1,5 @@ - + @if (isCloud())
    diff --git a/resources/views/team/members.blade.php b/resources/views/team/members.blade.php index 5366e61f4..9191d4c6b 100644 --- a/resources/views/team/members.blade.php +++ b/resources/views/team/members.blade.php @@ -1,7 +1,5 @@ - +

    Members

    diff --git a/resources/views/team/notifications.blade.php b/resources/views/team/notifications.blade.php index 4714c30a7..b766195b4 100644 --- a/resources/views/team/notifications.blade.php +++ b/resources/views/team/notifications.blade.php @@ -1,7 +1,5 @@ - +

    Notifications

    diff --git a/routes/web.php b/routes/web.php index f2e0935e6..6d96710af 100644 --- a/routes/web.php +++ b/routes/web.php @@ -121,13 +121,14 @@ }); Route::middleware(['auth'])->group(function () { - Route::get('/private-keys', fn () => view('private-key.all', [ + Route::get('/security', fn () => view('security.index'))->name('security.index'); + Route::get('/security/private-key', fn () => view('security.private-key.index', [ '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', [ + ]))->name('security.private-key.index'); + Route::get('/security/private-key/new', fn () => view('security.private-key.new'))->name('security.private-key.new'); + Route::get('/security/private-key/{private_key_uuid}', fn () => view('security.private-key.show', [ 'private_key' => PrivateKey::ownedByCurrentTeam(['name', 'description', 'private_key', 'is_git_related'])->whereUuid(request()->private_key_uuid)->firstOrFail() - ]))->name('private-key.show'); + ]))->name('security.private-key.show'); });