From 226ad401d0dfc0e63d741d74dde6cd29ebdc2707 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Thu, 9 Mar 2023 11:45:47 +0000 Subject: [PATCH] refactor: change pages secondSideNav appears --- src/routes/console/project-[project]/databases/+layout.ts | 3 +-- .../databases/database-[database]/+layout.ts | 8 +------- .../collection-[collection]/+layout.ts | 8 +++++++- .../{ => collection-[collection]}/secondSideNav.svelte | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) rename src/routes/console/project-[project]/databases/database-[database]/{ => collection-[collection]}/secondSideNav.svelte (96%) diff --git a/src/routes/console/project-[project]/databases/+layout.ts b/src/routes/console/project-[project]/databases/+layout.ts index 79e5d6120..3d20f603d 100644 --- a/src/routes/console/project-[project]/databases/+layout.ts +++ b/src/routes/console/project-[project]/databases/+layout.ts @@ -1,7 +1,6 @@ +import type { LayoutLoad } from './$types'; import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; -import SecondSideNav from './database-[database]/secondSideNav.svelte'; -import type { LayoutLoad } from './$types'; export const load: LayoutLoad = async ({ parent }) => { await parent(); diff --git a/src/routes/console/project-[project]/databases/database-[database]/+layout.ts b/src/routes/console/project-[project]/databases/database-[database]/+layout.ts index 21435baa2..2a5b41b3c 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/+layout.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/+layout.ts @@ -1,7 +1,5 @@ import { Dependencies } from '$lib/constants'; import { sdkForProject } from '$lib/stores/sdk'; -import SecondSideNav from '$routes/console/project-[project]/databases/database-[database]/secondSideNav.svelte'; -import { Query } from '@aw-labs/appwrite-console'; import { error } from '@sveltejs/kit'; import type { LayoutLoad } from './$types'; import Breadcrumbs from './breadcrumbs.svelte'; @@ -15,11 +13,7 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - database: await sdkForProject.databases.get(params.database), - secondSideNav: SecondSideNav, - allCollections: await sdkForProject.databases.listCollections(params.database, [ - Query.orderDesc('$createdAt') - ]) + database: await sdkForProject.databases.get(params.database) }; } catch (e) { throw error(e.code, e.message); diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts index 4cff24c2d..df4099c07 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts @@ -4,6 +4,8 @@ import type { LayoutLoad } from './$types'; import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; import { error } from '@sveltejs/kit'; +import SecondSideNav from './secondSideNav.svelte'; +import { Query } from '@aw-labs/appwrite-console'; export const load: LayoutLoad = async ({ params, parent, depends }) => { depends(Dependencies.COLLECTION); @@ -16,7 +18,11 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { collection: await sdkForProject.databases.getCollection( params.database, params.collection - ) + ), + secondSideNav: SecondSideNav, + allCollections: await sdkForProject.databases.listCollections(params.database, [ + Query.orderDesc('$createdAt') + ]) }; } catch (e) { throw error(e.code, e.message); diff --git a/src/routes/console/project-[project]/databases/database-[database]/secondSideNav.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/secondSideNav.svelte similarity index 96% rename from src/routes/console/project-[project]/databases/database-[database]/secondSideNav.svelte rename to src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/secondSideNav.svelte index 12c71ccec..77c1a9223 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/secondSideNav.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/secondSideNav.svelte @@ -1,7 +1,7 @@