From b16f8880cdd2d00474beb5141caa47c31f284bbb Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 22 Jan 2025 15:09:53 +0530 Subject: [PATCH 01/18] add: android starter onboarding [WIP]. --- src/lib/layout/wizard.svelte | 9 + .../components/ConnectionLine.svelte | 79 ++++++ .../components/OnboardingPlatformCard.svelte | 63 +++++ .../overview/platforms/createAndroid.svelte | 253 +++++++++++++++--- .../platforms/wizard/android/step1.svelte | 60 ----- .../platforms/wizard/android/step2.svelte | 18 -- .../platforms/wizard/android/step3.svelte | 41 --- 7 files changed, 368 insertions(+), 155 deletions(-) create mode 100644 src/routes/(console)/project-[project]/overview/platforms/components/ConnectionLine.svelte create mode 100644 src/routes/(console)/project-[project]/overview/platforms/components/OnboardingPlatformCard.svelte delete mode 100644 src/routes/(console)/project-[project]/overview/platforms/wizard/android/step1.svelte delete mode 100644 src/routes/(console)/project-[project]/overview/platforms/wizard/android/step2.svelte delete mode 100644 src/routes/(console)/project-[project]/overview/platforms/wizard/android/step3.svelte diff --git a/src/lib/layout/wizard.svelte b/src/lib/layout/wizard.svelte index 1e8dcaca1..e2633b4aa 100644 --- a/src/lib/layout/wizard.svelte +++ b/src/lib/layout/wizard.svelte @@ -3,6 +3,7 @@ import { trackEvent } from '$lib/actions/analytics'; import WizardExitModal from './wizardExitModal.svelte'; import { goto } from '$app/navigation'; + import { wizard } from '$lib/stores/wizard'; type $$Props = | { @@ -13,6 +14,7 @@ invertColumns?: boolean; hideAside?: boolean; hideFooter?: boolean; + onExit?: () => void; } | { title: string; @@ -22,6 +24,7 @@ invertColumns?: boolean; hideAside?: boolean; hideFooter?: boolean; + onExit?: () => void; }; export let title: $$Props['title'] = ''; @@ -31,6 +34,7 @@ export let invertColumns: $$Props['invertColumns'] = false; export let hideAside = false; export let hideFooter = false; + export let onExit: $$Props['onExit'] = undefined; function handleKeydown(event: KeyboardEvent) { if (event.key === 'Escape') { @@ -83,6 +87,11 @@ trackEvent('wizard_exit', { from: 'prompt' }); + + wizard.hide(); + if (onExit) { + onExit(); + } }}> Are you sure you want to exit from this process? All data will be deleted. This action diff --git a/src/routes/(console)/project-[project]/overview/platforms/components/ConnectionLine.svelte b/src/routes/(console)/project-[project]/overview/platforms/components/ConnectionLine.svelte new file mode 100644 index 000000000..795adcc10 --- /dev/null +++ b/src/routes/(console)/project-[project]/overview/platforms/components/ConnectionLine.svelte @@ -0,0 +1,79 @@ + + +
+
+
+ +
+ {#if status} + + {/if} +
+ +
+
+
+ + diff --git a/src/routes/(console)/project-[project]/overview/platforms/components/OnboardingPlatformCard.svelte b/src/routes/(console)/project-[project]/overview/platforms/components/OnboardingPlatformCard.svelte new file mode 100644 index 000000000..8b7881df9 --- /dev/null +++ b/src/routes/(console)/project-[project]/overview/platforms/components/OnboardingPlatformCard.svelte @@ -0,0 +1,63 @@ + + +
+
+ +
+
+ + diff --git a/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte b/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte index 2f9bf8322..825c0a16c 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte @@ -1,46 +1,227 @@ - + +
+ + + {#if !isPlatformCreated} +
+ + + + + + + + + + +
+ {:else} + + + + + + + {$createPlatform.name} ({$createPlatform.key}) + + + + + + {/if} + + + {#if isPlatformCreated} +
+ + + 1. Clone the Android starter kit from GitHub using your terminal or + Android Studio. + + + +
+ +
+ + 2. Configure the project + + + Update the configuration in the file + + . + + + 3. Run the starter kit + + Launch the starter kit and click the + + button to test the setup. + +
+
+ {/if} +
+ + + + + + + + + + + + + + {#if !connectionSuccessful} + + Waiting for connection... + {:else} + +
+ Congratulations! +
+ {/if} +
+
+
+
+ + + + +
+ + diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/android/step1.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/android/step1.svelte deleted file mode 100644 index bdd6b79a1..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/android/step1.svelte +++ /dev/null @@ -1,60 +0,0 @@ - - - - Android registration - - - - - diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/android/step2.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/android/step2.svelte deleted file mode 100644 index a2c5dd1fb..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/android/step2.svelte +++ /dev/null @@ -1,18 +0,0 @@ - - - - Install -

First, add this to your root level build.gradle file.

- -

And add this to your project's build.gradle file.

- -
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/android/step3.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/android/step3.svelte deleted file mode 100644 index e2c956664..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/android/step3.svelte +++ /dev/null @@ -1,41 +0,0 @@ - - - - Initialize - -

Initialize your SDK

-

- Initialize your SDK by pointing the client to your Appwrite project using your Project ID. -

-
- -
-
From dac374ffba5a12caae5d37bcebcfefc06a2e4250 Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 22 Jan 2025 15:10:11 +0530 Subject: [PATCH 02/18] fix: equality checks. --- .../project-[project]/overview/onboard.svelte | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/routes/(console)/project-[project]/overview/onboard.svelte b/src/routes/(console)/project-[project]/overview/onboard.svelte index 188666f80..9354e4f3f 100644 --- a/src/routes/(console)/project-[project]/overview/onboard.svelte +++ b/src/routes/(console)/project-[project]/overview/onboard.svelte @@ -75,7 +75,7 @@ class="onboarding-card platform-card" on:click={() => addPlatform(0)}> @@ -92,7 +92,7 @@ + + + {:else} + + + + + + + {$createPlatform.name} ({$createPlatform.key}) + + + + + + {/if} + + + {#if isPlatformCreated} +
+ + + 1. Clone the starter kit from GitHub using the terminal or XCode. + + + +
+ +
+ + 2. Open the file and + update the configuration settings. + + +
+ +
+ + 3. Run the app on a connected device or simulator, then click the button to verify the setup. +
+
+ {/if} + + + + + + + + + + + + + + + {#if !connectionSuccessful} + + Waiting for connection... + {:else} + +
+ Congratulations! + + You connected your app successfully. +
+ {/if} +
+
+
+
+ + + + + + + diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step1.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step1.svelte deleted file mode 100644 index 9c3b9761a..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step1.svelte +++ /dev/null @@ -1,85 +0,0 @@ - - - - Apple registration - - - -

Choose an Apple platform

-
- (platform = PlatformType.Appleios)} - selected={platform === PlatformType.Appleios}> - iOS - - (platform = PlatformType.Applemacos)} - selected={platform === PlatformType.Applemacos}> - macOS - - (platform = PlatformType.Applewatchos)} - selected={platform === PlatformType.Applewatchos}> - watchOS - - (platform = PlatformType.Appletvos)} - selected={platform === PlatformType.Appletvos}> - tvOS - -
-
- - -
-
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step2.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step2.svelte deleted file mode 100644 index d77381e5b..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step2.svelte +++ /dev/null @@ -1,81 +0,0 @@ - - - - Install -
- (method = Method.Xcode)} selected={method === Method.Xcode}> - Xcode - - (method = Method.Swift)} selected={method === Method.Swift}> - Swift Packages - -
-
- {#if method === Method.Xcode} -
    -
  1. - - In the menu bar under Select File, select Add Packages - -
  2. -
  3. - - Search for the Appwrite SDK with the URL - - https://github.com/appwrite/sdk-for-apple - - -
  4. -
  5. - In the right panel, select your target project and add your desired version - rules -
  6. -
  7. - - Select Add Package and wait for package resolution to complete - -
  8. -
  9. - - Make sure the Appwrite package product is checked and select Add Package - again - -
  10. -
- {:else if method === Method.Swift} -

Add this to your Package.swift file.

- -

Then add the dependency to your target.

- - {/if} -
-
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step3.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step3.svelte deleted file mode 100644 index 8ae1e3d86..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step3.svelte +++ /dev/null @@ -1,48 +0,0 @@ - - - - Initialize - -

Initialize your SDK

-

- Initialize your SDK by pointing the client to your Appwrite project using your - Project ID - . -

- -

- Before sending any API calls to your new Appwrite project, make sure your device or emulator - has network access to your Appwrite project's hostname or IP address. -

- {#if showAlert && !isCloud} -
- (showAlert = false)}> - For self-hosted solutions - When connecting to a locally hosted Appwrite project from an emulator or a mobile device, - you should use the private IP of the device running your Appwrite project as the hostname - of the endpoint instead of localhost. You can also use a service like ngrok to proxy - the Appwrite server. - -
- {/if} -
From 221a9baa429b853375b761d056cbca90222bc71b Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 23 Jan 2025 13:45:47 +0530 Subject: [PATCH 08/18] fix: card selector for `pink#248`. --- src/lib/components/labelCard.svelte | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib/components/labelCard.svelte b/src/lib/components/labelCard.svelte index 53a1582d7..e40ca2c5a 100644 --- a/src/lib/components/labelCard.svelte +++ b/src/lib/components/labelCard.svelte @@ -44,9 +44,11 @@ {disabled} title={title ?? slotTitle?.innerText} bind:group> -

- -

+ {#if $$slots.default} +

+ +

+ {/if} {tooltipText} From 12d90452bf2de5b5d7935af011a9e3809b2b1ec8 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 23 Jan 2025 13:46:03 +0530 Subject: [PATCH 09/18] fix: wizard on exit call. --- src/lib/layout/wizard.svelte | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/layout/wizard.svelte b/src/lib/layout/wizard.svelte index e2633b4aa..fe037c412 100644 --- a/src/lib/layout/wizard.svelte +++ b/src/lib/layout/wizard.svelte @@ -91,6 +91,9 @@ wizard.hide(); if (onExit) { onExit(); + + // clear exit + onExit = null; } }}> From 4b955c36ae2e0d5b9591dd3bd94ba89f702ca11d Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 23 Jan 2025 13:46:28 +0530 Subject: [PATCH 10/18] fix: correct reset and submission logic. --- .../overview/platforms/createAndroid.svelte | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte b/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte index cbf67e144..c00652739 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte @@ -70,8 +70,8 @@ const val APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}" } async function resetPlatformStore() { - await Promise.all([invalidate(Dependencies.PROJECT), invalidate(Dependencies.PLATFORMS)]); createPlatform.reset(); + await Promise.all([invalidate(Dependencies.PROJECT), invalidate(Dependencies.PLATFORMS)]); } onMount(() => { @@ -121,8 +121,7 @@ const val APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}" submissionLoader={isCreatingPlatform} disabled={!$createPlatform.name || !$createPlatform.key || - isCreatingPlatform} - on:click={async () => await createAndroidPlatform()}> + isCreatingPlatform}> Create platform From 9d2e60a2f8492ea95d4363199239725f0f071c3e Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 23 Jan 2025 14:20:20 +0530 Subject: [PATCH 11/18] new: flutter platform. --- .../overview/platforms/createFlutter.svelte | 348 ++++++++++++++++-- .../platforms/wizard/flutter/step1.svelte | 199 ---------- .../platforms/wizard/flutter/step2.svelte | 25 -- .../platforms/wizard/flutter/step3.svelte | 57 --- 4 files changed, 312 insertions(+), 317 deletions(-) delete mode 100644 src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step1.svelte delete mode 100644 src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step2.svelte delete mode 100644 src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step3.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte index 3a6bac032..5f3ce1178 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte @@ -1,47 +1,323 @@ - + +
+ + + + {#each Object.entries(platforms) as [key, value]} +
+ + +
+ {/each} +
+ + + {#if !isPlatformCreated} +
+ + + + + + + + + + +
+ {:else} + + + + + + + {$createPlatform.name} ({$createPlatform.key}) + + + + + + {/if} + + + {#if isPlatformCreated} +
+ + + 1. Clone the starter kit from GitHub using the terminal, Android Studio or VSCode. + + + +
+ +
+ + 2. Open the file and + update the configuration settings. + + +
+ +
+ + 3. Run the app on a connected device or simulator, then click the button to verify the setup. +
+
+ {/if} +
+ + + + + + + + + + + + + + {#if !connectionSuccessful} + + Waiting for connection... + {:else} + +
+ Congratulations! + + You connected your app successfully. +
+ {/if} +
+
+
+
+ + + + +
+ + diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step1.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step1.svelte deleted file mode 100644 index e9bb56165..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step1.svelte +++ /dev/null @@ -1,199 +0,0 @@ - - - - {registee} registration - -
- (platform = PlatformType.Flutterandroid)} - selected={platform === PlatformType.Flutterandroid}> - Android - - (platform = PlatformType.Flutterios)} - selected={platform === PlatformType.Flutterios}> - iOS - - (platform = PlatformType.Flutterlinux)} - selected={platform === PlatformType.Flutterlinux}> - Linux - - (platform = PlatformType.Fluttermacos)} - selected={platform === PlatformType.Fluttermacos}> - macOS - - (platform = PlatformType.Flutterwindows)} - selected={platform === PlatformType.Flutterwindows}> - Windows - - (platform = PlatformType.Flutterweb)} - selected={platform === PlatformType.Flutterweb}> - Web - -
-
- - - - {#if platform === PlatformType.Flutterweb} -
- - -
- {#each suggestions as suggestion} - ($createPlatform.hostname = suggestion)}> - {suggestion} - - {/each} -
-
- {:else} - - {/if} -
-
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step2.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step2.svelte deleted file mode 100644 index 27d4667f3..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step2.svelte +++ /dev/null @@ -1,25 +0,0 @@ - - - - Install - -

- Add Appwrite SDK to your package's pubspec.yaml file. You can - view an example here. -

- -

- You can also install the SDK using the Dart package manager from your terminal. -

-
- -
-
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step3.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step3.svelte deleted file mode 100644 index 2a0a1b97f..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step3.svelte +++ /dev/null @@ -1,57 +0,0 @@ - - - - Initialize - -

Initialize your SDK

-

- Initialize your SDK by pointing the client to your Appwrite project using your - Project ID -

-
- -
-

- Before sending any API calls to your new Appwrite project, make sure your device or emulator - has network access to your Appwrite project's hostname or IP address. -

- {#if showAlert && !isCloud} -
- (showAlert = false)}> - For self-hosted solutions - When connecting to a locally hosted Appwrite project from an emulator or a mobile device, - you should use the private IP of the device running your Appwrite project as the hostname - of the endpoint instead of localhost. You can also use a service like ngrok to proxy - the Appwrite server. - -
- {/if} -
From 244af872c29ffafaddc958e22172ea5aa1608426 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 23 Jan 2025 14:20:35 +0530 Subject: [PATCH 12/18] fix: import paths. --- .../overview/platforms/createAndroid.svelte | 4 ++-- .../project-[project]/overview/platforms/createApple.svelte | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte b/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte index c00652739..0d53be27d 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte @@ -22,8 +22,8 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { addNotification } from '$lib/stores/notifications'; import { fade } from 'svelte/transition'; - import OnboardingPlatformCard from '$routes/(console)/project-[project]/overview/platforms/components/OnboardingPlatformCard.svelte'; - import ConnectionLine from '$routes/(console)/project-[project]/overview/platforms/components/ConnectionLine.svelte'; + import ConnectionLine from './components/ConnectionLine.svelte'; + import OnboardingPlatformCard from './components/OnboardingPlatformCard.svelte'; import { PlatformType } from '@appwrite.io/console'; import { isCloud } from '$lib/system'; diff --git a/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte b/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte index 0a5b7a3e9..7c56a1048 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte @@ -22,8 +22,8 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { addNotification } from '$lib/stores/notifications'; import { fade } from 'svelte/transition'; - import OnboardingPlatformCard from '$routes/(console)/project-[project]/overview/platforms/components/OnboardingPlatformCard.svelte'; - import ConnectionLine from '$routes/(console)/project-[project]/overview/platforms/components/ConnectionLine.svelte'; + import ConnectionLine from './components/ConnectionLine.svelte'; + import OnboardingPlatformCard from './components/OnboardingPlatformCard.svelte'; import { PlatformType } from '@appwrite.io/console'; import { isCloud } from '$lib/system'; import { app } from '$lib/stores/app'; @@ -44,7 +44,7 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject.client.config.endpoint}" `; - let platform: PlatformType | null = null; + let platform: PlatformType = PlatformType.Appleios; let platforms: { [key: string]: PlatformType } = { iOS: PlatformType.Appleios, From 0985f3997996bf3a91d140ab3aed20e780c4bada Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 23 Jan 2025 14:36:47 +0530 Subject: [PATCH 13/18] new: react native onboarding flow. --- .../platforms/createReactNative.svelte | 320 ++++++++++++++++-- .../wizard/react-native/step1.svelte | 106 ------ .../wizard/react-native/step2.svelte | 13 - .../wizard/react-native/step3.svelte | 58 ---- 4 files changed, 284 insertions(+), 213 deletions(-) delete mode 100644 src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step1.svelte delete mode 100644 src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step2.svelte delete mode 100644 src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step3.svelte diff --git a/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte b/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte index 1751468bf..8864632a9 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte @@ -1,47 +1,295 @@ - + +
+ + + + {#each Object.entries(platforms) as [key, value]} +
+ + +
+ {/each} +
+ + + {#if !isPlatformCreated} +
+ + + + + + + + + + +
+ {:else} + + + + + + + {$createPlatform.name} ({$createPlatform.key}) + + + + + + {/if} + + + {#if isPlatformCreated} +
+ + + 1. Clone the starter kit from GitHub using the terminal or VSCode. + + + +
+ +
+ + 2. Open the file and update the configuration settings. + + +
+ +
+ + 3. Run the app on a connected device or simulator, then click the button to verify the setup. +
+
+ {/if} +
+ + + + + + + + + + + + + + {#if !connectionSuccessful} + + Waiting for connection... + {:else} + +
+ Congratulations! + + You connected your app successfully. +
+ {/if} +
+
+
+
+ + + + +
+ + diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step1.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step1.svelte deleted file mode 100644 index 77b2daf34..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step1.svelte +++ /dev/null @@ -1,106 +0,0 @@ - - - - {registee} registration - -
- (platform = PlatformType.Reactnativeandroid)} - selected={platform === PlatformType.Reactnativeandroid}> - Android - - (platform = PlatformType.Reactnativeios)} - selected={platform === PlatformType.Reactnativeios}> - iOS - -
-
- - - - - -
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step2.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step2.svelte deleted file mode 100644 index 76b2bdb3c..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step2.svelte +++ /dev/null @@ -1,13 +0,0 @@ - - - - Install - -

Install the Appwrite SDK for React Native and required dependencies.

- -
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step3.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step3.svelte deleted file mode 100644 index 13d20b5a0..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step3.svelte +++ /dev/null @@ -1,58 +0,0 @@ - - - - Initialize - -

Initialize your SDK

-

- Initialize your SDK by pointing the client to your Appwrite project using your Project ID -

-
- -
-

- Before sending any API calls to your new Appwrite project, make sure your device or emulator - has network access to your Appwrite project's hostname or IP address. -

- {#if showAlert && !isCloud} -
- (showAlert = false)}> - For self-hosted solutions - When connecting to a locally hosted Appwrite project from an emulator or a mobile device, - you should use the private IP of the device running your Appwrite project as the hostname - of the endpoint instead of localhost. You can also use a service like ngrok to proxy - the Appwrite server. - -
- {/if} -
From b542e62ba416377f1565d2e62ace5d6ba42867a0 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 23 Jan 2025 14:36:56 +0530 Subject: [PATCH 14/18] ran: formatter. --- .../overview/platforms/createFlutter.svelte | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte index 5f3ce1178..f5f6b096d 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte @@ -235,7 +235,8 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.e
- 1. Clone the starter kit from GitHub using the terminal, Android Studio or VSCode. + 1. Clone the starter kit from GitHub using the terminal, Android Studio + or VSCode. @@ -244,8 +245,9 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.e 2. Open the file and - update the configuration settings. + >2. Open the file and update the configuration settings.
@@ -253,9 +255,9 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.e
3. Run the app on a connected device or simulator, then click the button to verify the setup. + >3. Run the app on a connected device or simulator, then click the button to verify the setup.
{/if} @@ -290,7 +292,7 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.e Congratulations! You connected your app successfully. + >You connected your app successfully. {/if} @@ -311,13 +313,13 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.e From 9d4e7a407be7a36a408bb6f6a0235efb372d6619 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 23 Jan 2025 14:39:47 +0530 Subject: [PATCH 15/18] update: better projects/platform dependency updates. --- .../overview/platforms/createAndroid.svelte | 5 ++++- .../project-[project]/overview/platforms/createApple.svelte | 5 ++++- .../overview/platforms/createFlutter.svelte | 5 ++++- .../overview/platforms/createReactNative.svelte | 6 +++++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte b/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte index 0d53be27d..518c6b9e2 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte @@ -58,6 +58,10 @@ const val APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}" trackEvent(Submit.PlatformCreate, { type: 'android' }); + await Promise.all([ + invalidate(Dependencies.PROJECT), + invalidate(Dependencies.PLATFORMS) + ]); } catch (error) { trackError(error, Submit.PlatformCreate); addNotification({ @@ -71,7 +75,6 @@ const val APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}" async function resetPlatformStore() { createPlatform.reset(); - await Promise.all([invalidate(Dependencies.PROJECT), invalidate(Dependencies.PLATFORMS)]); } onMount(() => { diff --git a/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte b/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte index 7c56a1048..11f553b3a 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte @@ -69,6 +69,10 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject.client.config.endpoint}" trackEvent(Submit.PlatformCreate, { type: platform }); + await Promise.all([ + invalidate(Dependencies.PROJECT), + invalidate(Dependencies.PLATFORMS) + ]); } catch (error) { trackError(error, Submit.PlatformCreate); addNotification({ @@ -82,7 +86,6 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject.client.config.endpoint}" async function resetPlatformStore() { createPlatform.reset(); - await Promise.all([invalidate(Dependencies.PROJECT), invalidate(Dependencies.PLATFORMS)]); } onMount(() => { diff --git a/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte index f5f6b096d..5bc9a2487 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte @@ -125,6 +125,10 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.e trackEvent(Submit.PlatformCreate, { type: platform }); + await Promise.all([ + invalidate(Dependencies.PROJECT), + invalidate(Dependencies.PLATFORMS) + ]); } catch (error) { trackError(error, Submit.PlatformCreate); addNotification({ @@ -138,7 +142,6 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.e async function resetPlatformStore() { createPlatform.reset(); - await Promise.all([invalidate(Dependencies.PROJECT), invalidate(Dependencies.PLATFORMS)]); } onMount(() => { diff --git a/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte b/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte index 8864632a9..e57b5a9a8 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte @@ -95,6 +95,11 @@ const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}"; trackEvent(Submit.PlatformCreate, { type: platform }); + + await Promise.all([ + invalidate(Dependencies.PROJECT), + invalidate(Dependencies.PLATFORMS) + ]); } catch (error) { trackError(error, Submit.PlatformCreate); addNotification({ @@ -108,7 +113,6 @@ const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}"; async function resetPlatformStore() { createPlatform.reset(); - await Promise.all([invalidate(Dependencies.PROJECT), invalidate(Dependencies.PLATFORMS)]); } onMount(() => { From 94a06f6ec5a2f6ecb32ded9fee93f7c2222629f3 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 23 Jan 2025 14:41:45 +0530 Subject: [PATCH 16/18] update: better store reset. --- .../overview/platforms/createAndroid.svelte | 3 ++- .../overview/platforms/createApple.svelte | 3 ++- .../overview/platforms/createFlutter.svelte | 3 ++- .../overview/platforms/createReactNative.svelte | 7 ++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte b/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte index 518c6b9e2..928d56810 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte @@ -87,11 +87,12 @@ const val APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}" return () => { unsubscribe(); + resetPlatformStore(); }; }); - +
diff --git a/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte b/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte index 11f553b3a..011435d21 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte @@ -98,11 +98,12 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject.client.config.endpoint}" return () => { unsubscribe(); + resetPlatformStore(); }; }); - + diff --git a/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte index 5bc9a2487..adbd189a9 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte @@ -154,11 +154,12 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.e return () => { unsubscribe(); + resetPlatformStore(); }; }); - + diff --git a/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte b/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte index e57b5a9a8..325b6b3c5 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte @@ -125,15 +125,12 @@ const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}"; return () => { unsubscribe(); + resetPlatformStore(); }; }); - + From d8b6d061978b7a6bddda593f560c58b5c2a5e3e2 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 24 Jan 2025 19:51:08 +0530 Subject: [PATCH 17/18] remove: web onboarding flow, add: todo for Ernst. --- .../project-[project]/overview/onboard.svelte | 4 +- .../overview/platforms/+page.svelte | 12 +-- .../overview/platforms/createWeb.svelte | 47 ----------- .../platforms/wizard/web/step1.svelte | 84 ------------------- .../platforms/wizard/web/step2.svelte | 64 -------------- .../platforms/wizard/web/step3.svelte | 38 --------- 6 files changed, 6 insertions(+), 243 deletions(-) delete mode 100644 src/routes/(console)/project-[project]/overview/platforms/createWeb.svelte delete mode 100644 src/routes/(console)/project-[project]/overview/platforms/wizard/web/step1.svelte delete mode 100644 src/routes/(console)/project-[project]/overview/platforms/wizard/web/step2.svelte delete mode 100644 src/routes/(console)/project-[project]/overview/platforms/wizard/web/step3.svelte diff --git a/src/routes/(console)/project-[project]/overview/onboard.svelte b/src/routes/(console)/project-[project]/overview/onboard.svelte index 054941161..fd762bd0e 100644 --- a/src/routes/(console)/project-[project]/overview/onboard.svelte +++ b/src/routes/(console)/project-[project]/overview/onboard.svelte @@ -73,7 +73,9 @@
{/if} - addPlatform(Platform.Web)}> - Web - addPlatform(Platform.Flutter)}> Flutter @@ -181,6 +172,9 @@ addPlatform(Platform.Apple)}> Apple + addPlatform(Platform.ReactNative)}> + React Native +
diff --git a/src/routes/(console)/project-[project]/overview/platforms/createWeb.svelte b/src/routes/(console)/project-[project]/overview/platforms/createWeb.svelte deleted file mode 100644 index ca38a161f..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/createWeb.svelte +++ /dev/null @@ -1,47 +0,0 @@ - - - diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/web/step1.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/web/step1.svelte deleted file mode 100644 index 661b2472d..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/web/step1.svelte +++ /dev/null @@ -1,84 +0,0 @@ - - - - Hostname registration - - -
- -
- {#each suggestions as suggestion} - ($createPlatform.hostname = suggestion)}> - {suggestion} - - {/each} -
-
- - Using wildcard hostnames in production can become insecure. You can read about - - Cross-Origin Resource Sharing (CORS) for more information. - -
-
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/web/step2.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/web/step2.svelte deleted file mode 100644 index 9c21ccc48..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/web/step2.svelte +++ /dev/null @@ -1,64 +0,0 @@ - - - - Install - - Choose your preferred method of installation -
- (method = Method.NPM)} selected={method === Method.NPM}> - NPM - - (method = Method.CDN)} selected={method === Method.CDN}> - CDN - -
-
- {#if method === Method.NPM} -

- Use NPM (node package manager) from your command line to add Appwrite SDK - to your project. -

- -

- If you're using a bundler like Vite - or - Rollup, import Appwrite as a module. -

- - {:else if method === Method.CDN} -

Add the following script tags to install Appwrite with a CDN.

- - {/if} -
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/web/step3.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/web/step3.svelte deleted file mode 100644 index e9b820208..000000000 --- a/src/routes/(console)/project-[project]/overview/platforms/wizard/web/step3.svelte +++ /dev/null @@ -1,38 +0,0 @@ - - - - Initialize SDK - -

Initialize your SDK

-

- Initialize your SDK by pointing the client to your Appwrite project using your Project ID. -

-
- -
-
From a759d4dd77f81c1cc0912d6d48efe78a5c701a2f Mon Sep 17 00:00:00 2001 From: ernstmul Date: Tue, 28 Jan 2025 17:55:14 +0100 Subject: [PATCH 18/18] Changes after conflict --- .../project-[project]/overview/onboard.svelte | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/routes/(console)/project-[project]/overview/onboard.svelte b/src/routes/(console)/project-[project]/overview/onboard.svelte index d700bb299..9aa826934 100644 --- a/src/routes/(console)/project-[project]/overview/onboard.svelte +++ b/src/routes/(console)/project-[project]/overview/onboard.svelte @@ -1,8 +1,7 @@