From 304d66813114b25c5e3e13e79667557de43b6115 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 5 Apr 2023 16:54:07 +0200 Subject: [PATCH 1/7] feat: new id component --- src/lib/components/id.svelte | 45 +++++++++++++++++++ src/lib/components/index.ts | 1 + src/lib/elements/pill.svelte | 29 ------------ src/lib/elements/table/cellHead.svelte | 2 +- src/lib/elements/table/cellText.svelte | 2 + .../auth/teams/team-[team]/header.svelte | 10 +---- .../auth/user-[user]/header.svelte | 10 +---- .../database-[database]/[[page]]/store.ts | 2 +- .../document-[document]/header.svelte | 10 +---- .../collection-[collection]/header.svelte | 10 +---- .../collection-[collection]/table.svelte | 14 +++--- .../databases/database-[database]/grid.svelte | 6 +-- .../database-[database]/header.svelte | 10 +---- .../databases/database-[database]/store.ts | 2 +- .../database-[database]/table.svelte | 16 +++---- .../project-[project]/databases/grid.svelte | 8 +--- .../project-[project]/databases/store.ts | 2 +- .../project-[project]/databases/table.svelte | 18 +++----- .../project-[project]/functions/+page.svelte | 10 ++--- .../function-[function]/+page.svelte | 33 ++++++-------- .../executions/+page.svelte | 23 ++++------ .../function-[function]/header.svelte | 10 +---- .../project-[project]/overview/header.svelte | 10 +---- .../overview/keys/[key]/header.svelte | 10 +---- .../settings/webhooks/[webhook]/header.svelte | 10 +---- .../project-[project]/storage/+page.svelte | 8 ++-- .../bucket-[bucket]/file-[file]/+page.svelte | 7 +-- .../bucket-[bucket]/file-[file]/header.svelte | 10 +---- .../storage/bucket-[bucket]/header.svelte | 10 +---- 29 files changed, 125 insertions(+), 213 deletions(-) create mode 100644 src/lib/components/id.svelte diff --git a/src/lib/components/id.svelte b/src/lib/components/id.svelte new file mode 100644 index 000000000..02faeef48 --- /dev/null +++ b/src/lib/components/id.svelte @@ -0,0 +1,45 @@ + + + +
+ + + +
+ +
+
+
diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index 6927dd1e5..e2434f100 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -53,3 +53,4 @@ export { default as Limit } from './limit.svelte'; export { default as PaginationWithLimit } from './paginationWithLimit.svelte'; export { default as ClickableList } from './clickableList.svelte'; export { default as ClickableListItem } from './clickableListItem.svelte'; +export { default as ID } from './id.svelte'; diff --git a/src/lib/elements/pill.svelte b/src/lib/elements/pill.svelte index ec56b84bb..33b2c7fad 100644 --- a/src/lib/elements/pill.svelte +++ b/src/lib/elements/pill.svelte @@ -9,34 +9,6 @@ export let submit = false; export let external = false; export let href: string = null; - export let trim = false; - - let element: HTMLButtonElement; - - const isOverflowing = (elem: HTMLButtonElement, iterator = 1) => { - let parent = elem?.parentElement; - if ( - trim && - elem && - elem.scrollWidth + 10 > - (parent.clientWidth ? parent.clientWidth : parent.parentElement.clientWidth) - ) - trimText(iterator); - else return; - }; - - function trimText(iterator: number) { - if (iterator > 3) { - element.childNodes[element.childElementCount].textContent = '...'; - } else { - let text = element.childNodes[element.childElementCount].textContent; - element.childNodes[element.childElementCount].textContent = - text.slice(0, 3) + '...' + text.slice(-9 + iterator * 2); - isOverflowing(element, iterator + 1); - } - } - - $: isOverflowing(element); {#if href} @@ -55,7 +27,6 @@ {:else if button} From 594d8801fb9e333701a7c076c4471c84fb29b0e9 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 6 Apr 2023 13:12:19 +0200 Subject: [PATCH 5/7] fix: copy part --- src/lib/components/id.svelte | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/lib/components/id.svelte b/src/lib/components/id.svelte index 43a092625..e73a5b452 100644 --- a/src/lib/components/id.svelte +++ b/src/lib/components/id.svelte @@ -46,22 +46,22 @@ } - -
- - - -
+
+ + + +
+ -
+
- +
From 1c03430c4077959f2b0e72f1e87acf03b3cbef72 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 11 Apr 2023 12:30:38 +0200 Subject: [PATCH 6/7] style: removed unnecessary nullish coalescence --- src/lib/elements/table/cellText.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elements/table/cellText.svelte b/src/lib/elements/table/cellText.svelte index 8b9052c0f..dd594b10e 100644 --- a/src/lib/elements/table/cellText.svelte +++ b/src/lib/elements/table/cellText.svelte @@ -8,7 +8,7 @@
Date: Tue, 11 Apr 2023 15:35:18 +0200 Subject: [PATCH 7/7] fix: rename ID component --- src/lib/components/index.ts | 2 +- .../auth/teams/team-[team]/header.svelte | 4 ++-- .../project-[project]/auth/user-[user]/header.svelte | 4 ++-- .../document-[document]/header.svelte | 4 ++-- .../collection-[collection]/header.svelte | 4 ++-- .../collection-[collection]/table.svelte | 6 +++--- .../databases/database-[database]/grid.svelte | 4 ++-- .../databases/database-[database]/header.svelte | 4 ++-- .../databases/database-[database]/table.svelte | 4 ++-- .../console/project-[project]/databases/grid.svelte | 4 ++-- .../console/project-[project]/databases/table.svelte | 6 +++--- .../console/project-[project]/functions/+page.svelte | 4 ++-- .../functions/function-[function]/+page.svelte | 10 +++++----- .../function-[function]/executions/+page.svelte | 4 ++-- .../functions/function-[function]/header.svelte | 4 ++-- .../console/project-[project]/overview/header.svelte | 4 ++-- .../overview/keys/[key]/header.svelte | 4 ++-- .../settings/webhooks/[webhook]/header.svelte | 4 ++-- .../console/project-[project]/storage/+page.svelte | 4 ++-- .../storage/bucket-[bucket]/file-[file]/+page.svelte | 4 ++-- .../storage/bucket-[bucket]/file-[file]/header.svelte | 4 ++-- .../storage/bucket-[bucket]/header.svelte | 4 ++-- 22 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index e2434f100..f891b8255 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -53,4 +53,4 @@ export { default as Limit } from './limit.svelte'; export { default as PaginationWithLimit } from './paginationWithLimit.svelte'; export { default as ClickableList } from './clickableList.svelte'; export { default as ClickableListItem } from './clickableListItem.svelte'; -export { default as ID } from './id.svelte'; +export { default as Id } from './id.svelte'; diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/header.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/header.svelte index ce773be63..d176f8740 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/header.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/header.svelte @@ -1,6 +1,6 @@ @@ -9,6 +9,6 @@ {$project?.name} - {$project.$id} + {$project.$id} diff --git a/src/routes/console/project-[project]/overview/keys/[key]/header.svelte b/src/routes/console/project-[project]/overview/keys/[key]/header.svelte index 405ea7f39..6de84e28a 100644 --- a/src/routes/console/project-[project]/overview/keys/[key]/header.svelte +++ b/src/routes/console/project-[project]/overview/keys/[key]/header.svelte @@ -1,6 +1,6 @@