From c0b06a394114cec3b55e2236887161a6510a31a7 Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 6 Oct 2022 17:34:45 +0200 Subject: [PATCH 1/8] feat: create card container, update empty --- src/lib/components/cardContainer.svelte | 20 ++++++++ src/lib/components/empty.svelte | 50 +++++++++++++++---- src/lib/components/index.ts | 1 + .../organization-[organization]/+page.svelte | 17 +++---- 4 files changed, 68 insertions(+), 20 deletions(-) create mode 100644 src/lib/components/cardContainer.svelte diff --git a/src/lib/components/cardContainer.svelte b/src/lib/components/cardContainer.svelte new file mode 100644 index 000000000..8c5931e21 --- /dev/null +++ b/src/lib/components/cardContainer.svelte @@ -0,0 +1,20 @@ + + + diff --git a/src/lib/components/empty.svelte b/src/lib/components/empty.svelte index f15300212..7f8591a71 100644 --- a/src/lib/components/empty.svelte +++ b/src/lib/components/empty.svelte @@ -1,5 +1,6 @@ + +
+
+ {#if $app.themeInUse === 'dark'} + + {:else} + + {/if} + +
+
diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index fb5b8ad12..179fbf1f3 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -13,6 +13,7 @@ export { default as UploadBox } from './uploadBox.svelte'; export { default as List } from './list.svelte'; export { default as ListItem } from './listItem.svelte'; export { default as Empty } from './empty.svelte'; +export { default as EmptySearch } from './emptySearch.svelte'; export { default as DropList } from './dropList.svelte'; export { default as DropListItem } from './dropListItem.svelte'; export { default as DropListLink } from './dropListLink.svelte'; From a866c04bb1b9130c4aeb360ec4381e0293400f3d Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 7 Oct 2022 11:24:38 +0200 Subject: [PATCH 6/8] chore: remove unused search from buckets --- .../project-[project]/storage/+page.svelte | 20 +------------------ .../project-[project]/storage/store.ts | 6 +++--- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/src/routes/console/project-[project]/storage/+page.svelte b/src/routes/console/project-[project]/storage/+page.svelte index 6d227ec23..f1d7f263e 100644 --- a/src/routes/console/project-[project]/storage/+page.svelte +++ b/src/routes/console/project-[project]/storage/+page.svelte @@ -13,7 +13,6 @@ import { cardLimit } from '$lib/stores/layout'; let showCreate = false; - let search = ''; let offset = 0; const project = $page.params.project; @@ -22,8 +21,7 @@ await goto(`${base}/console/project-${project}/storage/bucket/${event.detail.$id}`); }; - $: bucketList.load([Query.limit($cardLimit), Query.offset(offset)], search); - $: if (search) offset = 0; + $: bucketList.load([Query.limit($cardLimit), Query.offset(offset)]); @@ -86,22 +84,6 @@

Total results: {$bucketList.total}

- {:else if search} - -
- Sorry, we couldn’t find ‘{search}’ -
-

There are no buckets that match your search.

-
-
- -
-
- -
-

Total results: {$bucketList?.total}

- -
{:else} (showCreate = true)}>

Add your first bucket to get started

diff --git a/src/routes/console/project-[project]/storage/store.ts b/src/routes/console/project-[project]/storage/store.ts index 64130f4d3..dac5aed69 100644 --- a/src/routes/console/project-[project]/storage/store.ts +++ b/src/routes/console/project-[project]/storage/store.ts @@ -5,12 +5,12 @@ import { cachedStore } from '$lib/helpers/cache'; export const bucketList = cachedStore< Models.BucketList, { - load: (queries: string[], search: string) => Promise; + load: (queries: string[]) => Promise; } >('bucketList', function ({ set }) { return { - load: async (queries, search) => { - const response = await sdkForProject.storage.listBuckets(queries, search); + load: async (queries) => { + const response = await sdkForProject.storage.listBuckets(queries); set(response); } }; From 9a534610263a773c59dd7ec273286548cbfa6a71 Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 7 Oct 2022 11:43:39 +0200 Subject: [PATCH 7/8] feat: remove unused search, implemented empty search --- src/lib/components/emptySearch.svelte | 6 +++++ .../authentication/+page.svelte | 20 +++++--------- .../authentication/teams/+page.svelte | 18 ++++--------- .../teams/[team]/members/+page.svelte | 22 +++++---------- .../database/[database]/+page.svelte | 20 +------------- .../[collection]/indexes/+page.svelte | 27 +++++++++---------- .../databases/database/[database]/store.ts | 10 +++---- .../storage/bucket/[bucket]/+page.svelte | 19 +++++-------- 8 files changed, 46 insertions(+), 96 deletions(-) diff --git a/src/lib/components/emptySearch.svelte b/src/lib/components/emptySearch.svelte index 704c3e689..15f1d52b9 100644 --- a/src/lib/components/emptySearch.svelte +++ b/src/lib/components/emptySearch.svelte @@ -2,6 +2,7 @@ import { app } from '$lib/stores/app'; import Light from '$lib/images/search-light.svg'; import Dark from '$lib/images/search-dark.svg'; + import Pagination from './pagination.svelte';
@@ -14,3 +15,8 @@
+ +
+

Total results: 0

+ +
diff --git a/src/routes/console/project-[project]/authentication/+page.svelte b/src/routes/console/project-[project]/authentication/+page.svelte index 3d1960fea..dfe2707cc 100644 --- a/src/routes/console/project-[project]/authentication/+page.svelte +++ b/src/routes/console/project-[project]/authentication/+page.svelte @@ -1,7 +1,7 @@ @@ -69,22 +67,6 @@

Total results: {$collections.total}

- {:else if search} - -
- Sorry, we couldn’t find ‘{search}’ -
-

There are no collections that match your search.

-
-
- -
-
- -
-

Total results: {$collections?.total}

- -
{:else} (showCreate = true)}>

Create your first collection to get started

diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/indexes/+page.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/indexes/+page.svelte index d538d15f2..3eb349bf2 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/indexes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/indexes/+page.svelte @@ -1,6 +1,13 @@ diff --git a/src/routes/console/project-[project]/authentication/teams/+page.svelte b/src/routes/console/project-[project]/authentication/teams/+page.svelte index b867ee5ed..49cf872a4 100644 --- a/src/routes/console/project-[project]/authentication/teams/+page.svelte +++ b/src/routes/console/project-[project]/authentication/teams/+page.svelte @@ -34,7 +34,7 @@ $: if (search) offset = 0; $: teamsList.load( - [Query.limit($pageLimit), Query.offset(offset), Query.orderDesc('$internalId')], + [Query.limit($pageLimit), Query.offset(offset), Query.orderDesc('$createdAt')], search );