diff --git a/src/lib/components/breadcrumbs.svelte b/src/lib/components/breadcrumbs.svelte index 8af5feba8..bfe2d839b 100644 --- a/src/lib/components/breadcrumbs.svelte +++ b/src/lib/components/breadcrumbs.svelte @@ -25,6 +25,7 @@ import { type Models, Query } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; import { page } from '$app/state'; + import { BillingPlan } from '$lib/constants'; type Organization = { name: string; @@ -226,6 +227,9 @@ $: if (shouldReloadProjects) { projectsBottomSheet = createProjectsBottomSheet(selectedOrg); } + + let badgeType: 'success' | undefined; + $: badgeType = $currentPlan && $currentPlan.name !== BillingPlan.FREE ? 'success' : undefined; @@ -240,10 +244,13 @@ use:melt={$triggerOrganizations} aria-label="Open organizations tab"> {selectedOrg?.name ?? 'Organization'} - {#if correctPlanName}{/if} + type={badgeType} + content={correctPlanName} /> + {/if} {:else} @@ -257,7 +264,11 @@ {selectedOrg?.name ?? 'Organization'} + > {/if} @@ -476,6 +487,7 @@ border-radius: var(--border-radius-S, 8px); background: var(--overlay-neutral-hover, rgba(25, 25, 28, 0.03)); } + .trigger { display: inline-flex; align-items: center; diff --git a/src/lib/components/sidebar.svelte b/src/lib/components/sidebar.svelte index 48339a6d4..325eb8bd5 100644 --- a/src/lib/components/sidebar.svelte +++ b/src/lib/components/sidebar.svelte @@ -591,6 +591,7 @@ @media (min-width: 1024px) { width: 166px; } + .info { position: absolute; display: flex; diff --git a/src/lib/layout/animatedTitle.svelte b/src/lib/layout/animatedTitle.svelte index 867c3212b..c9ee71741 100644 --- a/src/lib/layout/animatedTitle.svelte +++ b/src/lib/layout/animatedTitle.svelte @@ -3,24 +3,32 @@ import { IconChevronLeft } from '@appwrite.io/pink-icons-svelte'; import { Button, Icon, Layout } from '@appwrite.io/pink-svelte'; import type { Snippet } from 'svelte'; + import type { HTMLAttributes } from 'svelte/elements'; let { href = null, collapsed = false, - children + children, + ...restProps }: { href?: string | null; collapsed?: boolean; children: Snippet; - } = $props(); + } & HTMLAttributes = $props(); const buttonSize = $derived(collapsed ? 'xs' : 's'); const currentLineHeight = $derived(collapsed ? '130%' : '140%'); const currentLetterSpacing = $derived(collapsed ? '0' : '-0.144px'); - const currentFontSize = $derived(collapsed ? 'var(--font-size-l)' : 'var(--font-size-xxxl)'); + const currentFontSize = $derived(collapsed ? 'var(--font-size-l)' : 'var(--font-size-xxl)'); - + {#if href && !$isSmallViewport} diff --git a/src/lib/layout/coverTitle.svelte b/src/lib/layout/coverTitle.svelte index 2cfecde2a..45d2f6d24 100644 --- a/src/lib/layout/coverTitle.svelte +++ b/src/lib/layout/coverTitle.svelte @@ -3,10 +3,16 @@ import { IconChevronLeft } from '@appwrite.io/pink-icons-svelte'; import { Typography, Button, Icon, Layout } from '@appwrite.io/pink-svelte'; - export let href: string = null; + export let href: string | null = null; - + {#if href} @@ -14,6 +20,7 @@ {/if} + - + {$database.name} + {$database.$id} diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts index 221122bd4..368b1b30e 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts @@ -2,6 +2,7 @@ import { page } from '$app/stores'; import type { Column } from '$lib/helpers/types'; import type { Models } from '@appwrite.io/console'; import { derived, writable } from 'svelte/store'; +import { IconChartBar, IconCloudUpload, IconCog } from '@appwrite.io/pink-icons-svelte'; export const database = derived(page, ($page) => $page.data.database as Models.Database); export const showCreate = writable(false); @@ -29,3 +30,9 @@ export const customRetainingOptions = [ { label: 'Weeks', value: 7, max: 4 }, { label: 'Months', value: 30, max: 12 } ]; + +export const databaseSubNavigationItems = [ + { title: 'Backups', href: 'backups', icon: IconCloudUpload }, + { title: 'Usage', href: 'usage', icon: IconChartBar }, + { title: 'Settings', href: 'settings', icon: IconCog } +]; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte index 1cc5f7972..8ab8b314e 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte @@ -1,10 +1,18 @@