diff --git a/e2e/journeys/upgrade-free-tier.spec.ts b/e2e/journeys/upgrade-free-tier.spec.ts index 80802f499..55c759a66 100644 --- a/e2e/journeys/upgrade-free-tier.spec.ts +++ b/e2e/journeys/upgrade-free-tier.spec.ts @@ -10,7 +10,6 @@ test('upgrade - free tier', async ({ page }) => { await page.getByRole('link', { name: 'Upgrade', exact: true }).click(); await page.waitForURL(/\/organization-[^/]+\/change-plan/); await page.locator('input[value="tier-1"]').click(); - await page.getByRole('button', { name: 'add' }).first().click(); await enterCreditCard(page); diff --git a/e2e/steps/pro-project.ts b/e2e/steps/pro-project.ts index 438caebef..94cbb601f 100644 --- a/e2e/steps/pro-project.ts +++ b/e2e/steps/pro-project.ts @@ -7,12 +7,15 @@ type Metadata = { }; export async function enterCreditCard(page: Page) { - const dialog = page.locator('.modal').filter({ - hasText: 'add payment method' - }); - await dialog.waitFor({ - state: 'visible' - }); + // click the `add` button inside correct view layer + await page + .locator('#no-payments-card-stack') + .getByRole('button', { name: 'add' }) + .first() + .click(); + + const dialog = page.locator('.modal').filter({ hasText: 'add payment method' }); + await dialog.waitFor({ state: 'visible' }); await page.getByPlaceholder('cardholder').fill('Test User'); const stripe = page.locator('[title="Secure payment input frame"]').nth(0).contentFrame(); await stripe.locator('id=Field-numberInput').fill('4242424242424242'); @@ -35,7 +38,6 @@ export async function createProProject(page: Page): Promise { await page.getByRole('radio', { name: /^Pro\b/ }).check(); // `create organization` because there's already free created on start! await page.getByRole('button', { name: 'create organization' }).click(); - await page.getByRole('button', { name: 'add' }).first().click(); await enterCreditCard(page); // skip members await page.getByRole('button', { name: 'create organization' }).click(); diff --git a/package.json b/package.json index 9cf5d2b56..02cb4f171 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@melt-ui/svelte": "^0.86.5", "@playwright/test": "^1.51.1", "@sveltejs/adapter-static": "^3.0.8", - "@sveltejs/kit": "^2.20.2", + "@sveltejs/kit": "^2.36.2", "@sveltejs/vite-plugin-svelte": "^5.0.3", "@testing-library/dom": "^10.4.0", "@testing-library/jest-dom": "^6.6.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8d46f2f52..a6ff6011a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -34,7 +34,7 @@ importers: version: 2.11.8 '@sentry/sveltekit': specifier: ^8.38.0 - version: 8.55.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.30.0)(@sveltejs/kit@2.20.2(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)) + version: 8.55.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.30.0)(@sveltejs/kit@2.36.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)) '@stripe/stripe-js': specifier: ^3.5.0 version: 3.5.0 @@ -101,10 +101,10 @@ importers: version: 1.51.1 '@sveltejs/adapter-static': specifier: ^3.0.8 - version: 3.0.8(@sveltejs/kit@2.20.2(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0))) + version: 3.0.8(@sveltejs/kit@2.36.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0))) '@sveltejs/kit': - specifier: ^2.20.2 - version: 2.20.2(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)) + specifier: ^2.36.2 + version: 2.36.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)) '@sveltejs/vite-plugin-svelte': specifier: ^5.0.3 version: 5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)) @@ -1247,6 +1247,9 @@ packages: '@shikijs/vscode-textmate@10.0.2': resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==} + '@standard-schema/spec@1.0.0': + resolution: {integrity: sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==} + '@stripe/stripe-js@3.5.0': resolution: {integrity: sha512-pKS3wZnJoL1iTyGBXAvCwduNNeghJHY6QSRSNNvpYnrrQrLZ6Owsazjyynu0e0ObRgks0i7Rv+pe2M7/MBTZpQ==} engines: {node: '>=12.16'} @@ -1261,14 +1264,18 @@ packages: peerDependencies: '@sveltejs/kit': ^2.0.0 - '@sveltejs/kit@2.20.2': - resolution: {integrity: sha512-Dv8TOAZC9vyfcAB9TMsvUEJsRbklRTeNfcYBPaeH6KnABJ99i3CvCB2eNx8fiiliIqe+9GIchBg4RodRH5p1BQ==} + '@sveltejs/kit@2.36.3': + resolution: {integrity: sha512-MVzwZz1GFznEQbL3f0i2v9AIc3lZH01izQj6XfIrthmZAwOzyXJCgXbLRss8vk//HfYsE4w6Tz+ukbf3rScPNQ==} engines: {node: '>=18.13'} hasBin: true peerDependencies: - '@sveltejs/vite-plugin-svelte': ^3.0.0 || ^4.0.0-next.1 || ^5.0.0 + '@opentelemetry/api': ^1.0.0 + '@sveltejs/vite-plugin-svelte': ^3.0.0 || ^4.0.0-next.1 || ^5.0.0 || ^6.0.0-next.0 svelte: ^4.0.0 || ^5.0.0-next.0 - vite: ^5.0.3 || ^6.0.0 + vite: ^5.0.3 || ^6.0.0 || ^7.0.0-beta.0 + peerDependenciesMeta: + '@opentelemetry/api': + optional: true '@sveltejs/vite-plugin-svelte-inspector@4.0.1': resolution: {integrity: sha512-J/Nmb2Q2y7mck2hyCX4ckVHcR5tu2J+MtBEQqpDrrgELZ2uvraQcK/ioCV61AqkdXFgriksOKIceDcQmqnGhVw==} @@ -2009,8 +2016,8 @@ packages: engines: {node: '>=0.10'} hasBin: true - devalue@5.1.1: - resolution: {integrity: sha512-maua5KUiapvEwiEAe+XnlZ3Rh0GD+qI1J/nb9vrJc3muPXvcF/8gXYTWF76+5DAqHyDUtOIImEuo0YKE9mshVw==} + devalue@5.3.2: + resolution: {integrity: sha512-UDsjUbpQn9kvm68slnrs+mfxwFkIflOhkanmyabZ8zOYk8SMEIbJ3TK+88g70hSIeytu4y18f0z/hYHMTrXIWw==} devlop@1.1.0: resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==} @@ -2393,9 +2400,6 @@ packages: import-in-the-middle@1.13.1: resolution: {integrity: sha512-k2V9wNm9B+ysuelDTHjI9d5KPc4l8zAZTGqj+pcynvWkypZd857ryzN8jNC7Pg2YZXNMJcHRPpaDyCBbNyVRpA==} - import-meta-resolve@4.1.0: - resolution: {integrity: sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==} - imurmurhash@0.1.4: resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} engines: {node: '>=0.8.19'} @@ -4667,14 +4671,14 @@ snapshots: magic-string: 0.30.7 svelte: 5.25.3 - '@sentry/sveltekit@8.55.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.30.0)(@sveltejs/kit@2.20.2(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0))': + '@sentry/sveltekit@8.55.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.30.0)(@sveltejs/kit@2.36.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0))': dependencies: '@sentry/core': 8.55.0 '@sentry/node': 8.55.0 '@sentry/opentelemetry': 8.55.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.30.0) '@sentry/svelte': 8.55.0(svelte@5.25.3) '@sentry/vite-plugin': 2.22.6 - '@sveltejs/kit': 2.20.2(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)) + '@sveltejs/kit': 2.36.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)) magic-string: 0.30.7 magicast: 0.2.8 sorcery: 1.0.0 @@ -4734,32 +4738,42 @@ snapshots: '@shikijs/vscode-textmate@10.0.2': {} + '@standard-schema/spec@1.0.0': {} + '@stripe/stripe-js@3.5.0': {} '@sveltejs/acorn-typescript@1.0.5(acorn@8.14.1)': dependencies: acorn: 8.14.1 - '@sveltejs/adapter-static@3.0.8(@sveltejs/kit@2.20.2(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))': + '@sveltejs/acorn-typescript@1.0.5(acorn@8.15.0)': dependencies: - '@sveltejs/kit': 2.20.2(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)) + acorn: 8.15.0 - '@sveltejs/kit@2.20.2(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0))': + '@sveltejs/adapter-static@3.0.8(@sveltejs/kit@2.36.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))': dependencies: + '@sveltejs/kit': 2.36.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)) + + '@sveltejs/kit@2.36.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0))': + dependencies: + '@standard-schema/spec': 1.0.0 + '@sveltejs/acorn-typescript': 1.0.5(acorn@8.15.0) '@sveltejs/vite-plugin-svelte': 5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)) '@types/cookie': 0.6.0 + acorn: 8.15.0 cookie: 0.6.0 - devalue: 5.1.1 + devalue: 5.3.2 esm-env: 1.2.2 - import-meta-resolve: 4.1.0 kleur: 4.1.5 - magic-string: 0.30.17 + magic-string: 0.30.18 mrmime: 2.0.1 sade: 1.8.1 set-cookie-parser: 2.7.1 sirv: 3.0.1 svelte: 5.25.3 vite: 7.0.6(@types/node@22.13.14)(sass@1.86.0) + optionalDependencies: + '@opentelemetry/api': 1.9.0 '@sveltejs/vite-plugin-svelte-inspector@4.0.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0)))(svelte@5.25.3)(vite@7.0.6(@types/node@22.13.14)(sass@1.86.0))': dependencies: @@ -5641,7 +5655,7 @@ snapshots: detect-libc@1.0.3: optional: true - devalue@5.1.1: {} + devalue@5.3.2: {} devlop@1.1.0: dependencies: @@ -6069,8 +6083,6 @@ snapshots: cjs-module-lexer: 1.4.3 module-details-from-path: 1.0.3 - import-meta-resolve@4.1.0: {} - imurmurhash@0.1.4: {} indent-string@4.0.0: {} diff --git a/src/lib/components/alerts/emailVerificationBanner.svelte b/src/lib/components/alerts/emailVerificationBanner.svelte new file mode 100644 index 000000000..51fc4bbab --- /dev/null +++ b/src/lib/components/alerts/emailVerificationBanner.svelte @@ -0,0 +1,63 @@ + + +{#if shouldShowEmailBanner} + + + To avoid losing access to your projects, make sure {$user.email} is valid and up to date. Email + verification will be required soon. + + + + + +{/if} diff --git a/src/lib/components/billing/selectPaymentMethod.svelte b/src/lib/components/billing/selectPaymentMethod.svelte index 30e5ea254..aacbaac99 100644 --- a/src/lib/components/billing/selectPaymentMethod.svelte +++ b/src/lib/components/billing/selectPaymentMethod.svelte @@ -78,7 +78,7 @@ {:else} - + {:else} - {/if} diff --git a/src/lib/components/dualTimeView.svelte b/src/lib/components/dualTimeView.svelte index 61c28c424..c597d7e87 100644 --- a/src/lib/components/dualTimeView.svelte +++ b/src/lib/components/dualTimeView.svelte @@ -11,6 +11,7 @@ import { menuOpen } from '$lib/components/menu/store'; export let time: string | null = null; + export let showDatetime: boolean = false; export let canShowPopover: boolean = true; export let placement: ComponentProps['placement'] = 'bottom'; @@ -85,7 +86,7 @@ } }} on:mouseleave={() => hidePopover(hide)}> - {capitalize(timeFromNow(time))} + {showDatetime ? toLocaleDateTime(time) : capitalize(timeFromNow(time))}
{ - applied = $tags.length; showFiltersDesktop = false; showFiltersMobile = false; + filtersAppliedCount = $tags.length; }); function clearAll() { @@ -87,7 +87,7 @@ applied: number; }> ) { - applied = e.detail.applied; + filtersAppliedCount = e.detail.applied; if (singleCondition) { showFiltersDesktop = false; showFiltersMobile = false; @@ -132,13 +132,20 @@ trackEvent(Click.FilterApplyClick, { source: analyticsSource }); }} {disabled}> - {#if !onlyIcon} + Filters - {#if applied > 0} - - {applied} - + {#if filtersAppliedCount > 0} + + {/if} + {:else} + + + {#if filtersAppliedCount > 0} + {/if} {/if} @@ -160,7 +167,7 @@ {columns} {singleCondition} on:apply={afterApply} - on:clear={() => (applied = 0)} /> + on:clear={() => (filtersAppliedCount = 0)} /> {/if}
Clear all @@ -202,10 +209,8 @@ @@ -223,7 +228,7 @@ bind:arrayValues {singleCondition} on:apply={afterApply} - on:clear={() => (applied = 0)} /> + on:clear={() => (filtersAppliedCount = 0)} /> {/if}
import { page } from '$app/state'; - import { goto } from '$app/navigation'; import { onDestroy } from 'svelte'; + import { goto } from '$app/navigation'; import { trackEvent } from '$lib/actions/analytics'; import { Icon, Input } from '@appwrite.io/pink-svelte'; import { IconSearch, IconX } from '@appwrite.io/pink-icons-svelte'; import { debounce as createDebounce } from '$lib/helpers/debounce.js'; - export let placeholder = ''; - export let debounce = 250; - export let required = false; - export let disabled = false; - export let autofocus = false; + interface Props { + placeholder?: string; + debounce?: number; + required?: boolean; + disabled?: boolean; + autofocus?: boolean; + } - let inputValue = page.url.searchParams.get('search') ?? ''; + let { + placeholder = '', + debounce = 250, + required = false, + disabled = false, + autofocus = false + }: Props = $props(); + + let inputValue = $state(page.url.searchParams.get('search') ?? ''); const runSearch = createDebounce((value: string) => { const trimmed = value.trim(); @@ -36,15 +46,21 @@ goto(url, { keepFocus: true }); }, debounce); - $: runSearch(inputValue); - - function clearInput() { + export function clearInput() { inputValue = ''; } onDestroy(() => { runSearch.cancel?.(); }); + + $effect(() => { + const urlSearch = page.url.searchParams.get('search') ?? ''; + + if (urlSearch !== inputValue) { + runSearch(inputValue); + } + });
diff --git a/src/lib/components/sidebar.svelte b/src/lib/components/sidebar.svelte index 65b18ae1a..1d3dce7ed 100644 --- a/src/lib/components/sidebar.svelte +++ b/src/lib/components/sidebar.svelte @@ -34,13 +34,14 @@ import { showSupportModal } from '$routes/(console)/wizard/support/store'; import MobileSupportModal from '$routes/(console)/wizard/support/mobileSupportModal.svelte'; import MobileFeedbackModal from '$routes/(console)/wizard/feedback/mobileFeedbackModal.svelte'; - import { getSidebarState, updateSidebarState } from '$lib/helpers/sidebar'; + import { getSidebarState, isInDatabasesRoute, updateSidebarState } from '$lib/helpers/sidebar'; import { isTabletViewport, isSmallViewport } from '$lib/stores/viewport'; import { Click, trackEvent } from '$lib/actions/analytics'; import { bannerSpacing } from '$lib/layout/headerAlert.svelte'; import type { HTMLAttributes } from 'svelte/elements'; import type { Models } from '@appwrite.io/console'; + import { noWidthTransition } from '$lib/stores/sidebar'; type $$Props = HTMLAttributes & { state?: 'closed' | 'open' | 'icons'; @@ -72,8 +73,6 @@ } } - $: state = $isTabletViewport ? 'closed' : getSidebarState($page); - const projectOptions = [ { name: 'Auth', icon: IconUserGroup, slug: 'auth', category: 'build' }, { name: 'Databases', icon: IconDatabase, slug: 'databases', category: 'build' }, @@ -92,17 +91,26 @@ const isSelected = (service: string): boolean => { return $page.route.id?.includes(service); }; + + $: state = $isTabletViewport + ? 'closed' + : // example: manual resize + isInDatabasesRoute($page.route) + ? 'icons' + : getSidebarState();