From 5ccbaa1accf8369ac7f2910bbf85e2ddc910357a Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 4 Sep 2025 17:01:47 +0530 Subject: [PATCH 1/6] fix: title and mobile navbar. --- src/lib/layout/coverTitle.svelte | 3 ++- .../databases/database-[database]/header.svelte | 7 ++++++- .../databases/database-[database]/subNavigation.svelte | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/lib/layout/coverTitle.svelte b/src/lib/layout/coverTitle.svelte index 2cfecde2a..9ba5c8f33 100644 --- a/src/lib/layout/coverTitle.svelte +++ b/src/lib/layout/coverTitle.svelte @@ -6,7 +6,7 @@ export let href: string = null; - + {#if href} @@ -14,6 +14,7 @@ {/if} + - + {$database.name} + + {$database.$id} 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..5d0ca41bd 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 @@ -41,6 +41,8 @@ sortedTables?.find((table: Models.Table) => table.$id === tableId) ); + const isMainDatabaseScreen = $derived(page.route.id.endsWith('database-[database]')) + async function loadTables() { tables = await sdk.forProject(region, project).tablesDB.listTables({ databaseId: databaseId, @@ -134,7 +136,7 @@ -{:else if data?.database?.name} +{:else if data?.database?.name && !isMainDatabaseScreen}
From 6ce88051f0ef330a64619ca5cb4a4700640fff42 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 4 Sep 2025 18:09:04 +0530 Subject: [PATCH 2/6] update: database actions on tables sub-navigation. --- src/lib/layout/coverTitle.svelte | 9 ++- .../database-[database]/header.svelte | 4 +- .../databases/database-[database]/store.ts | 7 ++ .../database-[database]/subNavigation.svelte | 71 +++++++++++++++---- 4 files changed, 73 insertions(+), 18 deletions(-) diff --git a/src/lib/layout/coverTitle.svelte b/src/lib/layout/coverTitle.svelte index 9ba5c8f33..ffd49fcae 100644 --- a/src/lib/layout/coverTitle.svelte +++ b/src/lib/layout/coverTitle.svelte @@ -6,7 +6,14 @@ export let href: string = null; - + {#if href} diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte index 4fc818b3b..591955ca3 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte @@ -42,10 +42,8 @@ + href={`${base}/project-${page.params.region}-${projectId}/databases`}> {$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..e81a5e686 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 { IconCloudUpload, IconCog, IconTable } 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: IconTable }, + { 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 5d0ca41bd..6b104e4eb 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 @@ @@ -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/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte index 9bcdf0366..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 @@ -78,9 +78,11 @@
+ class="database-name u-flex u-cross-center body-text-2 u-gap-8 is-not-mobile u-padding-block-8 u-padding-inline-start-4"> + {data.database?.name}
@@ -145,33 +147,33 @@
- {#if isTablesScreen} - -
- -
+ +
+ +
-
    - {#each databaseSubNavigationItems as action} - {@const isSelected = page.url.pathname.endsWith(action.href)} - {@const href = `${base}/project-${region}-${project}/databases/database-${databaseId}/${action.href}`} +
      + {#each databaseSubNavigationItems as action} + {@const href = `${base}/project-${region}-${project}/databases/database-${databaseId}/${action.href}`} - -
    • - - - {action.title} - -
    • -
      - {/each} -
    - - {/if} + +
  • + + + {action.title} + +
  • +
    + {/each} +
+
{:else if data?.database?.name && !isMainDatabaseScreen} @@ -234,9 +236,15 @@ } .database-name { - margin-block-end: 8px; + margin-block-end: 4px; font-size: var(--font-size-sm); color: var(--fgcolor-neutral-secondary); + + &:hover { + color: var(--fgcolor-neutral-primary); + border-radius: var(--border-radius-s, 6px); + background: var(--bgcolor-neutral-secondary); + } } .table-content { @@ -272,7 +280,7 @@ .drop-list { flex: 1; - gap: 8px; + gap: 4px; padding-left: 4px; position: relative; font-size: var(--font-size-sm); @@ -311,10 +319,9 @@ margin-inline-start: 0.5rem; } - li:hover, - .is-selected { + li:hover { color: var(--fgcolor-neutral-primary); - border-radius: var(--border-radius-xs, 4px); + border-radius: var(--border-radius-s, 6px); background: var(--bgcolor-neutral-secondary); } @@ -327,6 +334,12 @@ } } + .is-selected { + color: var(--fgcolor-neutral-primary); + border-radius: var(--border-radius-s, 6px); + background: var(--bgcolor-neutral-secondary); + } + :global(.sub-navigation header) { top: 48px !important; } From fb0341916ee1c367f619a74b8bf1fde3554e8a34 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 5 Sep 2025 12:32:15 +0530 Subject: [PATCH 6/6] update: misc. --- src/lib/layout/coverTitle.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/layout/coverTitle.svelte b/src/lib/layout/coverTitle.svelte index 590967e98..45d2f6d24 100644 --- a/src/lib/layout/coverTitle.svelte +++ b/src/lib/layout/coverTitle.svelte @@ -3,7 +3,7 @@ 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;