From 869cfdb7965cc7413a476d9979e7f37cfdc2fd21 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 7 Nov 2022 11:51:37 +0100 Subject: [PATCH 1/7] fix: domains creation --- .../settings/domains/wizard/cnameTable.svelte | 8 +++--- .../settings/domains/wizard/step1.svelte | 26 ++++--------------- .../settings/domains/wizard/step4.svelte | 2 +- .../settings/domains/wizard/store.ts | 3 ++- .../domains/wizard/verificationBox.svelte | 2 +- 5 files changed, 13 insertions(+), 28 deletions(-) diff --git a/src/routes/console/project-[project]/settings/domains/wizard/cnameTable.svelte b/src/routes/console/project-[project]/settings/domains/wizard/cnameTable.svelte index 0c5d31bf0..316fef1b5 100644 --- a/src/routes/console/project-[project]/settings/domains/wizard/cnameTable.svelte +++ b/src/routes/console/project-[project]/settings/domains/wizard/cnameTable.svelte @@ -11,9 +11,9 @@ } from '$lib/elements/table'; import { domain } from './store'; - const parts = $domain.name.split('.'); + const parts = $domain.domain.split('.'); const registerable = [parts[parts.length - 2], parts[parts.length - 1]].join('.'); - const cnameValue = $domain.name.replace('.' + registerable, ''); + const cnameValue = $domain.domain.replace('.' + registerable, ''); @@ -28,8 +28,8 @@ {cnameValue}
- {$domain.name} - + {$domain.domain} +
diff --git a/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte b/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte index 21ee2bbf6..76b46f176 100644 --- a/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte +++ b/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte @@ -5,30 +5,14 @@ import { project } from '../../../store'; import { domain } from './store'; - // Handle if user goes back to this step to update - // the domain name after creating the domain - const originalDomainName = $domain.name; - const originalDomainId = $domain.id; - const unsubscribe = domain.subscribe((newDomain) => { - if ( - originalDomainName !== '' && - newDomain.id !== '' && - newDomain.name !== originalDomainName - ) { - $domain.id = ''; - } - }); - const projectId = $project.$id; const createDomain = async () => { - unsubscribe(); - if ($domain.name !== originalDomainName && originalDomainId) { - await sdkForConsole.projects.deleteDomain(projectId, originalDomainId); + if ($domain.$id) { + await sdkForConsole.projects.deleteDomain(projectId, $domain.$id); } - if ($domain.id == '') { - await sdkForConsole.projects.createDomain(projectId, $domain.name); - } + const { $id } = await sdkForConsole.projects.createDomain(projectId, $domain.domain); + $domain.$id = $id; }; @@ -45,7 +29,7 @@ placeholder="appwrite.example.com" autocomplete={false} required - bind:value={$domain.name} /> + bind:value={$domain.domain} />

