diff --git a/src/lib/components/billing/index.ts b/src/lib/components/billing/index.ts index 0d7a98daa..f579178c7 100644 --- a/src/lib/components/billing/index.ts +++ b/src/lib/components/billing/index.ts @@ -1,2 +1,3 @@ export { default as PaymentBoxes } from './paymentBoxes.svelte'; export { default as CouponInput } from './couponInput.svelte'; +export { default as SelectPaymentMethod } from './selectPaymentMethod.svelte'; diff --git a/src/lib/components/billing/selectPaymentMethod.svelte b/src/lib/components/billing/selectPaymentMethod.svelte new file mode 100644 index 000000000..bb5c637d9 --- /dev/null +++ b/src/lib/components/billing/selectPaymentMethod.svelte @@ -0,0 +1,68 @@ + + +{#if filteredMethods?.length} + { + return { + value: method.$id, + label: `ending in ${method.last4}`, + data: [method.brand] + }; + })} + interactiveOutput + let:option={o}> + + + + {o.data} {o.label} + + + + + +{:else} + + + + + No saved payment methods + + (showPaymentModal = true)}> + Add + + + +{/if} + +{#if showPaymentModal && isCloud && hasStripePublicKey} + +{/if} diff --git a/src/lib/components/card.svelte b/src/lib/components/card.svelte index d5a3cbdb7..378aea133 100644 --- a/src/lib/components/card.svelte +++ b/src/lib/components/card.svelte @@ -5,6 +5,8 @@ isTile?: boolean; isDashed?: boolean; danger?: boolean; + style?: string; + class?: string; }; type ButtonProps = { @@ -26,6 +28,7 @@ export let href: string = null; let classes = ''; export { classes as class }; + export let style: string = ''; function getElement() { switch (true) { @@ -46,6 +49,7 @@ class:is-border-dashed={isDashed} class:is-danger={danger} class:is-allowed-focus={href} + {style} on:click on:keyup={clickOnEnter} role={href || isButton ? 'button' : 'generic'} diff --git a/src/lib/elements/forms/inputSelectSearch.svelte b/src/lib/elements/forms/inputSelectSearch.svelte index 6d1fad7df..ec42f2287 100644 --- a/src/lib/elements/forms/inputSelectSearch.svelte +++ b/src/lib/elements/forms/inputSelectSearch.svelte @@ -8,7 +8,7 @@ type Option = $$Generic<{ value: string | boolean | number; label: string; - data?: string[]; + data?: unknown[]; }>; type OptionArray = Option[]; diff --git a/src/lib/elements/forms/inputTags.svelte b/src/lib/elements/forms/inputTags.svelte index 2d3caac21..c6b088ede 100644 --- a/src/lib/elements/forms/inputTags.svelte +++ b/src/lib/elements/forms/inputTags.svelte @@ -13,6 +13,8 @@ export let readonly = false; export let required = false; export let tooltip: string = null; + export let validityRegex: RegExp = null; + export let validityMessage: string = null; let value = ''; let element: HTMLInputElement; @@ -32,8 +34,13 @@ if (value === '' && ['Enter', 'Tab'].includes(e.key)) { return; } + if (['Enter', 'Tab', ' '].includes(e.key)) { e.preventDefault(); + if (validityRegex && !validityRegex.test(value)) { + error = validityMessage ? validityMessage : 'Invalid value'; + return; + } addValue(); } if (['Backspace', 'Delete'].includes(e.key)) { diff --git a/src/lib/elements/forms/label.svelte b/src/lib/elements/forms/label.svelte index 89adc3f70..5601770b6 100644 --- a/src/lib/elements/forms/label.svelte +++ b/src/lib/elements/forms/label.svelte @@ -1,4 +1,6 @@ + + Create organization - Appwrite + + Create organization console.log('test')}> - + Select plan + + For more details on our plans, visit our + pricing page. + - + @@ -78,6 +107,22 @@ + {#if billingPlan === BillingPlan.PRO} + + + + + + Add credits + + {/if}
+ + No saved payment methods +
+ For more details on our plans, visit our + pricing page. +