From 85fffc4b5e5486d6749b06b178b7ea4bab4d9524 Mon Sep 17 00:00:00 2001 From: Darshan Date: Sat, 31 May 2025 12:08:31 +0530 Subject: [PATCH 1/6] update: make invalidates non blocking. --- .../overview/platforms/createAndroid.svelte | 6 +-- .../overview/platforms/createApple.svelte | 6 +-- .../overview/platforms/createFlutter.svelte | 6 +-- .../platforms/createReactNative.svelte | 9 ++--- .../overview/platforms/createWeb.svelte | 38 +++++++++---------- 5 files changed, 28 insertions(+), 37 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte index 3c37a0a7e..ac89f191a 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte @@ -57,10 +57,8 @@ const val APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.region, page. trackEvent(Submit.PlatformCreate, { type: 'android' }); - await Promise.all([ - invalidate(Dependencies.PROJECT), - invalidate(Dependencies.PLATFORMS) - ]); + invalidate(Dependencies.PROJECT); + invalidate(Dependencies.PLATFORMS); } catch (error) { trackError(error, Submit.PlatformCreate); addNotification({ diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte index 9c603e342..2ba7bf9a8 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte @@ -68,10 +68,8 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject(page.params.region, page.params.proj trackEvent(Submit.PlatformCreate, { type: platform }); - await Promise.all([ - invalidate(Dependencies.PROJECT), - invalidate(Dependencies.PLATFORMS) - ]); + invalidate(Dependencies.PROJECT); + invalidate(Dependencies.PLATFORMS); } catch (error) { trackError(error, Submit.PlatformCreate); addNotification({ diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte index 311f4ebe5..02db907e1 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte @@ -125,10 +125,8 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.reg type: platform }); - await Promise.all([ - invalidate(Dependencies.PROJECT), - invalidate(Dependencies.PLATFORMS) - ]); + invalidate(Dependencies.PROJECT); + invalidate(Dependencies.PLATFORMS); } catch (error) { trackError(error, Submit.PlatformCreate); addNotification({ diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte index a37b3a5e6..9cf454fd7 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte @@ -28,7 +28,7 @@ import { LabelCard } from '$lib/components'; let showExitModal = false; - export let isPlatformCreated = false; + let isPlatformCreated = false; let isCreatingPlatform = false; let connectionSuccessful = false; const projectId = page.params.project; @@ -94,10 +94,9 @@ const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.region, page.para trackEvent(Submit.PlatformCreate, { type: platform }); - await Promise.all([ - invalidate(Dependencies.PROJECT), - invalidate(Dependencies.PLATFORMS) - ]); + + invalidate(Dependencies.PROJECT); + invalidate(Dependencies.PLATFORMS); } catch (error) { trackError(error, Submit.PlatformCreate); addNotification({ diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte index 1748c3977..bb675c7a9 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte @@ -11,10 +11,9 @@ Fieldset, InlineCode, Card, - Button, Tooltip } from '@appwrite.io/pink-svelte'; - import { Form, InputText } from '$lib/elements/forms'; + import { Button, Form, InputText } from '$lib/elements/forms'; import { IconVue, IconAppwrite, @@ -166,10 +165,8 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p type: platform }); - await Promise.all([ - invalidate(Dependencies.PROJECT), - invalidate(Dependencies.PLATFORMS) - ]); + invalidate(Dependencies.PROJECT); + invalidate(Dependencies.PLATFORMS); } catch (error) { trackError(error, Submit.PlatformCreate); addNotification({ @@ -223,10 +220,10 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p {#if isChangingFramework} - (isChangingFramework = false)}> - Save + Save {/if} @@ -249,8 +246,7 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p Create platform {/if} {:else} @@ -264,12 +260,12 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p {selectedFramework.label} - { isChangingFramework = true; - }}>Change + }}>Change {/if} @@ -338,15 +334,15 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p color="--fgcolor-neutral-primary"> Demo app runs on http://localhost:{selectedFramework.portNumber} - Open {/if} @@ -394,10 +390,12 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p {#if isPlatformCreated} - Go to dashboard + disabled={isCreatingPlatform}>Go to dashboard {/if} From ff2c5f269cb8d7a61b197553f4925aae43563bb7 Mon Sep 17 00:00:00 2001 From: Darshan Date: Sat, 31 May 2025 12:48:11 +0530 Subject: [PATCH 2/6] fix: use correct selector cards to avoid that blatant, unneeded bottom padding/empty-spacing-taking element. --- .../overview/platforms/createApple.svelte | 23 ++++++++----------- .../overview/platforms/createFlutter.svelte | 22 ++++++++---------- .../platforms/createReactNative.svelte | 21 ++++++++--------- 3 files changed, 29 insertions(+), 37 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte index 2ba7bf9a8..94cf1ed30 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte @@ -4,6 +4,7 @@ import { createPlatform } from './wizard/store'; import { Dependencies } from '$lib/constants'; import { + Card as Pink2Card, Code, Layout, Icon, @@ -26,7 +27,6 @@ import { PlatformType } from '@appwrite.io/console'; import { isCloud } from '$lib/system'; import { app } from '$lib/stores/app'; - import { LabelCard } from '$lib/components'; let showExitModal = false; let isPlatformCreated = false; @@ -106,20 +106,17 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject(page.params.region, page.params.proj
- + {#each Object.entries(platforms) as [key, value]} -
- - -
+ {/each} - + {#if !isPlatformCreated} diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte index 02db907e1..cc509aa8f 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte @@ -4,6 +4,7 @@ import { createPlatform } from './wizard/store'; import { Dependencies } from '$lib/constants'; import { + Card as Pink2Card, Code, Layout, Icon, @@ -25,7 +26,6 @@ import OnboardingPlatformCard from './components/OnboardingPlatformCard.svelte'; import { PlatformType } from '@appwrite.io/console'; import { isCloud } from '$lib/system'; - import { LabelCard } from '$lib/components'; let showExitModal = false; let isPlatformCreated = false; @@ -163,19 +163,17 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.reg - + {#each Object.entries(platforms) as [key, value]} -
- - -
+ {/each} - + {#if !isPlatformCreated} diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte index 9cf454fd7..115be6e3c 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte @@ -4,6 +4,7 @@ import { createPlatform } from './wizard/store'; import { Dependencies } from '$lib/constants'; import { + Card as Pink2Card, Code, Layout, Icon, @@ -25,7 +26,6 @@ import OnboardingPlatformCard from './components/OnboardingPlatformCard.svelte'; import { PlatformType } from '@appwrite.io/console'; import { isCloud } from '$lib/system'; - import { LabelCard } from '$lib/components'; let showExitModal = false; let isPlatformCreated = false; @@ -133,18 +133,15 @@ const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.region, page.para - + {#each Object.entries(platforms) as [key, value]} -
- - -
+ {/each} From 03cd6a71d33393ccc420f629fd8b2e83ac6bc280 Mon Sep 17 00:00:00 2001 From: Darshan Date: Sat, 31 May 2025 12:51:34 +0530 Subject: [PATCH 3/6] fix: misc. --- .../overview/platforms/createApple.svelte | 4 +++- .../overview/platforms/createFlutter.svelte | 4 +++- .../overview/platforms/createReactNative.svelte | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte index 94cf1ed30..186bd46f1 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte @@ -114,7 +114,9 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject(page.params.region, page.params.proj title={key} imageRadius="s" name="framework" - bind:group={platform} /> + bind:group={platform} + disabled={isCreatingPlatform || isPlatformCreated} + /> {/each} diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte index cc509aa8f..f0944ea46 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte @@ -171,7 +171,9 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.reg title={key} imageRadius="s" name="framework" - bind:group={platform} /> + bind:group={platform} + disabled={isCreatingPlatform || isPlatformCreated} + /> {/each} diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte index 115be6e3c..d8b01e0eb 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte @@ -133,7 +133,7 @@ const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.region, page.para - + {#each Object.entries(platforms) as [key, value]} + bind:group={platform} + disabled={isCreatingPlatform || isPlatformCreated} /> {/each} From 757b29693e1789f53c9991d2a16ac794d07c62c0 Mon Sep 17 00:00:00 2001 From: Darshan Date: Sat, 31 May 2025 12:52:01 +0530 Subject: [PATCH 4/6] fix: platforms to show on small vs other devices to avoid overflows. --- src/routes/(console)/organization-[organization]/+page.svelte | 4 +++- .../overview/platforms/createApple.svelte | 3 +-- .../overview/platforms/createFlutter.svelte | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte index 19090c22a..b8b6144cf 100644 --- a/src/routes/(console)/organization-[organization]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/+page.svelte @@ -39,6 +39,7 @@ import { getPlatformInfo } from '$lib/helpers/platform'; import CreateProjectCloud from './createProjectCloud.svelte'; import { regions as regionsStore } from '$lib/stores/organization'; + import { isSmallViewport } from '$lib/stores/viewport'; export let data; @@ -163,7 +164,8 @@ {project.name} {#each platforms as platform, i} - {#if i < 3} + {@const platformsLimit = $isSmallViewport ? 2 : 3} + {#if i < platformsLimit} {@const icon = getIconForPlatform(platform.icon)} diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte index 186bd46f1..20a0f1c25 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte @@ -115,8 +115,7 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject(page.params.region, page.params.proj imageRadius="s" name="framework" bind:group={platform} - disabled={isCreatingPlatform || isPlatformCreated} - /> + disabled={isCreatingPlatform || isPlatformCreated} /> {/each} diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte index f0944ea46..59460df7e 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte @@ -172,8 +172,7 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.reg imageRadius="s" name="framework" bind:group={platform} - disabled={isCreatingPlatform || isPlatformCreated} - /> + disabled={isCreatingPlatform || isPlatformCreated} /> {/each} From a13330780f94f6f47f3210beaae9566c5a9d4b1d Mon Sep 17 00:00:00 2001 From: Darshan Date: Sat, 31 May 2025 13:38:46 +0530 Subject: [PATCH 5/6] fix: less platform count. --- .../(console)/organization-[organization]/+page.svelte | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte index b8b6144cf..1e6ee02ea 100644 --- a/src/routes/(console)/organization-[organization]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/+page.svelte @@ -39,7 +39,6 @@ import { getPlatformInfo } from '$lib/helpers/platform'; import CreateProjectCloud from './createProjectCloud.svelte'; import { regions as regionsStore } from '$lib/stores/organization'; - import { isSmallViewport } from '$lib/stores/viewport'; export let data; @@ -164,16 +163,15 @@ {project.name} {#each platforms as platform, i} - {@const platformsLimit = $isSmallViewport ? 2 : 3} - {#if i < platformsLimit} + {#if i < 2} {@const icon = getIconForPlatform(platform.icon)} {/if} {/each} - {#if platforms?.length > 3} - + {#if platforms?.length > 2} + {/if} {#if isCloud && $regionsStore?.regions} From 0ac8c409a7d3e1993f8aa3e1baf752c6358be73a Mon Sep 17 00:00:00 2001 From: Darshan Date: Sun, 1 Jun 2025 13:57:17 +0530 Subject: [PATCH 6/6] update: logic for badges. --- .../organization-[organization]/+page.svelte | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte index 1e6ee02ea..c8ff1fa84 100644 --- a/src/routes/(console)/organization-[organization]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/+page.svelte @@ -19,8 +19,7 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { sdk } from '$lib/stores/sdk'; import { loading } from '$routes/store'; - import type { Models } from '@appwrite.io/console'; - import { ID, Region } from '@appwrite.io/console'; + import { ID, Region, type Models } from '@appwrite.io/console'; import { openImportWizard } from '../project-[region]-[project]/settings/migrations/(import)'; import { readOnly } from '$lib/stores/billing'; import { onMount, type ComponentType } from 'svelte'; @@ -162,23 +161,28 @@ {project.name} - {#each platforms as platform, i} - {#if i < 2} - {@const icon = getIconForPlatform(platform.icon)} - - - - {/if} + + {#each platforms.slice(0, 2) as platform} + {@const icon = getIconForPlatform(platform.icon)} + + + {/each} - {#if platforms?.length > 2} - + + {#if platforms.length > 3} + {/if} + {#if isCloud && $regionsStore?.regions} {@const region = findRegion(project)} - - {region?.name} - + {region.name} {/if}