From 72fbeb305d898ca03797f259471c4b8da000c28c Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 27 Feb 2023 17:31:51 +0100 Subject: [PATCH 01/54] initial commit --- src/lib/components/index.ts | 1 + src/lib/components/viewSelector.svelte | 31 ++++++++++ .../databases/[[page]]/+page.svelte | 53 ++++++---------- .../databases/[[page]]/gridView.svelte | 38 ++++++++++++ .../databases/[[page]]/tableView.svelte | 60 +++++++++++++++++++ .../project-[project]/databases/create.svelte | 2 +- .../database-[database]/create.svelte | 2 +- 7 files changed, 150 insertions(+), 37 deletions(-) create mode 100644 src/lib/components/viewSelector.svelte create mode 100644 src/routes/console/project-[project]/databases/[[page]]/gridView.svelte create mode 100644 src/routes/console/project-[project]/databases/[[page]]/tableView.svelte diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index 54b2251a5..fe4fdeec1 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -46,3 +46,4 @@ export { default as EventModal } from './eventModal.svelte'; export { default as Status } from './status.svelte'; export { default as Heading } from './heading.svelte'; export { default as Output } from './output.svelte'; +export { default as ViewSelector } from './viewSelector.svelte'; diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte new file mode 100644 index 000000000..ad3c449f0 --- /dev/null +++ b/src/lib/components/viewSelector.svelte @@ -0,0 +1,31 @@ + + + + + + + + + + diff --git a/src/routes/console/project-[project]/databases/[[page]]/+page.svelte b/src/routes/console/project-[project]/databases/[[page]]/+page.svelte index a879b8678..ecfca50f7 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/databases/[[page]]/+page.svelte @@ -2,18 +2,19 @@ import { page } from '$app/stores'; import { goto } from '$app/navigation'; import { Button } from '$lib/elements/forms'; - import { Empty, Copy, GridItem1, CardContainer, Heading, Pagination } from '$lib/components'; - import { Pill } from '$lib/elements'; + import { Empty, Heading, ViewSelector } from '$lib/components'; import { Container } from '$lib/layout'; import { base } from '$app/paths'; import Create from '../create.svelte'; import type { Models } from '@aw-labs/appwrite-console'; import type { PageData } from './$types'; - import { CARD_LIMIT } from '$lib/constants'; + import GridView from './gridView.svelte'; + import TableView from './tableView.svelte'; export let data: PageData; let showCreate = false; + let view = 'grid'; const project = $page.params.project; async function handleCreate(event: CustomEvent) { @@ -23,43 +24,25 @@ -
+
Databases - +
+ test + + +
{#if data.databases.total} - (showCreate = true)} - event="database"> - {#each data.databases.databases as database} - - - {database.name} - - - Database ID - - - {/each} - -

Create a new database

-
-
- -
-

Total results: {data.databases.total}

- -
+ {#if view === 'list'} + + {:else} + + {/if} {:else} + import { base } from '$app/paths'; + import { page } from '$app/stores'; + import { CardContainer, Copy, GridItem1, Pagination } from '$lib/components'; + import { CARD_LIMIT } from '$lib/constants'; + import { Pill } from '$lib/elements'; + import type { PageData } from './$types'; + + export let data: PageData; + export let showCreate = false; + + const project = $page.params.project; + + + (showCreate = true)} event="database"> + {#each data.databases.databases as database} + + + {database.name} + + + Database ID + + + {/each} + +

Create a new database

+
+
+ +
+

Total results: {data.databases.total}

+ +
diff --git a/src/routes/console/project-[project]/databases/[[page]]/tableView.svelte b/src/routes/console/project-[project]/databases/[[page]]/tableView.svelte new file mode 100644 index 000000000..21e85ab84 --- /dev/null +++ b/src/routes/console/project-[project]/databases/[[page]]/tableView.svelte @@ -0,0 +1,60 @@ + + + + + Collection ID + Name + Updated At + Created At + + + {#each data.databases.databases as database} + + + + + + + + + {database.name} + + + {toLocaleDateTime(database.$updatedAt)} + + + {toLocaleDateTime(database.$createdAt)} + + + {/each} + + + +
+

Total results: {data.databases.total}

+ +
diff --git a/src/routes/console/project-[project]/databases/create.svelte b/src/routes/console/project-[project]/databases/create.svelte index 237ed836a..c348543c4 100644 --- a/src/routes/console/project-[project]/databases/create.svelte +++ b/src/routes/console/project-[project]/databases/create.svelte @@ -14,7 +14,7 @@ let name = ''; let id: string = null; - let showCustomId = false; + let showCustomId = true; const create = async () => { try { 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 32c4bfa2c..8059d89fb 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/create.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/create.svelte @@ -17,7 +17,7 @@ let name = ''; let id: string = null; - let showCustomId = false; + let showCustomId = true; const create = async () => { try { From 3ffa758f415ad40e5e1db6ba27bc917db32118dc Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 28 Feb 2023 17:40:48 +0100 Subject: [PATCH 02/54] feat: collection grid view, caching --- src/lib/components/viewSelector.svelte | 13 ++-- src/lib/stores/layout.ts | 11 +++ .../databases/[[page]]/+page.svelte | 13 ++-- .../databases/[[page]]/+page.ts | 11 ++- .../databases/[[page]]/gridView.svelte | 2 +- .../databases/[[page]]/tableView.svelte | 11 +-- .../database-[database]/[[page]]/+page.svelte | 68 +++++++------------ .../database-[database]/[[page]]/+page.ts | 10 ++- .../[[page]]/gridView.svelte | 50 ++++++++++++++ .../[[page]]/tableView.svelte | 64 +++++++++++++++++ 10 files changed, 190 insertions(+), 63 deletions(-) create mode 100644 src/routes/console/project-[project]/databases/database-[database]/[[page]]/gridView.svelte create mode 100644 src/routes/console/project-[project]/databases/database-[database]/[[page]]/tableView.svelte diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte index ad3c449f0..12addcbef 100644 --- a/src/lib/components/viewSelector.svelte +++ b/src/lib/components/viewSelector.svelte @@ -1,8 +1,7 @@ @@ -19,12 +18,18 @@
  • -
  • -
  • diff --git a/src/lib/stores/layout.ts b/src/lib/stores/layout.ts index 44f46a608..c5a29c544 100644 --- a/src/lib/stores/layout.ts +++ b/src/lib/stores/layout.ts @@ -1,5 +1,6 @@ import { writable, readable } from 'svelte/store'; import type { SvelteComponent } from 'svelte'; +import { browser } from '$app/environment'; export type Tab = { href: string; @@ -11,6 +12,8 @@ export type Breadcrumb = { title: string; }; +export type View = 'list' | 'grid'; + export type updateLayoutArguments = { header?: typeof SvelteComponent; breadcrumb?: typeof SvelteComponent; @@ -26,3 +29,11 @@ export function updateLayout(args: updateLayoutArguments) { export const pageLimit = readable(12); // default page limit export const cardLimit = readable(6); // default card limit + +export const preferredView = writable( + browser ? (sessionStorage.getItem('prefferedView') as View) : 'grid' +); + +if (browser) { + preferredView.subscribe((u) => sessionStorage.setItem('prefferedView', u ?? 'grid')); +} diff --git a/src/routes/console/project-[project]/databases/[[page]]/+page.svelte b/src/routes/console/project-[project]/databases/[[page]]/+page.svelte index ecfca50f7..cbac19e44 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 @@ @@ -28,7 +33,7 @@ Databases
    - test + test
    {#if data.databases.total} - {#if view === 'list'} + {#if $preferredView === 'list'} {:else} diff --git a/src/routes/console/project-[project]/databases/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/[[page]]/+page.ts index 47cc014c6..4f4a6ac4e 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/[[page]]/+page.ts @@ -1,18 +1,23 @@ 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, PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; +import { preferredView } from '$lib/stores/layout'; +import { get } from 'svelte/store'; export const load: PageLoad = async ({ params, parent }) => { await parent(); const page = Number(params.page); - const offset = pageToOffset(page, CARD_LIMIT); + const limit = get(preferredView) === 'list' ? PAGE_LIMIT : CARD_LIMIT; + console.log(get(preferredView)); + + const offset = pageToOffset(page, limit); return { offset, databases: await sdkForProject.databases.list([ - Query.limit(CARD_LIMIT), + Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt') ]) diff --git a/src/routes/console/project-[project]/databases/[[page]]/gridView.svelte b/src/routes/console/project-[project]/databases/[[page]]/gridView.svelte index a50ae17e5..41899acc8 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/gridView.svelte +++ b/src/routes/console/project-[project]/databases/[[page]]/gridView.svelte @@ -19,7 +19,7 @@ {database.name} - Database ID + Database ID {/each} diff --git a/src/routes/console/project-[project]/databases/[[page]]/tableView.svelte b/src/routes/console/project-[project]/databases/[[page]]/tableView.svelte index 21e85ab84..24536ba8d 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/tableView.svelte +++ b/src/routes/console/project-[project]/databases/[[page]]/tableView.svelte @@ -1,4 +1,5 @@ - Collection ID + Database ID Name Updated At Created At {#each data.databases.databases as database} - + @@ -45,7 +48,7 @@ {toLocaleDateTime(database.$createdAt)} - + {/each} diff --git a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.svelte index 7a33759a6..ab25da2ff 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.svelte @@ -1,24 +1,23 @@ -
    +
    Collections - +
    + test + + +
    {#if data.collections.total} - (showCreate = true)}> - {#each data.collections.collections as collection} - - {collection.name} - - {#if !collection.enabled} - disabled - {/if} - - - Collection ID - - - {/each} - -

    Create a new collection

    -
    -
    - -
    -

    Total results: {data.collections.total}

    - -
    + {#if $preferredView === 'list'} + + {:else} + + {/if} {:else} { await parent(); const page = Number(params.page); - const offset = pageToOffset(page, CARD_LIMIT); + const offset = pageToOffset(page, limit); return { offset, collections: await sdkForProject.databases.listCollections(params.database, [ - Query.limit(CARD_LIMIT), + Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt') ]) diff --git a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/gridView.svelte b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/gridView.svelte new file mode 100644 index 000000000..6478512a6 --- /dev/null +++ b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/gridView.svelte @@ -0,0 +1,50 @@ + + + (showCreate = true)}> + {#each data.collections.collections as collection} + + {collection.name} + + {#if !collection.enabled} + disabled + {/if} + + + Collection ID + + + {/each} + +

    Create a new collection

    +
    +
    + +
    +

    Total results: {data.collections.total}

    + +
    diff --git a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/tableView.svelte b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/tableView.svelte new file mode 100644 index 000000000..eb3e8a738 --- /dev/null +++ b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/tableView.svelte @@ -0,0 +1,64 @@ + + + + + Collection ID + Name + Updated At + Created At + + + {#each data.collections.collections as collection} + + + + + + + + + {collection.name} + + + {toLocaleDateTime(collection.$updatedAt)} + + + {toLocaleDateTime(collection.$createdAt)} + + + {/each} + + + +
    +

    Total results: {data.collections.total}

    + +
    From e6cbc89cc36d89f13389f6e0ef7d31d6c4f3d2d0 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 1 Mar 2023 13:53:17 +0100 Subject: [PATCH 03/54] feat: table view update --- src/lib/components/cardContainer.svelte | 5 +- src/lib/components/viewSelector.svelte | 28 ++++++++- src/lib/stores/layout.ts | 14 ++++- .../databases/[[page]]/+page.svelte | 16 +++-- .../databases/[[page]]/+page.ts | 7 +-- .../databases/[[page]]/gridView.svelte | 3 +- .../databases/[[page]]/tableView.svelte | 58 ++++++++++++------- .../database-[database]/[[page]]/+page.svelte | 11 +++- .../[[page]]/gridView.svelte | 3 +- .../[[page]]/tableView.svelte | 58 ++++++++++++------- 10 files changed, 139 insertions(+), 64 deletions(-) diff --git a/src/lib/components/cardContainer.svelte b/src/lib/components/cardContainer.svelte index ca00145ba..4445f3202 100644 --- a/src/lib/components/cardContainer.svelte +++ b/src/lib/components/cardContainer.svelte @@ -1,9 +1,8 @@ @@ -13,7 +12,7 @@ style={`--grid-gap:1.5rem; --grid-item-size:${total > 3 ? '22rem' : '25rem'};`}> - {#if total > 3 ? total < limit + offset : total % 2 !== 0} + {#if total > 3 ? total < CARD_LIMIT + offset : total % 2 !== 0} diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte index 12addcbef..8fc229267 100644 --- a/src/lib/components/viewSelector.svelte +++ b/src/lib/components/viewSelector.svelte @@ -1,18 +1,40 @@ - - + + {#each columns as column} + + {/each} diff --git a/src/lib/stores/layout.ts b/src/lib/stores/layout.ts index c5a29c544..74ecd4644 100644 --- a/src/lib/stores/layout.ts +++ b/src/lib/stores/layout.ts @@ -1,6 +1,7 @@ import { writable, readable } from 'svelte/store'; import type { SvelteComponent } from 'svelte'; import { browser } from '$app/environment'; +import { PAGE_LIMIT } from '$lib/constants'; export type Tab = { href: string; @@ -27,13 +28,22 @@ export function updateLayout(args: updateLayoutArguments) { breadcrumb.set(args.breadcrumb ?? null); } -export const pageLimit = readable(12); // default page limit -export const cardLimit = readable(6); // default card limit +export const customPageLimit = writable( + browser + ? sessionStorage.getItem('customPageLimit')?.length + ? parseInt(sessionStorage.getItem('customPageLimit')) + : PAGE_LIMIT + : PAGE_LIMIT +); export const preferredView = writable( browser ? (sessionStorage.getItem('prefferedView') as View) : 'grid' ); if (browser) { + console.log(sessionStorage.getItem('customPageLimit')); preferredView.subscribe((u) => sessionStorage.setItem('prefferedView', u ?? 'grid')); + customPageLimit.subscribe((u) => + sessionStorage.setItem('customPageLimit', u.toString() ?? PAGE_LIMIT.toString()) + ); } diff --git a/src/routes/console/project-[project]/databases/[[page]]/+page.svelte b/src/routes/console/project-[project]/databases/[[page]]/+page.svelte index cbac19e44..b84eadaa0 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/databases/[[page]]/+page.svelte @@ -14,16 +14,24 @@ import { Dependencies } from '$lib/constants'; export let data: PageData; + const project = $page.params.project; let showCreate = false; - const project = $page.params.project; + let columns = [ + { id: '$id', name: 'Database ID', show: true, width: 50 }, + { id: 'name', name: 'Name', show: true, width: 120 }, + { id: '$createdAt', name: 'Created', show: true, width: 120 }, + { id: '$updatedAt', name: 'Updated', show: true, width: 120 } + ]; async function handleCreate(event: CustomEvent) { showCreate = false; await goto(`${base}/console/project-${project}/databases/database-${event.detail.$id}`); } - $: preferredView.subscribe(() => { + $: preferredView.subscribe((n) => { + console.log(n); + invalidate(Dependencies.DATABASE); invalidate(Dependencies.COLLECTION); }); @@ -33,7 +41,7 @@ Databases
    - test +
    - {#if $collection?.attributes?.length} - {#if data.documents.total} - - - Document ID - {#each columns as column} - {column.title} - {/each} - - - {#each data.documents.documents as document} - - - - - - + {#if data.documents.total} + + + Document ID + {#each columns as column} + {column.title} + {/each} + + + {#each data.documents.documents as document} + + + + + + + + {#each columns as column} + {@const formatted = formatColumn(document[column.key])} + +
    + {formatted.value} +
    - {#each columns as column} - {@const formatted = formatColumn(document[column.key])} - -
    - {formatted.value} -
    -
    - {/each} -
    - {/each} -
    -
    + {/each} +
    + {/each} +
    +
    -
    -

    Total results: {data.documents.total}

    - -
    - {:else} - - {/if} +
    +

    Total results: {data.documents.total}

    + +
    {:else} (showCreateAttribute = true)} /> + href="https://appwrite.io/docs/databases#create-documents" + target="document" + on:click={openWizard} /> {/if} - - diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte index 4235e4f03..d84d742f4 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte @@ -18,22 +18,54 @@ import Delete from './deleteAttribute.svelte'; import Overview from './overview.svelte'; + let showCreateDropdown = false; let showDropdown = []; + let selectedOption: string = null; let selectedAttribute: Attributes = null; let showCreate = false; let showDelete = false; let showOverview = false; let showCreateIndex = false; + + const attributesList = [ + { name: 'String', icon: 'text' }, + { name: 'Integer', icon: 'hashtag' }, + { name: 'Float', icon: 'hashtag' }, + { name: 'Boolean', icon: 'toggle' }, + { name: 'Datetime', icon: 'calendar' }, + { name: 'Email', icon: 'mail' }, + { name: 'IP', icon: 'location-marker' }, + { name: 'URL', icon: 'link' }, + { name: 'Enum', icon: 'list' }, + { name: 'Relationship', icon: 'relationship' } + ];
    Attributes - + + + + {#each attributesList as attribute} + { + selectedOption = attribute.name; + showCreateDropdown = false; + showCreate = true; + }}> + {attribute.name} + + {/each} + +
    {#if $attributes.length} @@ -122,7 +154,7 @@ {/if}
    - + diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte index 28c889133..502dba89b 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte @@ -1,7 +1,7 @@ + + + + + + + Indicate whether this is a required attribute + + + Indicate whether this attribute should act as an array + diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts index c8faf10e9..d276c4cfe 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts @@ -10,18 +10,19 @@ import String, { submitString } from './string.svelte'; import Url, { submitUrl } from './url.svelte'; import Datetime, { submitDatetime } from './datetime.svelte'; import type { Attributes } from '../store'; +import Relationship, { submitRelationship } from './relationship.svelte'; export type Option = { name: string; component: typeof SvelteComponent; - type: 'string' | 'integer' | 'double' | 'boolean' | 'datetime'; + type: 'string' | 'integer' | 'double' | 'boolean' | 'datetime' | 'relationship'; func: ( databaseId: string, collectionId: string, key: string, data: Partial ) => Promise; - format?: 'email' | 'ip' | 'url' | 'enum'; + format?: 'email' | 'ip' | 'url' | 'enum' | 'relationship'; }; export const options: Option[] = [ @@ -82,6 +83,13 @@ export const options: Option[] = [ type: 'string', format: 'enum', func: submitEnum + }, + { + name: 'Relationship', + component: Relationship, + type: 'relationship', + format: 'relationship', + func: submitRelationship } ]; From f7b4a3c367b88d415d6167b1a33a7988e8094f17 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 1 Mar 2023 15:09:54 +0100 Subject: [PATCH 06/54] refactor: modal icon --- src/lib/components/modal.svelte | 15 +++++++++++---- src/lib/layout/wizardExitModal.svelte | 2 +- src/routes/console/account/delete.svelte | 2 +- .../deleteMember.svelte | 2 +- .../deleteOrganization.svelte | 2 +- .../teams/team-[team]/deleteMembership.svelte | 2 +- .../auth/teams/team-[team]/deleteTeam.svelte | 2 +- .../auth/user-[user]/deleteAllSessions.svelte | 2 +- .../auth/user-[user]/deleteMembership.svelte | 2 +- .../auth/user-[user]/deleteSession.svelte | 2 +- .../auth/user-[user]/deleteUser.svelte | 2 +- .../attributes/deleteAttribute.svelte | 2 +- .../document-[document]/delete.svelte | 2 +- .../collection-[collection]/indexes/+page.svelte | 1 - .../indexes/deleteIndex.svelte | 2 +- .../settings/deleteCollection.svelte | 2 +- .../databases/database-[database]/delete.svelte | 2 +- .../functions/function-[function]/delete.svelte | 2 +- .../function-[function]/settings/delete.svelte | 2 +- .../overview/keys/[key]/delete.svelte | 2 +- .../overview/platforms/[platform]/delete.svelte | 2 +- .../settings/deleteProject.svelte | 2 +- .../settings/domains/delete.svelte | 2 +- .../settings/webhooks/[webhook]/delete.svelte | 2 +- .../storage/bucket-[bucket]/deleteBucket.svelte | 2 +- .../storage/bucket-[bucket]/deleteFile.svelte | 2 +- .../bucket-[bucket]/file-[file]/deleteFile.svelte | 2 +- 27 files changed, 36 insertions(+), 30 deletions(-) diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte index 8e38955ab..afbc40b37 100644 --- a/src/lib/components/modal.svelte +++ b/src/lib/components/modal.svelte @@ -5,7 +5,9 @@ export let show = false; export let size: 'small' | 'big' = null; - export let warning = false; + // export let WASD = false; + export let icon: string = null; + export let state: 'success' | 'warning' | 'error' | 'info' = null; export let error: string = null; export let closable = true; @@ -80,9 +82,14 @@
    -{:else} - 2 + {#if !isOneWay} +
    + + +
    +
    +
    + {/if} + + + + + {$collection.name} -> {selectedCol.name} + +

    + {$collection.name} has {data.relation === 'one' ? 'one' : 'many'} + {selectedCol.name} +

    {/if} From 75866c69d88838bd186fedfd115c42ff13344197 Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 2 Mar 2023 17:43:42 +0100 Subject: [PATCH 09/54] feat: add view to userprefs --- src/lib/components/viewSelector.svelte | 46 ++++++++++--------- src/lib/stores/layout.ts | 6 --- src/lib/stores/user.ts | 33 ++++++++++++- .../databases/[[page]]/+page.svelte | 13 ++---- .../databases/[[page]]/+page.ts | 5 +- .../database-[database]/[[page]]/+page.svelte | 11 ++--- .../database-[database]/[[page]]/+page.ts | 4 +- 7 files changed, 68 insertions(+), 50 deletions(-) diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte index 8fc229267..7d36eb296 100644 --- a/src/lib/components/viewSelector.svelte +++ b/src/lib/components/viewSelector.svelte @@ -1,7 +1,7 @@ - - - - {#each columns as column} - - {/each} - - +{#if $prefs?.preferredView === 'list'} + + + + {#each columns as column} + + {/each} + + +{/if}
    • diff --git a/src/lib/stores/layout.ts b/src/lib/stores/layout.ts index b6319f9a7..56b5f9a59 100644 --- a/src/lib/stores/layout.ts +++ b/src/lib/stores/layout.ts @@ -36,13 +36,7 @@ export const customPageLimit = writable( : PAGE_LIMIT ); -export const preferredView = writable( - browser ? (sessionStorage.getItem('prefferedView') as View) : 'grid' -); - if (browser) { - console.log(sessionStorage.getItem('customPageLimit')); - preferredView.subscribe((u) => sessionStorage.setItem('prefferedView', u ?? 'grid')); customPageLimit.subscribe((u) => sessionStorage.setItem('customPageLimit', u.toString() ?? PAGE_LIMIT.toString()) ); diff --git a/src/lib/stores/user.ts b/src/lib/stores/user.ts index 07b5c404b..c5da6bcaf 100644 --- a/src/lib/stores/user.ts +++ b/src/lib/stores/user.ts @@ -1,8 +1,39 @@ import { page } from '$app/stores'; -import { derived } from 'svelte/store'; +import { derived, get } from 'svelte/store'; import type { Models } from '@aw-labs/appwrite-console'; +import { sdkForConsole } from './sdk'; +import { cachedStore } from '$lib/helpers/cache'; +import { browser } from '$app/environment'; export const user = derived( page, ($page) => $page.data.account as Models.Account> ); + +export const prefs = cachedStore< + Models.Preferences, + { + load: () => Promise; + updatePrefs: (prefs: Models.Preferences) => Promise; + } +>('prefs', (store) => ({ + load: async () => { + const prefs = await sdkForConsole.account.getPrefs(); + store.set(prefs); + }, + updatePrefs: async (prefs: Models.Preferences) => { + await sdkForConsole.account.updatePrefs(prefs); + store.set(prefs); + } +})); + +if (browser) { + if (!get(prefs)) { + await prefs.load(); + if (!get(prefs)?.preferredView) { + prefs.updatePrefs({ + preferredView: 'grid' + }); + } + } +} diff --git a/src/routes/console/project-[project]/databases/[[page]]/+page.svelte b/src/routes/console/project-[project]/databases/[[page]]/+page.svelte index b84eadaa0..843caa351 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 @@ @@ -51,7 +44,7 @@
{#if data.databases.total} - {#if $preferredView === 'list'} + {#if $prefs?.preferredView === 'list'} {:else} diff --git a/src/routes/console/project-[project]/databases/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/[[page]]/+page.ts index db5077b8d..5626884b7 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/[[page]]/+page.ts @@ -3,13 +3,14 @@ import { sdkForProject } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -import { customPageLimit, preferredView } from '$lib/stores/layout'; +import { customPageLimit } from '$lib/stores/layout'; import { get } from 'svelte/store'; +import { prefs } from '$lib/stores/user'; export const load: PageLoad = async ({ params, parent }) => { await parent(); const page = Number(params.page); - const limit = get(preferredView) === 'list' ? get(customPageLimit) : CARD_LIMIT; + const limit = get(prefs)?.prefferedView === 'list' ? get(customPageLimit) : CARD_LIMIT; const offset = pageToOffset(page, limit); diff --git a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.svelte index 7a770c279..2de61e9c7 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.svelte @@ -1,6 +1,6 @@ @@ -53,7 +48,7 @@ {#if data.collections.total} - {#if $preferredView === 'list'} + {#if $prefs?.preferredView === 'list'} {:else} diff --git a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts index 773873eb4..cc0a16a03 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts @@ -3,10 +3,10 @@ import { sdkForProject } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT, PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -import { preferredView } from '$lib/stores/layout'; import { get } from 'svelte/store'; +import { prefs } from '$lib/stores/user'; -const limit = get(preferredView) === 'list' ? PAGE_LIMIT : CARD_LIMIT; +const limit = get(prefs)?.prefferedView === 'list' ? PAGE_LIMIT : CARD_LIMIT; export const load: PageLoad = async ({ params, parent }) => { await parent(); From 24bab9b93863b6efc02ee730b3f8aec01c2cb48d Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 3 Mar 2023 12:56:30 +0100 Subject: [PATCH 10/54] fix: pagination --- package-lock.json | 8 +- package.json | 2 +- src/lib/components/customId.svelte | 3 +- src/lib/components/viewSelector.svelte | 46 +++--- src/lib/constants.ts | 1 + src/lib/elements/forms/inputId.svelte | 2 +- src/lib/layout/navigation.svelte | 142 +++++++++--------- .../databases/[[page]]/+page.svelte | 9 +- .../databases/[[page]]/+page.ts | 9 +- .../project-[project]/databases/create.svelte | 2 +- .../database-[database]/create.svelte | 2 +- 11 files changed, 125 insertions(+), 101 deletions(-) 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} - + 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} From 42c1b4602ece06ce1cdceb62435bde14ee9f9992 Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 3 Mar 2023 17:39:51 +0100 Subject: [PATCH 11/54] feat: new components, custom pagination --- src/lib/components/customPagination.svelte | 51 ++++++++++++ src/lib/components/index.ts | 2 + src/lib/components/labelCard.svelte | 23 ++++++ src/lib/elements/forms/index.ts | 1 + src/lib/elements/forms/inputSelect.svelte | 3 +- .../elements/forms/inputSelectSearch.svelte | 79 +++++++++++++++++++ .../databases/[[page]]/+page.ts | 1 - .../databases/[[page]]/gridView.svelte | 25 +++--- .../databases/[[page]]/tableView.svelte | 19 +++-- .../attributes/relationship.svelte | 45 ++++++++++- .../createAttribute.svelte | 4 +- 11 files changed, 224 insertions(+), 29 deletions(-) create mode 100644 src/lib/components/customPagination.svelte create mode 100644 src/lib/components/labelCard.svelte create mode 100644 src/lib/elements/forms/inputSelectSearch.svelte diff --git a/src/lib/components/customPagination.svelte b/src/lib/components/customPagination.svelte new file mode 100644 index 000000000..c40109ef4 --- /dev/null +++ b/src/lib/components/customPagination.svelte @@ -0,0 +1,51 @@ + + +
+
+ +

{name} per page. Total results: {total}

+
+ +
diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index fe4fdeec1..4d67decd7 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -47,3 +47,5 @@ export { default as Status } from './status.svelte'; export { default as Heading } from './heading.svelte'; export { default as Output } from './output.svelte'; export { default as ViewSelector } from './viewSelector.svelte'; +export { default as LabelCard } from './labelCard.svelte'; +export { default as CustomPagination } from './customPagination.svelte'; diff --git a/src/lib/components/labelCard.svelte b/src/lib/components/labelCard.svelte new file mode 100644 index 000000000..7bdc44456 --- /dev/null +++ b/src/lib/components/labelCard.svelte @@ -0,0 +1,23 @@ + + + diff --git a/src/lib/elements/forms/index.ts b/src/lib/elements/forms/index.ts index d60fb5442..a471fde9f 100644 --- a/src/lib/elements/forms/index.ts +++ b/src/lib/elements/forms/index.ts @@ -15,6 +15,7 @@ export { default as InputDateTime } from './inputDateTime.svelte'; export { default as InputSearch } from './inputSearch.svelte'; export { default as InputRadio } from './inputRadio.svelte'; export { default as InputSelect } from './inputSelect.svelte'; +export { default as InputSelectSearch } from './inputSelectSearch.svelte'; export { default as InputCheckbox } from './inputCheckbox.svelte'; export { default as InputChoice } from './inputChoice.svelte'; export { default as InputPhone } from './inputPhone.svelte'; diff --git a/src/lib/elements/forms/inputSelect.svelte b/src/lib/elements/forms/inputSelect.svelte index 5bfe2220a..ff49b8f80 100644 --- a/src/lib/elements/forms/inputSelect.svelte +++ b/src/lib/elements/forms/inputSelect.svelte @@ -52,7 +52,8 @@ {disabled} bind:this={element} bind:value - on:invalid={handleInvalid}> + on:invalid={handleInvalid} + on:change> {#if placeholder} {/if} diff --git a/src/lib/elements/forms/inputSelectSearch.svelte b/src/lib/elements/forms/inputSelectSearch.svelte new file mode 100644 index 000000000..35de7c850 --- /dev/null +++ b/src/lib/elements/forms/inputSelectSearch.svelte @@ -0,0 +1,79 @@ + + + + +
    + + + +
    +
    + (hasFocus = true)} + on:input={valueChange} /> +
    +
    +
    +
+ + + {#each options as option} +
  • + +
  • + {/each} +
    +
    diff --git a/src/routes/console/project-[project]/databases/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/[[page]]/+page.ts index 355964aa3..3d3138661 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/[[page]]/+page.ts @@ -15,7 +15,6 @@ export const load: PageLoad = async ({ params, parent, depends }) => { 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/[[page]]/gridView.svelte b/src/routes/console/project-[project]/databases/[[page]]/gridView.svelte index 6ae3cbba7..20df70338 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/gridView.svelte +++ b/src/routes/console/project-[project]/databases/[[page]]/gridView.svelte @@ -1,8 +1,8 @@ - (showCreate = true)} event="database"> + (showCreate = true)} + event="database"> {#each data.databases.databases as database} {database.name} @@ -27,11 +31,10 @@
    -
    -

    Total results: {data.databases.total}

    - -
    + diff --git a/src/routes/console/project-[project]/databases/[[page]]/tableView.svelte b/src/routes/console/project-[project]/databases/[[page]]/tableView.svelte index 2b7828d19..ee4a988d1 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/tableView.svelte +++ b/src/routes/console/project-[project]/databases/[[page]]/tableView.svelte @@ -1,8 +1,8 @@ +
      +
    • + + One-way relationship + One Relation attribute within this collection + +
    • +
    • + + Two-way relationship + One Relation attribute within this collection and another within the related collection + +
    • +
    + + ({ value: n.$id, label: n.name }))} /> Date: Mon, 6 Mar 2023 13:29:55 +0100 Subject: [PATCH 12/54] feat: columns save in prefs, select search component --- src/lib/components/drop.svelte | 10 ++- src/lib/components/dropList.svelte | 12 +-- src/lib/components/labelCard.svelte | 6 +- src/lib/components/viewSelector.svelte | 28 ++++++- .../elements/forms/inputSelectSearch.svelte | 79 ++++++++++--------- src/lib/layout/header.svelte | 2 +- .../databases/[[page]]/+page.svelte | 9 +-- .../databases/[[page]]/tableView.svelte | 13 ++- .../database-[database]/[[page]]/+page.svelte | 10 +-- .../[[page]]/tableView.svelte | 19 +++-- .../attributes/relationship.svelte | 30 +++---- 11 files changed, 123 insertions(+), 95 deletions(-) diff --git a/src/lib/components/drop.svelte b/src/lib/components/drop.svelte index 84486418a..8e71f7730 100644 --- a/src/lib/components/drop.svelte +++ b/src/lib/components/drop.svelte @@ -10,6 +10,8 @@ export let noArrow = false; export let placement: Placement = 'bottom-start'; export let childStart = false; + export let noStyle = false; + export let fullWidth = false; let element: HTMLDivElement; let tooltip: HTMLDivElement; @@ -67,11 +69,15 @@ -
    +
    -
    +
    {#if show} diff --git a/src/lib/components/dropList.svelte b/src/lib/components/dropList.svelte index 5d87c92f8..fd7ab7f1b 100644 --- a/src/lib/components/dropList.svelte +++ b/src/lib/components/dropList.svelte @@ -7,18 +7,20 @@ export let scrollable = false; export let childStart = false; export let noArrow = false; + export let noStyle = false; export let width: string = null; + export let fullWidth = false; + export let position: 'relative' | 'static' = 'relative'; - +
    {#if $$slots.list}
    -