An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
feat(ui): improve sidebar menu items styling (#7928)
Dominic Schmidd4957ff3d114
diff --git a/resources/css/utilities.css b/resources/css/utilities.cssindex 7978b2d19d..c7b77022fb 100644--- a/resources/css/utilities.css+++ b/resources/css/utilities.css@@ -174,15 +174,34 @@}@utility menu-item {- @apply flex gap-3 items-center px-2 py-1 w-full text-sm sm:pr-0 dark:hover:bg-coolgray-100 dark:hover:text-white hover:bg-neutral-300 min-w-fit sm:min-w-64;+ @apply flex gap-3 items-center px-2 py-1 w-full text-sm dark:hover:bg-coolgray-100 dark:hover:text-white hover:bg-neutral-300 rounded-sm truncate min-w-0;+}+@utility menu-item-icon {+ @apply flex-shrink-0 w-6 h-6 dark:hover:text-white;+}++@utility menu-item-label {+ @apply min-w-0 flex-1 truncate;}@utility menu-item-active {- @apply text-black rounded-none dark:bg-coolgray-200 dark:text-warning bg-neutral-200;+ @apply text-black rounded-sm dark:bg-coolgray-200 dark:text-warning bg-neutral-200 overflow-hidden;+}++@utility sub-menu-wrapper {+ @apply flex flex-col items-start gap-2 min-w-40 sm:min-w-48 w-auto max-w-full sm:flex-shrink;+}++@utility sub-menu-item {+ @apply flex gap-2 items-center px-2 py-1 w-full text-sm dark:hover:bg-coolgray-100 dark:hover:text-white hover:bg-neutral-300 rounded-sm truncate min-w-0;+}++@utility sub-menu-item-icon {+ @apply flex-shrink-0 w-4 h-4 dark:hover:text-white;}@utility heading-item-active {- @apply text-black rounded-none dark:bg-coolgray-200 dark:text-warning;+ @apply text-black rounded-sm dark:bg-coolgray-200 dark:text-warning;}@utility icon {diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.phpindex e351a44805..48b544ebb7 100644--- a/resources/views/components/navbar.blade.php+++ b/resources/views/components/navbar.blade.php@@ -62,11 +62,11 @@html {font-size: 93.75%;}-+:root {--vh: 1vh;}-+@media (min-width: 1024px) {html {font-size: 87.5%;@@ -107,19 +107,19 @@<li><a title="Dashboard" href="/" {{ wireNavigate() }}class="{{ request()->is('/') ? 'menu-item-active menu-item' : 'menu-item' }}">- <svg xmlns="http://www.w3.org/2000/svg" class="icon" fill="none" viewBox="0 0 24 24"+ <svg xmlns="http://www.w3.org/2000/svg" class="menu-item-icon" fill="none" viewBox="0 0 24 24"stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6" /></svg>- Dashboard+ <span class="menu-item-label">Dashboard</span></a></li><li><a title="Projects" {{ wireNavigate() }}class="{{ request()->is('project/*') || request()->is('projects') ? 'menu-item menu-item-active' : 'menu-item' }}"href="/projects">- <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24"+ <svg xmlns="http://www.w3.org/2000/svg" class="menu-item-icon" viewBox="0 0 24 24"stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none" />@@ -127,14 +127,14 @@<path d="M4 12l8 4l8 -4" /><path d="M4 16l8 4l8 -4" /></svg>- Projects+ <span class="menu-item-label">Projects</span></a></li><li><a title="Servers" {{ wireNavigate() }}class="{{ request()->is('server/*') || request()->is('servers') ? 'menu-item menu-item-active' : 'menu-item' }}"href="/servers">- <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24"+ <svg xmlns="http://www.w3.org/2000/svg" class="menu-item-icon" viewBox="0 0 24 24"stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none" />@@ -145,7 +145,7 @@<path d="M7 16v.01" /><path d="M20 15l-2 3h3l-2 3" /></svg>- Servers+ <span class="menu-item-label">Servers</span></a></li>@@ -153,11 +153,11 @@<a title="Sources" {{ wireNavigate() }}class="{{ request()->is('source*') ? 'menu-item-active menu-item' : 'menu-item' }}"href="{{ route('source.all') }}">- <svg class="icon" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">+ <svg class="menu-item-icon" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor"d="m6.793 1.207l.353.354l-.353-.354ZM1.207 6.793l-.353-.354l.353.354Zm0 1.414l.354-.353l-.354.353Zm5.586 5.586l-.354.353l.354-.353Zm1.414 0l-.353-.354l.353.354Zm5.586-5.586l.353.354l-.353-.354Zm0-1.414l-.354.353l.354-.353ZM8.207 1.207l.354-.353l-.354.353ZM6.44.854L.854 6.439l.707.707l5.585-5.585L6.44.854ZM.854 8.56l5.585 5.585l.707-.707l-5.585-5.585l-.707.707Zm7.707 5.585l5.585-5.585l-.707-.707l-5.585 5.585l.707.707Zm5.585-7.707L8.561.854l-.707.707l5.585 5.585l.707-.707Zm0 2.122a1.5 1.5 0 0 0 0-2.122l-.707.707a.5.5 0 0 1 0 .708l.707.707ZM6.44 14.146a1.5 1.5 0 0 0 2.122 0l-.707-.707a.5.5 0 0 1-.708 0l-.707.707ZM.854 6.44a1.5 1.5 0 0 0 0 2.122l.707-.707a.5.5 0 0 1 0-.708L.854 6.44Zm6.292-4.878a.5.5 0 0 1 .708 0L8.56.854a1.5 1.5 0 0 0-2.122 0l.707.707Zm-2 1.293l1 1l.708-.708l-1-1l-.708.708ZM7.5 5a.5.5 0 0 1-.5-.5H6A1.5 1.5 0 0 0 7.5 6V5Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 9 4.5H8ZM7.5 4a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 7.5 3v1Zm0-1A1.5 1.5 0 0 0 6 4.5h1a.5.5 0 0 1 .5-.5V3Zm.646 2.854l1.5 1.5l.707-.708l-1.5-1.5l-.707.708ZM10.5 8a.5.5 0 0 1-.5-.5H9A1.5 1.5 0 0 0 10.5 9V8Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 12 7.5h-1Zm-.5-.5a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 10.5 6v1Zm0-1A1.5 1.5 0 0 0 9 7.5h1a.5.5 0 0 1 .5-.5V6ZM7 5.5v4h1v-4H7Zm.5 5.5a.5.5 0 0 1-.5-.5H6A1.5 1.5 0 0 0 7.5 12v-1Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 9 10.5H8Zm-.5-.5a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 7.5 9v1Zm0-1A1.5 1.5 0 0 0 6 10.5h1a.5.5 0 0 1 .5-.5V9Z" /></svg>- Sources+ <span class="menu-item-label">Sources</span></a></li><li>@@ -165,19 +165,19 @@class="{{ request()->is('destination*') ? 'menu-item-active menu-item' : 'menu-item' }}"href="{{ route('destination.index') }}">- <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24">+ <svg xmlns="http://www.w3.org/2000/svg" class="menu-item-icon" viewBox="0 0 24 24"><path fill="none" stroke="currentColor" stroke-linecap="round"stroke-linejoin="round" stroke-width="2"d="M9 4L3 8v12l6-3l6 3l6-4V4l-6 3l-6-3zm-2 8.001V12m4 .001V12m3-2l2 2m2 2l-2-2m0 0l2-2m-2 2l-2 2" /></svg>- Destinations+ <span class="menu-item-label">Destinations</span></a></li><li><a title="S3 Storages" {{ wireNavigate() }}class="{{ request()->is('storages*') ? 'menu-item-active menu-item' : 'menu-item' }}"href="{{ route('storage.index') }}">- <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24">+ <svg xmlns="http://www.w3.org/2000/svg" class="menu-item-icon" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"stroke-width="2"><path d="M4 6a8 3 0 1 0 16 0A8 3 0 1 0 4 6" />@@ -185,14 +185,14 @@<path d="M4 12v6a8 3 0 0 0 16 0v-6" /></g></svg>- S3 Storages+ <span class="menu-item-label">S3 Storages</span></a></li><li><a title="Shared variables" {{ wireNavigate() }}class="{{ request()->is('shared-variables*') ? 'menu-item-active menu-item' : 'menu-item' }}"href="{{ route('shared-variables.index') }}">- <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24">+ <svg xmlns="http://www.w3.org/2000/svg" class="menu-item-icon" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"stroke-width="2"><path@@ -200,38 +200,38 @@<path d="M8 16c1.5 0 3-2 4-3.5S14.5 9 16 9" /></g></svg>- Shared Variables+ <span class="menu-item-label">Shared Variables</span></a></li><li><a title="Notifications" {{ wireNavigate() }}class="{{ request()->is('notifications*') ? 'menu-item-active menu-item' : 'menu-item' }}"href="{{ route('notifications.email') }}">- <svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">+ <svg class="menu-item-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" stroke="currentColor" stroke-linecap="round"stroke-linejoin="round" stroke-width="2"d="M10 5a2 2 0 1 1 4 0a7 7 0 0 1 4 6v3a4 4 0 0 0 2 3H4a4 4 0 0 0 2-3v-3a7 7 0 0 1 4-6M9 17v1a3 3 0 0 0 6 0v-1" /></svg>- Notifications+ <span class="menu-item-label">Notifications</span></a></li><li><a title="Keys & Tokens" {{ wireNavigate() }}class="{{ request()->is('security*') ? 'menu-item-active menu-item' : 'menu-item' }}"href="{{ route('security.private-key.index') }}">- <svg class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">+ <svg class="menu-item-icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill="none" stroke="currentColor" stroke-linecap="round"stroke-linejoin="round" stroke-width="2"d="m16.555 3.843l3.602 3.602a2.877 2.877 0 0 1 0 4.069l-2.643 2.643a2.877 2.877 0 0 1-4.069 0l-.301-.301l-6.558 6.558a2 2 0 0 1-1.239.578L5.172 21H4a1 1 0 0 1-.993-.883L3 20v-1.172a2 2 0 0 1 .467-1.284l.119-.13L4 17h2v-2h2v-2l2.144-2.144l-.301-.301a2.877 2.877 0 0 1 0-4.069l2.643-2.643a2.877 2.877 0 0 1 4.069 0zM15 9h.01" /></svg>- Keys & Tokens+ <span class="menu-item-label">Keys & Tokens</span></a></li><li><a title="Tags" {{ wireNavigate() }}class="{{ request()->is('tags*') ? 'menu-item-active menu-item' : 'menu-item' }}"href="{{ route('tags.show') }}">- <svg class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">+ <svg class="menu-item-icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="currentColor" stroke-linecap="round"stroke-linejoin="round" stroke-width="2"><path@@ -239,7 +239,7 @@<path d="m18 19l1.592-1.592a4.82 4.82 0 0 0 0-6.816L15 6m-8 4h-.01" /></g></svg>- Tags+ <span class="menu-item-label">Tags</span></a></li>@can('canAccessTerminal')@@ -247,14 +247,14 @@<a title="Terminal"class="{{ request()->is('terminal*') ? 'menu-item-active menu-item' : 'menu-item' }}"href="{{ route('terminal') }}">- <svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"+ <svg class="menu-item-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M5 7l5 5l-5 5" /><path d="M12 19l7 0" /></svg>- Terminal+ <span class="menu-item-label">Terminal</span></a></li>@endcan@@ -262,7 +262,7 @@<a title="Profile" {{ wireNavigate() }}class="{{ request()->is('profile*') ? 'menu-item-active menu-item' : 'menu-item' }}"href="{{ route('profile') }}">- <svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"+ <svg class="menu-item-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none" />@@ -270,14 +270,14 @@<path d="M12 10m-3 0a3 3 0 1 0 6 0a3 3 0 1 0 -6 0" /><path d="M6.168 18.849a4 4 0 0 1 3.832 -2.849h4a4 4 0 0 1 3.834 2.855" /></svg>- Profile+ <span class="menu-item-label">Profile</span></a></li><li><a title="Teams" {{ wireNavigate() }}class="{{ request()->is('team*') ? 'menu-item-active menu-item' : 'menu-item' }}"href="{{ route('team.index') }}">- <svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"+ <svg class="menu-item-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none" />@@ -288,7 +288,7 @@<path d="M5 5a2 2 0 1 0 4 0a2 2 0 0 0 -4 0" /><path d="M3 13v-1a2 2 0 0 1 2 -2h2" /></svg>- Teams+ <span class="menu-item-label">Teams</span></a></li>@if (isCloud() && auth()->user()->isAdmin())@@ -296,12 +296,12 @@<a title="Subscription" {{ wireNavigate() }}class="{{ request()->is('subscription*') ? 'menu-item-active menu-item' : 'menu-item' }}"href="{{ route('subscription.show') }}">- <svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">+ <svg class="menu-item-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" stroke="currentColor" stroke-linecap="round"stroke-linejoin="round" stroke-width="2"d="M3 8a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v8a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3zm0 2h18M7 15h.01M11 15h2" /></svg>- Subscription+ <span class="menu-item-label">Subscription</span></a></li>@endif@@ -311,7 +311,7 @@<a title="Settings" {{ wireNavigate() }}class="{{ request()->is('settings*') ? 'menu-item-active menu-item' : 'menu-item' }}"href="/settings">- <svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"+ <svg class="menu-item-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none" />@@ -319,7 +319,7 @@d="M10.325 4.317c.426 -1.756 2.924 -1.756 3.35 0a1.724 1.724 0 0 0 2.573 1.066c1.543 -.94 3.31 .826 2.37 2.37a1.724 1.724 0 0 0 1.065 2.572c1.756 .426 1.756 2.924 0 3.35a1.724 1.724 0 0 0 -1.066 2.573c.94 1.543 -.826 3.31 -2.37 2.37a1.724 1.724 0 0 0 -2.572 1.065c-.426 1.756 -2.924 1.756 -3.35 0a1.724 1.724 0 0 0 -2.573 -1.066c-1.543 .94 -3.31 -.826 -2.37 -2.37a1.724 1.724 0 0 0 -1.065 -2.572c-1.756 -.426 -1.756 -2.924 0 -3.35a1.724 1.724 0 0 0 1.066 -2.573c-.94 -1.543 .826 -3.31 2.37 -2.37c1 .608 2.296 .07 2.572 -1.065z" /><path d="M9 12a3 3 0 1 0 6 0a3 3 0 0 0 -6 0" /></svg>- Settings+ <span class="menu-item-label">Settings</span></a></li>@endif@@ -328,12 +328,12 @@@if (isInstanceAdmin() || session('impersonating'))<li><a title="Admin" class="menu-item" href="/admin" {{ wireNavigate() }}>- <svg class="text-pink-500 icon" viewBox="0 0 256 256"+ <svg class="text-pink-500 menu-item-icon" viewBox="0 0 256 256"xmlns="http://www.w3.org/2000/svg"><path fill="currentColor"d="M177.62 159.6a52 52 0 0 1-34 34a12.2 12.2 0 0 1-3.6.55a12 12 0 0 1-3.6-23.45a28 28 0 0 0 18.32-18.32a12 12 0 0 1 22.9 7.2ZM220 144a92 92 0 0 1-184 0c0-28.81 11.27-58.18 33.48-87.28a12 12 0 0 1 17.9-1.33l19.69 19.11L127 19.89a12 12 0 0 1 18.94-5.12C168.2 33.25 220 82.85 220 144m-24 0c0-41.71-30.61-78.39-52.52-99.29l-20.21 55.4a12 12 0 0 1-19.63 4.5L80.71 82.36C67 103.38 60 124.06 60 144a68 68 0 0 0 136 0" /></svg>- Admin+ <span class="menu-item-label">Admin</span></a></li>@endif@@ -350,7 +350,7 @@<a title="Onboarding"class="{{ request()->is('onboarding*') ? 'menu-item-active menu-item' : 'menu-item' }}"href="{{ route('onboarding') }}">- <svg class="icon" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">+ <svg class="menu-item-icon" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor"d="M224 128a8 8 0 0 1-8 8h-88a8 8 0 0 1 0-16h88a8 8 0 0 1 8 8m-96-56h88a8 8 0 0 0 0-16h-88a8 8 0 0 0 0 16m88 112h-88a8 8 0 0 0 0 16h88a8 8 0 0 0 0-16M82.34 42.34L56 68.69L45.66 58.34a8 8 0 0 0-11.32 11.32l16 16a8 8 0 0 0 11.32 0l32-32a8 8 0 0 0-11.32-11.32m0 64L56 132.69l-10.34-10.35a8 8 0 0 0-11.32 11.32l16 16a8 8 0 0 0 11.32 0l32-32a8 8 0 0 0-11.32-11.32m0 64L56 196.69l-10.34-10.35a8 8 0 0 0-11.32 11.32l16 16a8 8 0 0 0 11.32 0l32-32a8 8 0 0 0-11.32-11.32" /></svg>@@ -360,7 +360,7 @@<li><a title="Sponsor us" class="menu-item" href="https://coolify.io/sponsorships"target="_blank">- <svg class="text-pink-500 icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">+ <svg class="text-pink-500 menu-item-icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="currentColor" stroke-linecap="round"stroke-linejoin="round" stroke-width="2"><path d="M19.5 12.572L12 20l-7.5-7.428A5 5 0 1 1 12 6.006a5 5 0 1 1 7.5 6.572" />@@ -368,7 +368,7 @@d="M12 6L8.707 9.293a1 1 0 0 0 0 1.414l.543.543c.69.69 1.81.69 2.5 0l1-1a3.182 3.182 0 0 1 4.5 0l2.25 2.25m-7 3l2 2M15 13l2 2" /></g></svg>- Sponsor us+ <span class="menu-item-label">Sponsor us</span></a></li>@endif@@ -380,11 +380,11 @@<x-slot:content><div title="Send us feedback or get help!" class="cursor-pointer menu-item"wire:click="help">- <svg class="icon" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">+ <svg class="menu-item-icon" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor"d="M140 180a12 12 0 1 1-12-12a12 12 0 0 1 12 12M128 72c-22.06 0-40 16.15-40 36v4a8 8 0 0 0 16 0v-4c0-11 10.77-20 24-20s24 9 24 20s-10.77 20-24 20a8 8 0 0 0-8 8v8a8 8 0 0 0 16 0v-.72c18.24-3.35 32-17.9 32-35.28c0-19.85-17.94-36-40-36m104 56A104 104 0 1 1 128 24a104.11 104.11 0 0 1 104 104m-16 0a88 88 0 1 0-88 88a88.1 88.1 0 0 0 88-88" /></svg>- Feedback+ <span class="menu-item-label">Feedback</span></div></x-slot:content><livewire:help />@@ -394,11 +394,11 @@<form action="/logout" method="POST">@csrf<button title="Logout" type="submit" class="gap-2 mb-6 menu-item">- <svg class="icon mr-1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">+ <svg class="menu-item-icon mr-1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor"d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2a9.985 9.985 0 0 1 8 4h-2.71a8 8 0 1 0 .001 12h2.71A9.985 9.985 0 0 1 12 22m7-6v-3h-8v-2h8V8l5 4z" /></svg>- Logout+ <span>Logout</span></button></form></li>diff --git a/resources/views/components/server/sidebar-proxy.blade.php b/resources/views/components/server/sidebar-proxy.blade.phpindex 5a76a2f1aa..00bb3ee2a9 100644--- a/resources/views/components/server/sidebar-proxy.blade.php+++ b/resources/views/components/server/sidebar-proxy.blade.php@@ -1,16 +1,16 @@-<div class="flex flex-col items-start gap-2 min-w-fit">- <a class="{{ request()->routeIs('server.proxy') ? 'menu-item menu-item-active' : 'menu-item' }}" {{ wireNavigate() }}+<div class="sub-menu-wrapper">+ <a class="{{ request()->routeIs('server.proxy') ? 'sub-menu-item menu-item-active' : 'sub-menu-item' }}" {{ wireNavigate() }}href="{{ route('server.proxy', $parameters) }}">- <button>Configuration</button>+ <span class="menu-item-label">Configuration</span></a>@if ($server->proxySet())- <a class="{{ request()->routeIs('server.proxy.dynamic-confs') ? 'menu-item menu-item-active' : 'menu-item' }}" {{ wireNavigate() }}+ <a class="{{ request()->routeIs('server.proxy.dynamic-confs') ? 'sub-menu-item menu-item-active' : 'sub-menu-item' }}" {{ wireNavigate() }}href="{{ route('server.proxy.dynamic-confs', $parameters) }}">- <button>Dynamic Configurations</button>+ <span class="menu-item-label">Dynamic Configurations</span></a>- <a class="{{ request()->routeIs('server.proxy.logs') ? 'menu-item menu-item-active' : 'menu-item' }}"+ <a class="{{ request()->routeIs('server.proxy.logs') ? 'sub-menu-item menu-item-active' : 'sub-menu-item' }}"href="{{ route('server.proxy.logs', $parameters) }}">- <button>Logs</button>+ <span class="menu-item-label">Logs</span></a>@endif</div>diff --git a/resources/views/components/server/sidebar-security.blade.php b/resources/views/components/server/sidebar-security.blade.phpindex 995d258cf6..e61d23c89f 100644--- a/resources/views/components/server/sidebar-security.blade.php+++ b/resources/views/components/server/sidebar-security.blade.php@@ -1,10 +1,10 @@-<div class="flex flex-col items-start gap-2 min-w-fit">- <a class="{{ request()->routeIs('server.security.patches') ? 'menu-item menu-item-active' : 'menu-item' }}" {{ wireNavigate() }}+<div class="sub-menu-wrapper">+ <a class="{{ request()->routeIs('server.security.patches') ? 'sub-menu-item menu-item-active' : 'sub-menu-item' }}" {{ wireNavigate() }}href="{{ route('server.security.patches', $parameters) }}">- Server Patching+ <span class="menu-item-label">Server Patching</span></a>- <a class="{{ request()->routeIs('server.security.terminal-access') ? 'menu-item menu-item-active' : 'menu-item' }}"+ <a class="{{ request()->routeIs('server.security.terminal-access') ? 'sub-menu-item menu-item-active' : 'sub-menu-item' }}"href="{{ route('server.security.terminal-access', $parameters) }}">- Terminal Access+ <span class="menu-item-label">Terminal Access</span></a></div>diff --git a/resources/views/components/server/sidebar.blade.php b/resources/views/components/server/sidebar.blade.phpindex e485ec5455..2d7649faba 100644--- a/resources/views/components/server/sidebar.blade.php+++ b/resources/views/components/server/sidebar.blade.php@@ -1,53 +1,51 @@-<div class="flex flex-col items-start gap-2 min-w-fit">- <a class="menu-item {{ $activeMenu === 'general' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.show', ['server_uuid' => $server->uuid]) }}">General</a>+<div class="sub-menu-wrapper">+ <a class="sub-menu-item {{ $activeMenu === 'general' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route('server.show', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">General</span></a>@if ($server->isFunctional())- <a class="menu-item {{ $activeMenu === 'advanced' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.advanced', ['server_uuid' => $server->uuid]) }}">Advanced+ <a class="sub-menu-item {{ $activeMenu === 'advanced' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route('server.advanced', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Advanced</span></a>@endif@if ($server->isFunctional() && !$server->isSwarm() && !$server->isBuildServer())- <a class="menu-item {{ $activeMenu === 'sentinel' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.sentinel', ['server_uuid' => $server->uuid]) }}">Sentinel+ <a class="sub-menu-item {{ $activeMenu === 'sentinel' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route('server.sentinel', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Sentinel</span></a>@endif- <a class="menu-item {{ $activeMenu === 'private-key' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.private-key', ['server_uuid' => $server->uuid]) }}">Private Key+ <a class="sub-menu-item {{ $activeMenu === 'private-key' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route('server.private-key', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Private Key</span></a>@if ($server->hetzner_server_id)- <a class="menu-item {{ $activeMenu === 'cloud-provider-token' ? 'menu-item-active' : '' }}"+ <a class="sub-menu-item {{ $activeMenu === 'cloud-provider-token' ? 'menu-item-active' : '' }}"{{ wireNavigate() }}- href="{{ route('server.cloud-provider-token', ['server_uuid' => $server->uuid]) }}">Hetzner Token+ href="{{ route('server.cloud-provider-token', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Hetzner Token</span></a>@endif- <a class="menu-item {{ $activeMenu === 'ca-certificate' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.ca-certificate', ['server_uuid' => $server->uuid]) }}">CA Certificate+ <a class="sub-menu-item {{ $activeMenu === 'ca-certificate' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route('server.ca-certificate', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">CA Certificate</span></a>@if (!$server->isLocalhost())- <a class="menu-item {{ $activeMenu === 'cloudflare-tunnel' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.cloudflare-tunnel', ['server_uuid' => $server->uuid]) }}">Cloudflare- Tunnel</a>+ <a class="sub-menu-item {{ $activeMenu === 'cloudflare-tunnel' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route('server.cloudflare-tunnel', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Cloudflare Tunnel</span></a>@endif@if ($server->isFunctional())- <a class="menu-item {{ $activeMenu === 'docker-cleanup' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.docker-cleanup', ['server_uuid' => $server->uuid]) }}">Docker Cleanup+ <a class="sub-menu-item {{ $activeMenu === 'docker-cleanup' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route('server.docker-cleanup', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Docker Cleanup</span></a>- <a class="menu-item {{ $activeMenu === 'destinations' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.destinations', ['server_uuid' => $server->uuid]) }}">Destinations+ <a class="sub-menu-item {{ $activeMenu === 'destinations' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route('server.destinations', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Destinations</span></a>- <a class="menu-item {{ $activeMenu === 'log-drains' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.log-drains', ['server_uuid' => $server->uuid]) }}">Log- Drains</a>- <a class="menu-item {{ $activeMenu === 'metrics' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.charts', ['server_uuid' => $server->uuid]) }}">Metrics</a>+ <a class="sub-menu-item {{ $activeMenu === 'log-drains' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route('server.log-drains', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Log Drains</span></a>+ <a class="sub-menu-item {{ $activeMenu === 'metrics' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route('server.charts', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Metrics</span></a>@endif@if (!$server->isBuildServer() && !$server->settings->is_cloudflare_tunnel)- <a class="menu-item {{ $activeMenu === 'swarm' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.swarm', ['server_uuid' => $server->uuid]) }}">Swarm (experimental)+ <a class="sub-menu-item {{ $activeMenu === 'swarm' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route('server.swarm', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Swarm (experimental)</span></a>@endif@if (!$server->isLocalhost())- <a class="menu-item {{ $activeMenu === 'danger' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.delete', ['server_uuid' => $server->uuid]) }}">Danger</a>+ <a class="sub-menu-item {{ $activeMenu === 'danger' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route('server.delete', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Danger</span></a>@endif</div>diff --git a/resources/views/components/service-database/sidebar.blade.php b/resources/views/components/service-database/sidebar.blade.phpindex 728df3a7b6..9d31fc6343 100644--- a/resources/views/components/service-database/sidebar.blade.php+++ b/resources/views/components/service-database/sidebar.blade.php@@ -4,21 +4,24 @@'isImportSupported' => false,])-<div class="flex flex-col items-start gap-2 min-w-fit">- <a class="menu-item"+<div class="sub-menu-wrapper">+ <a class="sub-menu-item"class="{{ request()->routeIs('project.service.configuration') ? 'menu-item-active' : '' }}"{{ wireNavigate() }}href="{{ route('project.service.configuration', [...$parameters, 'stack_service_uuid' => null]) }}">- <button><- Back</button>+ <svg xmlns="http://www.w3.org/2000/svg" class="sub-menu-item-icon" fill="none" viewBox="0 0 24 24" stroke="currentColor">+ <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />+ </svg>+ <span class="menu-item-label">Back</span></a>- <a class="menu-item" wire:current.exact="menu-item-active" {{ wireNavigate() }}- href="{{ route('project.service.index', $parameters) }}">General</a>+ <a class="sub-menu-item" wire:current.exact="menu-item-active" {{ wireNavigate() }}+ href="{{ route('project.service.index', $parameters) }}"><span class="menu-item-label">General</span></a>@if ($serviceDatabase?->isBackupSolutionAvailable() || $serviceDatabase?->is_migrated)- <a class="menu-item" wire:current.exact="menu-item-active" {{ wireNavigate() }}- href="{{ route('project.service.database.backups', $parameters) }}">Backups</a>+ <a class="sub-menu-item" wire:current.exact="menu-item-active" {{ wireNavigate() }}+ href="{{ route('project.service.database.backups', $parameters) }}"><span class="menu-item-label">Backups</span></a>@endif@if ($isImportSupported)- <a class="menu-item" wire:current.exact="menu-item-active"- href="{{ route('project.service.database.import', $parameters) }}">Import Backup</a>+ <a class="sub-menu-item" wire:current.exact="menu-item-active"+ href="{{ route('project.service.database.import', $parameters) }}"><span class="menu-item-label">Import Backup</span></a>@endif</div>diff --git a/resources/views/components/settings/sidebar.blade.php b/resources/views/components/settings/sidebar.blade.phpindex 8b564880c4..0a68a91558 100644--- a/resources/views/components/settings/sidebar.blade.php+++ b/resources/views/components/settings/sidebar.blade.php@@ -1,8 +1,8 @@-<div class="flex flex-col items-start gap-2 min-w-fit">- <a class="menu-item {{ $activeMenu === 'general' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('settings.index') }}">General</a>- <a class="menu-item {{ $activeMenu === 'advanced' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('settings.advanced') }}">Advanced</a>- <a class="menu-item {{ $activeMenu === 'updates' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('settings.updates') }}">Updates</a>+<div class="sub-menu-wrapper">+ <a class="sub-menu-item {{ $activeMenu === 'general' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route('settings.index') }}"><span class="menu-item-label">General</span></a>+ <a class="sub-menu-item {{ $activeMenu === 'advanced' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route('settings.advanced') }}"><span class="menu-item-label">Advanced</span></a>+ <a class="sub-menu-item {{ $activeMenu === 'updates' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route('settings.updates') }}"><span class="menu-item-label">Updates</span></a></div>diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.phpindex 0ef0214583..93d6fe4133 100644--- a/resources/views/layouts/app.blade.php+++ b/resources/views/layouts/app.blade.php@@ -22,7 +22,7 @@<div class="relative z-50 lg:hidden" :class="open ? 'block' : 'hidden'" role="dialog" aria-modal="true"><div class="fixed inset-0 bg-black/80" x-on:click="open = false"></div><div class="fixed inset-y-0 right-0 h-full flex">- <div class="relative flex flex-1 w-full max-w-56 ">+ <div class="relative flex flex-1 w-full max-w-56 min-w-0"><div class="absolute top-0 flex justify-center w-16 pt-5 right-full"><button type="button" class="-m-2.5 p-2.5" x-on:click="open = !open"><span class="sr-only">Close sidebar</span>@@ -33,15 +33,15 @@</button></div>- <div class="flex flex-col pb-2 overflow-y-auto min-w-56 dark:bg-coolgray-100 gap-y-5 scrollbar">+ <div class="flex flex-col pb-2 overflow-y-auto min-w-56 dark:bg-coolgray-100 gap-y-5 scrollbar min-w-0"><x-navbar /></div></div></div></div>- <div class="hidden lg:fixed lg:inset-y-0 lg:z-50 lg:flex lg:w-56 lg:flex-col">- <div class="flex flex-col overflow-y-auto grow gap-y-5 scrollbar">+ <div class="hidden lg:fixed lg:inset-y-0 lg:z-50 lg:flex lg:w-56 lg:flex-col min-w-0">+ <div class="flex flex-col overflow-y-auto grow gap-y-5 scrollbar min-w-0"><x-navbar /></div></div>diff --git a/resources/views/livewire/project/application/configuration.blade.php b/resources/views/livewire/project/application/configuration.blade.phpindex ecafa25c13..34c859a185 100644--- a/resources/views/livewire/project/application/configuration.blade.php+++ b/resources/views/livewire/project/application/configuration.blade.php@@ -7,29 +7,25 @@<livewire:project.application.heading :application="$application" /><div class="flex flex-col h-full gap-8 sm:flex-row">- <div class="flex flex-col items-start gap-2 min-w-fit">- <a class='menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.configuration', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">General</a>- <a class='menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.advanced', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Advanced</a>+ <div class="sub-menu-wrapper">+ <a class='sub-menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.configuration', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">General</span></a>+ <a class='sub-menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.advanced', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">Advanced</span></a>@if ($application->destination->server->isSwarm())- <a class="menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.swarm', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Swarm- Configuration</a>+ <a class="sub-menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.swarm', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">Swarm Configuration</span></a>@endif- <a class='menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.environment-variables', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Environment- Variables</a>- <a class='menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.persistent-storage', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Persistent- Storage</a>+ <a class='sub-menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.environment-variables', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">Environment Variables</span></a>+ <a class='sub-menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.persistent-storage', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">Persistent Storage</span></a>@if ($application->git_based())- <a class='menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.source', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Git- Source</a>+ <a class='sub-menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.source', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">Git Source</span></a>@endif- <a class="menu-item flex items-center gap-2" {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.servers', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Servers+ <a class="sub-menu-item flex items-center gap-2" {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.servers', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">Servers</span>@if ($application->server_status == false)<span title="One or more servers are unreachable or misconfigured."><svg class="w-4 h-4 text-error" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">@@ -46,37 +42,32 @@</span>@endif</a>- <a class="menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.scheduled-tasks.show', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Scheduled- Tasks</a>- <a class="menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.webhooks', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Webhooks</a>+ <a class="sub-menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.scheduled-tasks.show', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">Scheduled Tasks</span></a>+ <a class="sub-menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.webhooks', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">Webhooks</span></a>@if ($application->deploymentType() !== 'deploy_key')- <a class="menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.preview-deployments', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Preview- Deployments</a>+ <a class="sub-menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.preview-deployments', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">Preview Deployments</span></a>@endif@if ($application->build_pack !== 'dockercompose')- <a class="menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.healthcheck', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Healthcheck</a>+ <a class="sub-menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.healthcheck', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">Healthcheck</span></a>@endif- <a class="menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.rollback', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Rollback</a>- <a class="menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.resource-limits', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Resource- Limits</a>- <a class="menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.resource-operations', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Resource- Operations</a>- <a class="menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.metrics', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Metrics</a>- <a class="menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.tags', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Tags</a>- <a class="menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.application.danger', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Danger- Zone</a>+ <a class="sub-menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.rollback', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">Rollback</span></a>+ <a class="sub-menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.resource-limits', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">Resource Limits</span></a>+ <a class="sub-menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.resource-operations', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">Resource Operations</span></a>+ <a class="sub-menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.metrics', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">Metrics</span></a>+ <a class="sub-menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.tags', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">Tags</span></a>+ <a class="sub-menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.application.danger', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"><span class="menu-item-label">Danger Zone</span></a></div>- <div class="w-full">+ <div class="w-full sm:flex-grow">@if ($currentRoute === 'project.application.configuration')<livewire:project.application.general :application="$application" />@elseif ($currentRoute === 'project.application.swarm' && $application->destination->server->isSwarm())diff --git a/resources/views/livewire/project/database/configuration.blade.php b/resources/views/livewire/project/database/configuration.blade.phpindex 7460274e4e..73f87c0e34 100644--- a/resources/views/livewire/project/database/configuration.blade.php+++ b/resources/views/livewire/project/database/configuration.blade.php@@ -6,37 +6,31 @@<livewire:project.shared.configuration-checker :resource="$database" /><livewire:project.database.heading :database="$database" /><div class="flex flex-col h-full gap-8 sm:flex-row">- <div class="flex flex-col items-start gap-2 min-w-fit">- <a class='menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.database.configuration', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}">General</a>- <a class='menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.database.environment-variables', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}">Environment- Variables</a>- <a class='menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.database.servers', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}">Servers</a>- <a class='menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.database.persistent-storage', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}">Persistent- Storage</a>+ <div class="sub-menu-wrapper">+ <a class='sub-menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.database.configuration', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"><span class="menu-item-label">General</span></a>+ <a class='sub-menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.database.environment-variables', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"><span class="menu-item-label">Environment Variables</span></a>+ <a class='sub-menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.database.servers', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"><span class="menu-item-label">Servers</span></a>+ <a class='sub-menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.database.persistent-storage', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"><span class="menu-item-label">Persistent Storage</span></a>@can('update', $database)- <a class='menu-item' wire:current.exact="menu-item-active"- href="{{ route('project.database.import-backup', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}">Import- Backup</a>+ <a class='sub-menu-item' wire:current.exact="menu-item-active"+ href="{{ route('project.database.import-backup', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"><span class="menu-item-label">Import Backup</span></a>@endcan- <a class='menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.database.webhooks', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}">Webhooks</a>- <a class="menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.database.resource-limits', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}">Resource- Limits</a>- <a class="menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.database.resource-operations', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}">Resource- Operations</a>- <a class='menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.database.metrics', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}">Metrics</a>- <a class='menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.database.tags', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}">Tags</a>- <a class='menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"- href="{{ route('project.database.danger', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}">Danger- Zone</a>+ <a class='sub-menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.database.webhooks', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"><span class="menu-item-label">Webhooks</span></a>+ <a class="sub-menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.database.resource-limits', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"><span class="menu-item-label">Resource Limits</span></a>+ <a class="sub-menu-item" {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.database.resource-operations', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"><span class="menu-item-label">Resource Operations</span></a>+ <a class='sub-menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.database.metrics', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"><span class="menu-item-label">Metrics</span></a>+ <a class='sub-menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.database.tags', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"><span class="menu-item-label">Tags</span></a>+ <a class='sub-menu-item' {{ wireNavigate() }} wire:current.exact="menu-item-active"+ href="{{ route('project.database.danger', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"><span class="menu-item-label">Danger Zone</span></a></div><div class="w-full">@if ($currentRoute === 'project.database.configuration')diff --git a/resources/views/livewire/project/service/configuration.blade.php b/resources/views/livewire/project/service/configuration.blade.phpindex 35eadeb334..b5de2a6a34 100644--- a/resources/views/livewire/project/service/configuration.blade.php+++ b/resources/views/livewire/project/service/configuration.blade.php@@ -5,32 +5,27 @@<livewire:project.service.heading :service="$service" :parameters="$parameters" :query="$query" /><div class="flex flex-col h-full gap-8 sm:flex-row">- <div class="flex flex-col items-start gap-2 min-w-fit">- <a class="menu-item sm:min-w-fit" target="_blank" href="{{ $service->documentation() }}">Documentation+ <div class="sub-menu-wrapper">+ <a class="sub-menu-item" target="_blank" href="{{ $service->documentation() }}"><span class="menu-item-label">Documentation</span><x-external-link /></a>- <a class='menu-item' wire:current.exact="menu-item-active" {{ wireNavigate() }}- href="{{ route('project.service.configuration', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}">General</a>- <a class='menu-item' wire:current.exact="menu-item-active" {{ wireNavigate() }}- href="{{ route('project.service.environment-variables', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}">Environment- Variables</a>- <a class='menu-item' wire:current.exact="menu-item-active" {{ wireNavigate() }}- href="{{ route('project.service.storages', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}">Persistent- Storages</a>- <a class='menu-item' wire:current.exact="menu-item-active" {{ wireNavigate() }}- href="{{ route('project.service.scheduled-tasks.show', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}">Scheduled- Tasks</a>- <a class='menu-item' wire:current.exact="menu-item-active" {{ wireNavigate() }}- href="{{ route('project.service.webhooks', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}">Webhooks</a>- <a class='menu-item' wire:current.exact="menu-item-active" {{ wireNavigate() }}- href="{{ route('project.service.resource-operations', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}">Resource- Operations</a>+ <a class='sub-menu-item' wire:current.exact="menu-item-active" {{ wireNavigate() }}+ href="{{ route('project.service.configuration', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}"><span class="menu-item-label">General</span></a>+ <a class='sub-menu-item' wire:current.exact="menu-item-active" {{ wireNavigate() }}+ href="{{ route('project.service.environment-variables', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}"><span class="menu-item-label">Environment Variables</span></a>+ <a class='sub-menu-item' wire:current.exact="menu-item-active" {{ wireNavigate() }}+ href="{{ route('project.service.storages', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}"><span class="menu-item-label">Persistent Storages</span></a>+ <a class='sub-menu-item' wire:current.exact="menu-item-active" {{ wireNavigate() }}+ href="{{ route('project.service.scheduled-tasks.show', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}"><span class="menu-item-label">Scheduled Tasks</span></a>+ <a class='sub-menu-item' wire:current.exact="menu-item-active" {{ wireNavigate() }}+ href="{{ route('project.service.webhooks', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}"><span class="menu-item-label">Webhooks</span></a>+ <a class='sub-menu-item' wire:current.exact="menu-item-active" {{ wireNavigate() }}+ href="{{ route('project.service.resource-operations', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}"><span class="menu-item-label">Resource Operations</span></a>- <a class='menu-item' wire:current.exact="menu-item-active" {{ wireNavigate() }}- href="{{ route('project.service.tags', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}">Tags</a>+ <a class='sub-menu-item' wire:current.exact="menu-item-active" {{ wireNavigate() }}+ href="{{ route('project.service.tags', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}"><span class="menu-item-label">Tags</span></a>- <a class='menu-item' wire:current.exact="menu-item-active" {{ wireNavigate() }}- href="{{ route('project.service.danger', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}">Danger- Zone</a>+ <a class='sub-menu-item' wire:current.exact="menu-item-active" {{ wireNavigate() }}+ href="{{ route('project.service.danger', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}"><span class="menu-item-label">Danger Zone</span></a></div><div class="w-full">@if ($currentRoute === 'project.service.configuration')diff --git a/resources/views/livewire/project/service/index.blade.php b/resources/views/livewire/project/service/index.blade.phpindex ad995676c7..04d30ae609 100644--- a/resources/views/livewire/project/service/index.blade.php+++ b/resources/views/livewire/project/service/index.blade.php@@ -4,14 +4,17 @@@if ($resourceType === 'database')<x-service-database.sidebar :parameters="$parameters" :serviceDatabase="$serviceDatabase" :isImportSupported="$isImportSupported" />@else- <div class="flex flex-col items-start gap-2 min-w-fit">- <a class="menu-item"+ <div class="sub-menu-wrapper">+ <a class="sub-menu-item"class="{{ request()->routeIs('project.service.configuration') ? 'menu-item-active' : '' }}"{{ wireNavigate() }}href="{{ route('project.service.configuration', [...$parameters, 'stack_service_uuid' => null]) }}">- <button><- Back</button>+ <svg xmlns="http://www.w3.org/2000/svg" class="sub-menu-item-icon" fill="none" viewBox="0 0 24 24" stroke="currentColor">+ <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />+ </svg>+ <span class="menu-item-label">Back</span></a>- <a class="menu-item menu-item-active" href="#">General</a>+ <a class="sub-menu-item menu-item-active" href="#"><span class="menu-item-label">General</span></a></div>@endif<div class="w-full">diff --git a/resources/views/livewire/upgrade.blade.php b/resources/views/livewire/upgrade.blade.phpindex c5955e3f61..3e9d0f20bb 100644--- a/resources/views/livewire/upgrade.blade.php+++ b/resources/views/livewire/upgrade.blade.php@@ -416,4 +416,4 @@}}))})-</script>\ No newline at end of file+</script>