Merge branch 'next' into tool-tip

This commit is contained in:
Andras Bacsai
2023-01-10 11:29:36 +01:00
committed by GitHub
324 changed files with 21840 additions and 2605 deletions

View File

@@ -75,6 +75,7 @@
$appSession.version = baseSettings.version;
$appSession.whiteLabeled = baseSettings.whiteLabeled;
$appSession.whiteLabeledDetails.icon = baseSettings.whiteLabeledIcon;
$appSession.isARM = baseSettings.isARM;
$appSession.pendingInvitations = pendingInvitations;
@@ -135,6 +136,10 @@
});
}
});
let sidedrawerToggler: HTMLInputElement;
const closeDrawer = () => (sidedrawerToggler.checked = false);
</script>
<svelte:head>
@@ -154,7 +159,7 @@
{/if}
<div class="drawer">
<input id="main-drawer" type="checkbox" class="drawer-toggle" />
<input id="main-drawer" type="checkbox" class="drawer-toggle" bind:this={sidedrawerToggler} />
<div class="drawer-content">
{#if $appSession.userId}
<Tooltip triggeredBy="#dashboard" placement="right" color="bg-pink-500">Dashboard</Tooltip>
@@ -290,6 +295,29 @@
<circle cx="12" cy="12" r="3" />
</svg>
</a>
<a
id="documentation"
sveltekit:prefetch
href="https://docs.coollabs.io/coolify/"
target="_blank"
rel="noopener noreferrer"
class="icons hover:text-info"
>
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
stroke-width="1.5"
stroke="currentColor"
class="w-9 h-9"
>
<path
stroke-linecap="round"
stroke-linejoin="round"
d="M12 6.042A8.967 8.967 0 006 3.75c-1.052 0-2.062.18-3 .512v14.25A8.987 8.987 0 016 18c2.305 0 4.408.867 6 2.292m0-14.25a8.966 8.966 0 016-2.292c1.052 0 2.062.18 3 .512v14.25A8.987 8.987 0 0018 18a8.967 8.967 0 00-6 2.292m0-14.25v14.25"
/>
</svg>
</a>
<!-- svelte-ignore a11y-click-events-have-key-events -->
<div
@@ -368,6 +396,7 @@
sveltekit:prefetch
href="/"
class:bg-pink-500={$page.url.pathname === '/'}
on:click={closeDrawer}
>
<svg
xmlns="http://www.w3.org/2000/svg"
@@ -396,6 +425,7 @@
sveltekit:prefetch
href="/servers"
class:bg-sky-500={$page.url.pathname.startsWith('/servers')}
on:click={closeDrawer}
>
<svg
xmlns="http://www.w3.org/2000/svg"
@@ -421,6 +451,7 @@
class="no-underline icons hover:text-white hover:bg-iam"
href="/iam"
class:bg-iam={$page.url.pathname.startsWith('/iam')}
on:click={closeDrawer}
><svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
@@ -450,6 +481,7 @@
href={$appSession.teamId === '0' ? '/settings/coolify' : '/settings/ssh'}
class:bg-settings={$page.url.pathname.startsWith('/settings')}
class:text-black={$page.url.pathname.startsWith('/settings')}
on:click={closeDrawer}
>
<svg
xmlns="http://www.w3.org/2000/svg"
@@ -470,6 +502,30 @@
Settings
</a>
</li>
<li>
<a
class="no-underline icons hover:text-white hover:bg-info"
href="https://docs.coollabs.io/coolify/"
target="_blank"
rel="noreferrer external"
>
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
stroke-width="1.5"
stroke="currentColor"
class="w-8 h-8"
>
<path
stroke-linecap="round"
stroke-linejoin="round"
d="M12 6.042A8.967 8.967 0 006 3.75c-1.052 0-2.062.18-3 .512v14.25A8.987 8.987 0 016 18c2.305 0 4.408.867 6 2.292m0-14.25a8.966 8.966 0 016-2.292c1.052 0 2.062.18 3 .512v14.25A8.987 8.987 0 0018 18a8.967 8.967 0 00-6 2.292m0-14.25v14.25"
/>
</svg>
Documentation
</a>
</li>
<li class="flex-1 bg-transparent" />
<div class="block lg:hidden">
<UpdateAvailable />