diff --git a/package-lock.json b/package-lock.json index 21a276c80..e21d7d335 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "dependencies": { "@analytics/google-analytics": "^1.0.5", - "@appwrite.io/pink": "^0.0.4", + "@appwrite.io/pink": "^0.0.6-rc.1", "@aw-labs/appwrite-console": "^13.1.0", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.36.0", @@ -146,9 +146,9 @@ "integrity": "sha512-1Yw7u/COtxx06BfwlI+kVhsa/upKYzmCNrT4c8QDeCY2KMYlnijkUjtHiPU08HxyTIVB5j6d75O0YWVIHwQS8g==" }, "node_modules/@appwrite.io/pink": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.0.4.tgz", - "integrity": "sha512-pCXxBqSikG5PpBb2y84tTRH6cAMUYbROlQN8LuGoY2J+vTWMT+HQ7+RAAwRWU1Dlle4FgOFFCKmqU95g6X2a6g==", + "version": "0.0.6-rc.1", + "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.0.6-rc.1.tgz", + "integrity": "sha512-5HM094Ie/tYHQIz5T2ydN03bO/dbR59lHHP2UPP3lheUsY6DBEZGP6Haqedwt/n8odTdIG5Rtrcq0eS6/+G7BA==", "dependencies": { "@appwrite.io/pink-icons": "*", "normalize.css": "^8.0.1", diff --git a/package.json b/package.json index c468dff23..624490725 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@analytics/google-analytics": "^1.0.5", - "@appwrite.io/pink": "^0.0.4", + "@appwrite.io/pink": "^0.0.6-rc.1", "@aw-labs/appwrite-console": "^13.1.0", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.36.0", diff --git a/src/lib/components/customId.svelte b/src/lib/components/customId.svelte index 9dd9fa0c4..8691d9f15 100644 --- a/src/lib/components/customId.svelte +++ b/src/lib/components/customId.svelte @@ -6,6 +6,7 @@ export let show = false; export let name: string; export let id: string; + export let autofocus = true; $: if (!show) { id = null; @@ -27,7 +28,7 @@
- +
diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte index 7d36eb296..e2e851524 100644 --- a/src/lib/components/viewSelector.svelte +++ b/src/lib/components/viewSelector.svelte @@ -26,7 +26,7 @@ {#each columns as column} @@ -40,23 +40,27 @@ {/if} - +
+ +
diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 0a19c9208..2b3b70125 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -15,6 +15,7 @@ export enum Dependencies { TEAMS = 'dependency:teams', MEMBERSHIPS = 'dependency:memberships', DATABASE = 'dependency:database', + DATABASES = 'dependency:databases', COLLECTION = 'dependency:collection', DOCUMENT = 'dependency:document', DOCUMENTS = 'dependency:documents', diff --git a/src/lib/elements/forms/inputId.svelte b/src/lib/elements/forms/inputId.svelte index b11c7b7a3..3fde5e51b 100644 --- a/src/lib/elements/forms/inputId.svelte +++ b/src/lib/elements/forms/inputId.svelte @@ -3,11 +3,11 @@ import { FormItem } from '.'; export let value = ''; + export let autofocus = true; let element: HTMLInputElement; let icon = 'info'; const pattern = String.raw`^[a-zA-Z0-9][a-zA-Z0-9._-]*$`; - const autofocus = true; onMount(() => { if (element && autofocus) { diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte index f7deb321f..72441bdaf 100644 --- a/src/lib/layout/navigation.svelte +++ b/src/lib/layout/navigation.svelte @@ -9,74 +9,82 @@
{#if project} -
-
- -
-
+
+
+
+ +
+
-
-
- trackEvent('click_menu_settings')} - class:is-selected={$page.url.pathname.startsWith(`${path}/settings`)}> - -
+
+
+ trackEvent('click_menu_settings')} + class:is-selected={$page.url.pathname.startsWith(`${path}/settings`)}> + +
+
{/if}
diff --git a/src/routes/console/project-[project]/databases/[[page]]/+page.svelte b/src/routes/console/project-[project]/databases/[[page]]/+page.svelte index 843caa351..1ef82a863 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/databases/[[page]]/+page.svelte @@ -1,6 +1,6 @@ diff --git a/src/routes/console/project-[project]/databases/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/[[page]]/+page.ts index 5626884b7..355964aa3 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/[[page]]/+page.ts @@ -1,18 +1,21 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdkForProject } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; -import { CARD_LIMIT } from '$lib/constants'; +import { CARD_LIMIT, Dependencies } from '$lib/constants'; import type { PageLoad } from './$types'; import { customPageLimit } from '$lib/stores/layout'; import { get } from 'svelte/store'; import { prefs } from '$lib/stores/user'; -export const load: PageLoad = async ({ params, parent }) => { +export const load: PageLoad = async ({ params, parent, depends }) => { await parent(); + depends(Dependencies.DATABASES); + const page = Number(params.page); - const limit = get(prefs)?.prefferedView === 'list' ? get(customPageLimit) : CARD_LIMIT; + const limit = get(prefs)?.preferredView === 'list' ? get(customPageLimit) : CARD_LIMIT; const offset = pageToOffset(page, limit); + console.log(offset); return { offset, diff --git a/src/routes/console/project-[project]/databases/create.svelte b/src/routes/console/project-[project]/databases/create.svelte index c348543c4..2b062f885 100644 --- a/src/routes/console/project-[project]/databases/create.svelte +++ b/src/routes/console/project-[project]/databases/create.svelte @@ -58,7 +58,7 @@
{:else} - + {/if} diff --git a/src/routes/console/project-[project]/databases/database-[database]/create.svelte b/src/routes/console/project-[project]/databases/database-[database]/create.svelte index 8059d89fb..d14b7896b 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/create.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/create.svelte @@ -65,7 +65,7 @@ {:else} - + {/if}