minor menu nits

This commit is contained in:
Ruben Fiszel
2023-05-03 12:02:12 +02:00
parent ea4813053b
commit 600d9d0557
2 changed files with 22 additions and 17 deletions
@@ -1,15 +1,9 @@
<script lang="ts">
import { goto } from '$app/navigation'
import { logout } from '$lib/logout'
import {
userStore,
usersWorkspaceStore,
superadmin,
usageStore,
premiumStore
} from '$lib/stores'
import { userStore, usersWorkspaceStore, superadmin, usageStore, premiumStore } from '$lib/stores'
import { classNames, isCloudHosted } from '$lib/utils'
import { faCrown, faHardHat, faUser } from '@fortawesome/free-solid-svg-icons'
import { faCog, faCrown, faHardHat, faSignOut, faUser } from '@fortawesome/free-solid-svg-icons'
import Icon from 'svelte-awesome'
import Menu from '../common/menu/Menu.svelte'
import { SUPERADMIN_SETTINGS_HASH, USER_SETTINGS_HASH } from './settings'
@@ -44,7 +38,6 @@
<div class="divide-y divide-gray-100">
<div class="px-4 py-3" role="none">
<p class="text-sm" role="none">Signed in as</p>
<p class="text-sm font-medium text-gray-900 truncate" role="none">
{$usersWorkspaceStore?.email}
</p>
@@ -64,7 +57,7 @@
role="menuitem"
tabindex="-1"
>
Account settings
<Icon class="pr-0.5" data={faCog} /> Account settings
</a>
</div>
{#if $superadmin}
@@ -75,7 +68,7 @@
role="menuitem"
tabindex="-1"
>
Superadmin settings
<Icon class="pr-0.5" data={faCog} /> Superadmin settings
</a>
</div>
{/if}
@@ -87,7 +80,7 @@
tabindex="-1"
on:click={() => logout()}
>
Sign out
<Icon class="pr-0.5" data={faSignOut} /> Sign out
</button>
</div>
{#if isCloudHosted() && $premiumStore}
@@ -1,9 +1,11 @@
<script lang="ts">
import { switchWorkspace, userWorkspaces, workspaceStore } from '$lib/stores'
import { classNames } from '$lib/utils'
import { Building } from 'lucide-svelte'
import { Building, Cog } from 'lucide-svelte'
import Menu from '../common/menu/Menu.svelte'
import { faCog, faPlus } from '@fortawesome/free-solid-svg-icons'
import { Icon } from 'svelte-awesome'
export let isCollapsed: boolean = false
</script>
@@ -53,11 +55,11 @@
<div class="py-1" role="none">
<a
href="/user/create_workspace"
class="text-gray-700 block px-4 py-2 text-sm hover:bg-gray-100 hover:text-gray-900"
class="text-gray-700 block px-4 py-2 text-xs hover:bg-gray-100 hover:text-gray-900"
role="menuitem"
tabindex="-1"
>
Create new workspace
<Icon data={faPlus} class="-mt-0.5 pr-0.5" /> Workspace
</a>
</div>
<div class="py-1" role="none">
@@ -66,11 +68,21 @@
on:click={() => {
localStorage.removeItem('workspace')
}}
class="text-gray-700 block px-4 py-2 text-sm hover:bg-gray-100 hover:text-gray-900"
class="text-gray-700 block px-4 py-2 text-xs hover:bg-gray-100 hover:text-gray-900"
role="menuitem"
tabindex="-1"
>
See all workspaces & invites
All workspaces & invites
</a>
</div>
<div class="py-1" role="none">
<a
href="/workspace_settings"
class="text-gray-700 block px-4 py-2 text-xs hover:bg-gray-100 hover:text-gray-900"
role="menuitem"
tabindex="-1"
>
<Icon class="pr-0.5" data={faCog} /> Workspace Settings
</a>
</div>
</div>