diff --git a/src/routes/console/project-[project]/settings/domains/wizard/step4.svelte b/src/routes/console/project-[project]/settings/domains/wizard/step4.svelte index eed0a85ac..0ab0e0b98 100644 --- a/src/routes/console/project-[project]/settings/domains/wizard/step4.svelte +++ b/src/routes/console/project-[project]/settings/domains/wizard/step4.svelte @@ -11,7 +11,7 @@ let certificate = false; const checkCertificate = () => { setTimeout(async () => { - const result = await sdkForConsole.projects.getDomain(projectId, $domain.id); + const result = await sdkForConsole.projects.getDomain(projectId, $domain.$id); if (!result.certificateId) { checkCertificate(); return; diff --git a/src/routes/console/project-[project]/settings/domains/wizard/store.ts b/src/routes/console/project-[project]/settings/domains/wizard/store.ts index 88d0de932..9c2d5d8d4 100644 --- a/src/routes/console/project-[project]/settings/domains/wizard/store.ts +++ b/src/routes/console/project-[project]/settings/domains/wizard/store.ts @@ -1,3 +1,4 @@ +import type { Models } from '@aw-labs/appwrite-console'; import { writable } from 'svelte/store'; -export const domain = writable<{ id: string; name: string }>({ id: '', name: '' }); +export const domain = writable>({ $id: '', domain: '' }); diff --git a/src/routes/console/project-[project]/settings/domains/wizard/verificationBox.svelte b/src/routes/console/project-[project]/settings/domains/wizard/verificationBox.svelte index 0cd32690f..e82bccf69 100644 --- a/src/routes/console/project-[project]/settings/domains/wizard/verificationBox.svelte +++ b/src/routes/console/project-[project]/settings/domains/wizard/verificationBox.svelte @@ -15,7 +15,7 @@ try { const result = await sdkForConsole.projects.updateDomainVerification( projectId, - $domain.id + $domain.$id ); isVerified = result.verification; } catch (error) { From d6c61393a3e6ddcfc0536653d7411bc71a86cbfa Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 7 Nov 2022 11:52:21 +0100 Subject: [PATCH 2/7] fix: check --- .../console/project-[project]/settings/domains/create.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/settings/domains/create.svelte b/src/routes/console/project-[project]/settings/domains/create.svelte index ddf0eb338..5279752ae 100644 --- a/src/routes/console/project-[project]/settings/domains/create.svelte +++ b/src/routes/console/project-[project]/settings/domains/create.svelte @@ -12,7 +12,7 @@ import { Dependencies } from '$lib/constants'; onDestroy(() => { - domain.set({ id: '', name: '' }); + domain.set({ $id: '', domain: '' }); }); beforeNavigate(() => { From 75c812a83f765788ec339c012f69f3e53ef56f5f Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 7 Nov 2022 16:38:41 +0100 Subject: [PATCH 3/7] feat: add missing icons --- static/icons/dark/color/authentik.svg | 9 +++++++++ static/icons/dark/color/autodesk.svg | 3 +++ static/icons/dark/color/dailymotion.svg | 4 ++++ static/icons/dark/color/disqus.svg | 3 +++ static/icons/dark/color/etsy.svg | 3 +++ static/icons/dark/color/podio.svg | 3 +++ static/icons/dark/grayscale/authentik.svg | 14 ++++++++++++++ static/icons/dark/grayscale/autodesk.svg | 3 +++ static/icons/dark/grayscale/dailymotion.svg | 3 +++ static/icons/dark/grayscale/disqus.svg | 3 +++ static/icons/dark/grayscale/etsy.svg | 3 +++ static/icons/dark/grayscale/podio.svg | 3 +++ static/icons/light/color/authentik.svg | 9 +++++++++ static/icons/light/color/autodesk.svg | 3 +++ static/icons/light/color/dailymotion.svg | 4 ++++ static/icons/light/color/disqus.svg | 3 +++ static/icons/light/color/etsy.svg | 3 +++ static/icons/light/color/podio.svg | 3 +++ static/icons/light/grayscale/authentik.svg | 14 ++++++++++++++ static/icons/light/grayscale/autodesk.svg | 3 +++ static/icons/light/grayscale/dailymotion.svg | 3 +++ static/icons/light/grayscale/disqus.svg | 3 +++ static/icons/light/grayscale/etsy.svg | 3 +++ static/icons/light/grayscale/podio.svg | 3 +++ 24 files changed, 108 insertions(+) create mode 100644 static/icons/dark/color/authentik.svg create mode 100644 static/icons/dark/color/autodesk.svg create mode 100644 static/icons/dark/color/dailymotion.svg create mode 100644 static/icons/dark/color/disqus.svg create mode 100644 static/icons/dark/color/etsy.svg create mode 100644 static/icons/dark/color/podio.svg create mode 100644 static/icons/dark/grayscale/authentik.svg create mode 100644 static/icons/dark/grayscale/autodesk.svg create mode 100644 static/icons/dark/grayscale/dailymotion.svg create mode 100644 static/icons/dark/grayscale/disqus.svg create mode 100644 static/icons/dark/grayscale/etsy.svg create mode 100644 static/icons/dark/grayscale/podio.svg create mode 100644 static/icons/light/color/authentik.svg create mode 100644 static/icons/light/color/autodesk.svg create mode 100644 static/icons/light/color/dailymotion.svg create mode 100644 static/icons/light/color/disqus.svg create mode 100644 static/icons/light/color/etsy.svg create mode 100644 static/icons/light/color/podio.svg create mode 100644 static/icons/light/grayscale/authentik.svg create mode 100644 static/icons/light/grayscale/autodesk.svg create mode 100644 static/icons/light/grayscale/dailymotion.svg create mode 100644 static/icons/light/grayscale/disqus.svg create mode 100644 static/icons/light/grayscale/etsy.svg create mode 100644 static/icons/light/grayscale/podio.svg diff --git a/static/icons/dark/color/authentik.svg b/static/icons/dark/color/authentik.svg new file mode 100644 index 000000000..678087401 --- /dev/null +++ b/static/icons/dark/color/authentik.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/static/icons/dark/color/autodesk.svg b/static/icons/dark/color/autodesk.svg new file mode 100644 index 000000000..258d0aab1 --- /dev/null +++ b/static/icons/dark/color/autodesk.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/dark/color/dailymotion.svg b/static/icons/dark/color/dailymotion.svg new file mode 100644 index 000000000..8c1dc06de --- /dev/null +++ b/static/icons/dark/color/dailymotion.svg @@ -0,0 +1,4 @@ + + + + diff --git a/static/icons/dark/color/disqus.svg b/static/icons/dark/color/disqus.svg new file mode 100644 index 000000000..9bc6580ec --- /dev/null +++ b/static/icons/dark/color/disqus.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/dark/color/etsy.svg b/static/icons/dark/color/etsy.svg new file mode 100644 index 000000000..51b17c92f --- /dev/null +++ b/static/icons/dark/color/etsy.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/dark/color/podio.svg b/static/icons/dark/color/podio.svg new file mode 100644 index 000000000..7fa97731a --- /dev/null +++ b/static/icons/dark/color/podio.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/dark/grayscale/authentik.svg b/static/icons/dark/grayscale/authentik.svg new file mode 100644 index 000000000..7b80aed5c --- /dev/null +++ b/static/icons/dark/grayscale/authentik.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/static/icons/dark/grayscale/autodesk.svg b/static/icons/dark/grayscale/autodesk.svg new file mode 100644 index 000000000..87747e823 --- /dev/null +++ b/static/icons/dark/grayscale/autodesk.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/dark/grayscale/dailymotion.svg b/static/icons/dark/grayscale/dailymotion.svg new file mode 100644 index 000000000..714372951 --- /dev/null +++ b/static/icons/dark/grayscale/dailymotion.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/dark/grayscale/disqus.svg b/static/icons/dark/grayscale/disqus.svg new file mode 100644 index 000000000..684aeaf7d --- /dev/null +++ b/static/icons/dark/grayscale/disqus.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/dark/grayscale/etsy.svg b/static/icons/dark/grayscale/etsy.svg new file mode 100644 index 000000000..04790eb9b --- /dev/null +++ b/static/icons/dark/grayscale/etsy.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/dark/grayscale/podio.svg b/static/icons/dark/grayscale/podio.svg new file mode 100644 index 000000000..0b671537c --- /dev/null +++ b/static/icons/dark/grayscale/podio.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/light/color/authentik.svg b/static/icons/light/color/authentik.svg new file mode 100644 index 000000000..10ed35ac8 --- /dev/null +++ b/static/icons/light/color/authentik.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/static/icons/light/color/autodesk.svg b/static/icons/light/color/autodesk.svg new file mode 100644 index 000000000..0e7a9712e --- /dev/null +++ b/static/icons/light/color/autodesk.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/light/color/dailymotion.svg b/static/icons/light/color/dailymotion.svg new file mode 100644 index 000000000..f09b5225f --- /dev/null +++ b/static/icons/light/color/dailymotion.svg @@ -0,0 +1,4 @@ + + + + diff --git a/static/icons/light/color/disqus.svg b/static/icons/light/color/disqus.svg new file mode 100644 index 000000000..9bc6580ec --- /dev/null +++ b/static/icons/light/color/disqus.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/light/color/etsy.svg b/static/icons/light/color/etsy.svg new file mode 100644 index 000000000..51b17c92f --- /dev/null +++ b/static/icons/light/color/etsy.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/light/color/podio.svg b/static/icons/light/color/podio.svg new file mode 100644 index 000000000..7fa97731a --- /dev/null +++ b/static/icons/light/color/podio.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/light/grayscale/authentik.svg b/static/icons/light/grayscale/authentik.svg new file mode 100644 index 000000000..d632ea53d --- /dev/null +++ b/static/icons/light/grayscale/authentik.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/static/icons/light/grayscale/autodesk.svg b/static/icons/light/grayscale/autodesk.svg new file mode 100644 index 000000000..14571dfc6 --- /dev/null +++ b/static/icons/light/grayscale/autodesk.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/light/grayscale/dailymotion.svg b/static/icons/light/grayscale/dailymotion.svg new file mode 100644 index 000000000..f7b0097a4 --- /dev/null +++ b/static/icons/light/grayscale/dailymotion.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/light/grayscale/disqus.svg b/static/icons/light/grayscale/disqus.svg new file mode 100644 index 000000000..6eb14791f --- /dev/null +++ b/static/icons/light/grayscale/disqus.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/light/grayscale/etsy.svg b/static/icons/light/grayscale/etsy.svg new file mode 100644 index 000000000..b02003758 --- /dev/null +++ b/static/icons/light/grayscale/etsy.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/light/grayscale/podio.svg b/static/icons/light/grayscale/podio.svg new file mode 100644 index 000000000..d73189161 --- /dev/null +++ b/static/icons/light/grayscale/podio.svg @@ -0,0 +1,3 @@ + + + From 8fd5d614c53a0795494651e9403b548c803efce7 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 7 Nov 2022 16:39:47 +0100 Subject: [PATCH 4/7] feat: add view api button --- .../console/project-[project]/settings/+page.svelte | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/routes/console/project-[project]/settings/+page.svelte b/src/routes/console/project-[project]/settings/+page.svelte index d5abcb2fc..35f2bdaac 100644 --- a/src/routes/console/project-[project]/settings/+page.svelte +++ b/src/routes/console/project-[project]/settings/+page.svelte @@ -11,10 +11,13 @@ import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import Delete from './deleteProject.svelte'; + import { base } from '$app/paths'; + import { page } from '$app/stores'; let name: string = null; let showDelete = false; const endpoint = sdkForConsole.client.config.endpoint; + const projectId = $page.params.project; onMount(async () => { name ??= $project.name; @@ -100,6 +103,11 @@ + + + From 7317f86a19f9b400852240fff31c10c7a0605f84 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 7 Nov 2022 16:42:02 +0100 Subject: [PATCH 5/7] fix: empty --- src/lib/components/emptySearch.svelte | 12 +++--- src/lib/layout/activity.svelte | 30 ++++++-------- .../authentication/user-[user]/+page.svelte | 1 - .../executions/[[page]]/+page.svelte | 40 +++++++++++++------ 4 files changed, 47 insertions(+), 36 deletions(-) diff --git a/src/lib/components/emptySearch.svelte b/src/lib/components/emptySearch.svelte index b0c54e647..3fd3d89bc 100644 --- a/src/lib/components/emptySearch.svelte +++ b/src/lib/components/emptySearch.svelte @@ -9,11 +9,13 @@

- {#if $app.themeInUse === 'dark'} - - {:else} - - {/if} +
diff --git a/src/lib/layout/activity.svelte b/src/lib/layout/activity.svelte index 802a63a76..a74108a63 100644 --- a/src/lib/layout/activity.svelte +++ b/src/lib/layout/activity.svelte @@ -1,6 +1,5 @@