From 45f0ba9ad2afb8bc9469972eebba3b4e2ef9210d Mon Sep 17 00:00:00 2001 From: ernstmul Date: Thu, 8 May 2025 11:38:19 +0200 Subject: [PATCH] Fix provider wizard aside --- package.json | 2 +- pnpm-lock.yaml | 18 +-- .../messaging/providers/create.svelte | 136 +++++++++++++++++- .../providers/wizard/settings.svelte | 123 +--------------- 4 files changed, 143 insertions(+), 136 deletions(-) diff --git a/package.json b/package.json index f0ef3aee1..f8a99aea4 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@504c653", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@247c120", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 78e5ecd08..280a3fc5e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27,8 +27,8 @@ importers: specifier: ^1.0.3 version: 1.0.3 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@504c653 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@504c653(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@247c120 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@247c120(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -258,8 +258,8 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@504c653542de13ba8b4815805806f301df92790a': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@504c653542de13ba8b4815805806f301df92790a} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@247c1201ec78ba5756af404269f6f97f24acc9e5': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@247c1201ec78ba5756af404269f6f97f24acc9e5} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -279,8 +279,8 @@ packages: '@appwrite.io/pink-legacy@1.0.3': resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@504c653': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@504c653} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@247c120': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@247c120} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -3627,7 +3627,7 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@504c653542de13ba8b4815805806f301df92790a(svelte@5.25.3)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@247c1201ec78ba5756af404269f6f97f24acc9e5(svelte@5.25.3)': dependencies: svelte: 5.25.3 @@ -3644,9 +3644,9 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@504c653(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@247c120(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@504c653542de13ba8b4815805806f301df92790a(svelte@5.25.3) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@247c1201ec78ba5756af404269f6f97f24acc9e5(svelte@5.25.3) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.6(svelte@5.25.3))(svelte@5.25.3) '@melt-ui/svelte': 0.86.6(svelte@5.25.3) diff --git a/src/routes/(console)/project-[project]/messaging/providers/create.svelte b/src/routes/(console)/project-[project]/messaging/providers/create.svelte index 2886f684e..009aa7b2c 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/create.svelte +++ b/src/routes/(console)/project-[project]/messaging/providers/create.svelte @@ -10,11 +10,24 @@ import { base } from '$app/paths'; import { project } from '../../store'; import { wizard } from '$lib/stores/wizard'; - import { provider, providerParams } from './wizard/store'; - import { ID, type Models } from '@appwrite.io/console'; + import { provider, providerParams, providerType } from './wizard/store'; + import { ID, MessagingProviderType, type Models } from '@appwrite.io/console'; import { Providers } from '../provider.svelte'; import { Button, Form } from '$lib/elements/forms'; - import { Fieldset, Layout } from '@appwrite.io/pink-svelte'; + import { Fieldset, Layout, Typography, ActionList, Accordion } from '@appwrite.io/pink-svelte'; + import { providers } from '$routes/(console)/project-[project]/messaging/providers/store'; + import { getProviderText } from '$routes/(console)/project-[project]/messaging/helper'; + import { + ClickableList, + ClickableListItem, + Collapsible, + CollapsibleItem + } from '$lib/components'; + import { newMemberModal } from '$lib/stores/organization'; + import CreateMember from '$routes/(console)/organization-[organization]/createMember.svelte'; + import { IconBookOpen, IconInfo, IconUserGroup } from '@appwrite.io/pink-icons-svelte'; + + let open = false; async function create() { try { @@ -167,7 +180,7 @@ }); - +
@@ -181,4 +194,119 @@ + + Need a hand? + {console.log('match', $providerType == MessagingProviderType.Push)} + + {#if providers[$providerType].providers[$provider].needAHand} + {@const needAHand = providers[$providerType].providers[$provider].needAHand} + + + {#each needAHand as p} +

+ {@html p} +

+ {/each} + + + {/if} + + { + $newMemberModal = true; + }} + title="Invite a team member to complete this step" + icon={IconUserGroup} /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {#if $newMemberModal} + + {/if} diff --git a/src/routes/(console)/project-[project]/messaging/providers/wizard/settings.svelte b/src/routes/(console)/project-[project]/messaging/providers/wizard/settings.svelte index eca807dd0..142450836 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/wizard/settings.svelte +++ b/src/routes/(console)/project-[project]/messaging/providers/wizard/settings.svelte @@ -4,8 +4,7 @@ import { providers } from '../store'; import { providerType, provider, providerParams } from './store'; import SettingsFormList from '../settingsFormList.svelte'; - import { newMemberModal } from '$lib/stores/organization'; - import CreateMember from '$routes/(console)/organization-[organization]/createMember.svelte'; + import { MessagingProviderType } from '@appwrite.io/console'; import { Collapsible, @@ -17,7 +16,6 @@ let files: Record = {}; $: inputs = providers[$providerType].providers[$provider].configure; - let open = false; $: { files; @@ -65,7 +63,6 @@ - Settings Set up the credentials below to enable {providers[$providerType].providers[$provider].title} for sending @@ -73,122 +70,4 @@ - -
-

Need a hand?

- -
- {#if providers[$providerType].providers[$provider].needAHand} - {@const needAHand = providers[$providerType].providers[$provider].needAHand} -
- - - -
-
- -
- How to enable {getProviderText($provider)} - {#if $providerType == MessagingProviderType.Push}notifications{:else}{getProviderText( - $provider - )}{/if} service? -
- -
- {#each needAHand as p} -

- {@html p} -

- {/each} -
- - -
-
- {/if} - - - -
-
-
- -
-

Read the full guide in the documentation

-
- -
- - ($newMemberModal = true)}> -
-
-
- -
-

Invite a team member to complete this step

-
- -
- - -
-
- -{#if $newMemberModal} - -{/if} - -