diff --git a/package.json b/package.json index 4fda9722f..03bc14838 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://try-module.cloud/-/@appwrite/@appwrite.io/pink-svelte@4b056c8", + "@appwrite.io/pink-svelte": "https://try-module.cloud/-/@appwrite/@appwrite.io/pink-svelte@d74b893", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", @@ -65,6 +65,7 @@ "@typescript-eslint/eslint-plugin": "^8.28.0", "@typescript-eslint/parser": "^8.28.0", "@vitest/ui": "^3.0.9", + "color": "^5.0.0", "eslint": "^9.23.0", "eslint-config-prettier": "^10.1.0", "eslint-plugin-svelte": "^3.3.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9f9ac752e..19234569f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,8 +24,8 @@ importers: specifier: ^1.0.3 version: 1.0.3 '@appwrite.io/pink-svelte': - specifier: https://try-module.cloud/-/@appwrite/@appwrite.io/pink-svelte@4b056c8 - version: https://try-module.cloud/-/@appwrite/%40appwrite.io%2Fpink-svelte@4b056c8(svelte@5.25.3) + specifier: https://try-module.cloud/-/@appwrite/@appwrite.io/pink-svelte@d74b893 + version: https://try-module.cloud/-/@appwrite/%40appwrite.io%2Fpink-svelte@d74b893(svelte@5.25.3) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -135,6 +135,9 @@ importers: '@vitest/ui': specifier: ^3.0.9 version: 3.0.9(vitest@3.0.9) + color: + specifier: ^5.0.0 + version: 5.0.0 eslint: specifier: ^9.23.0 version: 9.23.0 @@ -278,8 +281,8 @@ packages: '@appwrite.io/pink-legacy@1.0.3': resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==} - '@appwrite.io/pink-svelte@https://try-module.cloud/-/@appwrite/%40appwrite.io%2Fpink-svelte@4b056c8': - resolution: {tarball: https://try-module.cloud/-/@appwrite/%40appwrite.io%2Fpink-svelte@4b056c8} + '@appwrite.io/pink-svelte@https://try-module.cloud/-/@appwrite/%40appwrite.io%2Fpink-svelte@d74b893': + resolution: {tarball: https://try-module.cloud/-/@appwrite/%40appwrite.io%2Fpink-svelte@d74b893} version: 2.0.0-RC.2 peerDependencies: svelte: ^4.0.0 @@ -1714,9 +1717,25 @@ packages: resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} engines: {node: '>=7.0.0'} + color-convert@3.1.0: + resolution: {integrity: sha512-TVoqAq8ZDIpK5lsQY874DDnu65CSsc9vzq0wLpNQ6UMBq81GSZocVazPiBbYGzngzBOIRahpkTzCLVe2at4MfA==} + engines: {node: '>=14.6'} + color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + color-name@2.0.0: + resolution: {integrity: sha512-SbtvAMWvASO5TE2QP07jHBMXKafgdZz8Vrsrn96fiL+O92/FN/PLARzUW5sKt013fjAprK2d2iCn2hk2Xb5oow==} + engines: {node: '>=12.20'} + + color-string@2.0.1: + resolution: {integrity: sha512-5z9FbYTZPAo8iKsNEqRNv+OlpBbDcoE+SY9GjLfDUHEfcNNV7tS9eSAlFHEaub/r5tBL9LtskAeq1l9SaoZ5tQ==} + engines: {node: '>=18'} + + color@5.0.0: + resolution: {integrity: sha512-16BlyiuyLq3MLxpRWyOTiWsO3ii/eLQLJUQXBSNcxMBBSnyt1ee9YUdaozQp03ifwm5woztEZGDbk9RGVuCsdw==} + engines: {node: '>=18'} + combined-stream@1.0.8: resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==} engines: {node: '>= 0.8'} @@ -3635,7 +3654,7 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://try-module.cloud/-/@appwrite/%40appwrite.io%2Fpink-svelte@4b056c8(svelte@5.25.3)': + '@appwrite.io/pink-svelte@https://try-module.cloud/-/@appwrite/%40appwrite.io%2Fpink-svelte@d74b893(svelte@5.25.3)': dependencies: '@appwrite.io/pink-icons-svelte': 2.0.0-RC.1(svelte@5.25.3) '@floating-ui/dom': 1.6.13 @@ -5256,8 +5275,23 @@ snapshots: dependencies: color-name: 1.1.4 + color-convert@3.1.0: + dependencies: + color-name: 2.0.0 + color-name@1.1.4: {} + color-name@2.0.0: {} + + color-string@2.0.1: + dependencies: + color-name: 2.0.0 + + color@5.0.0: + dependencies: + color-convert: 3.1.0 + color-string: 2.0.1 + combined-stream@1.0.8: dependencies: delayed-stream: 1.0.0 diff --git a/src/lib/components/billing/paymentModal.svelte b/src/lib/components/billing/paymentModal.svelte index 4f1afcdf6..9ef191311 100644 --- a/src/lib/components/billing/paymentModal.svelte +++ b/src/lib/components/billing/paymentModal.svelte @@ -15,11 +15,12 @@ let name: string; let error: string; + let modal: FakeModal; async function handleSubmit() { try { const card = await submitStripeCard(name, page?.params?.organization ?? null); - show = false; + modal.closeModal(); invalidate(Dependencies.PAYMENT_METHODS); dispatch('submit', card); addNotification({ @@ -65,7 +66,12 @@ } - + {/if} -
+
@@ -105,7 +114,8 @@ .loader-element { width: 100%; align-self: center; - justify-items: end; + justify-content: center; + display: flex; } } diff --git a/src/lib/components/creditCardInfo.svelte b/src/lib/components/creditCardInfo.svelte index 849146456..f750e87c3 100644 --- a/src/lib/components/creditCardInfo.svelte +++ b/src/lib/components/creditCardInfo.svelte @@ -19,8 +19,9 @@ {paymentMethod?.name} -{paymentMethod?.expiryMonth}/{paymentMethod?.expiryYear} + + {paymentMethod?.expiryMonth}/{paymentMethod?.expiryYear} + {#if paymentMethod?.lastError || paymentMethod?.expired} diff --git a/src/lib/components/fakeModal.svelte b/src/lib/components/fakeModal.svelte index 0db0ad65d..13a40cb2d 100644 --- a/src/lib/components/fakeModal.svelte +++ b/src/lib/components/fakeModal.svelte @@ -30,7 +30,7 @@ } } - function closeModal() { + export function closeModal() { document.documentElement.classList.remove('u-overflow-hidden'); show = false; } diff --git a/src/lib/components/filters/filtersBottomSheet.svelte b/src/lib/components/filters/filtersBottomSheet.svelte index 5d7137c1a..ac3e0a1d4 100644 --- a/src/lib/components/filters/filtersBottomSheet.svelte +++ b/src/lib/components/filters/filtersBottomSheet.svelte @@ -65,8 +65,6 @@ items: filterCols.map((col) => { return { name: col.title, - onClick: () => - console.log(subSheets.find((sheet) => sheet?.title === col?.title)), subMenu: subSheets.find((sheet) => sheet?.title === col?.title), trailingIcon: IconChevronRight }; diff --git a/src/lib/components/mfaChallengeFormList.svelte b/src/lib/components/mfaChallengeFormList.svelte index 3e369b2ab..00dc1ad23 100644 --- a/src/lib/components/mfaChallengeFormList.svelte +++ b/src/lib/components/mfaChallengeFormList.svelte @@ -95,7 +95,7 @@ {#if enabledFactors.length > 1} or
- {#if factors.totp && challengeType != null && challengeType != AuthenticationFactor.Totp} + {#if factors.totp && challengeType !== null && challengeType !== AuthenticationFactor.Totp}
- + Authenticator app {#if $factors.totp} - connected + {/if} diff --git a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte index 6cb9717e2..db32f3c91 100644 --- a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte +++ b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte @@ -99,6 +99,12 @@ $: if (!showReplace) { isSelectedBackup = false; } + + $: hasPaymentError = + defaultPaymentMethod?.lastError || + defaultPaymentMethod?.expired || + backupPaymentMethod?.lastError || + backupPaymentMethod?.expired; @@ -109,10 +115,10 @@ diff --git a/src/routes/(console)/project-[region]-[project]/auth/(providers)/googleOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/googleOAuth.svelte index 82109ee1b..ee90d2bb7 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/(providers)/googleOAuth.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/(providers)/googleOAuth.svelte @@ -39,10 +39,10 @@ }; - + {provider.name} OAuth2 settings -

+

To use {provider.name} authentication in your application, first fill in this form. For more info you can - - {provider.name} OAuth2 settings -

+ +

To use {provider.name} authentication in your application, first fill in this form. For more info you can