diff --git a/package.json b/package.json index ea5e3b2a5..99425220a 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@appwrite.io/pink": "0.25.0", "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "1.0.0-next.7", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3114ccc", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9bf8175", "@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 4fed4ac14..55532d290 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: 1.0.0-next.7 version: 1.0.0-next.7(svelte@4.2.19) '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3114ccc - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3114ccc(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9bf8175 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9bf8175(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -223,8 +223,8 @@ packages: peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3114ccc0b95c9d94385c06730b7aeaef7b4a81fc': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3114ccc0b95c9d94385c06730b7aeaef7b4a81fc} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9bf8175bdcd6ed9f4614a76521d80963e75171cb': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9bf8175bdcd6ed9f4614a76521d80963e75171cb} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -232,8 +232,8 @@ packages: '@appwrite.io/pink-icons@0.25.0': resolution: {integrity: sha512-0O3i2oEuh5mWvjO80i+X6rbzrWLJ1m5wmv2/M3a1p2PyBJsFxN8xQMTEmTn3Wl/D26SsM7SpzbdW6gmfgoVU9Q==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3114ccc': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3114ccc} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9bf8175': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9bf8175} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4087,15 +4087,15 @@ snapshots: dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3114ccc0b95c9d94385c06730b7aeaef7b4a81fc(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9bf8175bdcd6ed9f4614a76521d80963e75171cb(svelte@4.2.19)': dependencies: svelte: 4.2.19 '@appwrite.io/pink-icons@0.25.0': {} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3114ccc(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9bf8175(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3114ccc0b95c9d94385c06730b7aeaef7b4a81fc(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9bf8175bdcd6ed9f4614a76521d80963e75171cb(svelte@4.2.19) '@floating-ui/dom': 1.6.13 '@melt-ui/svelte': 0.83.0(svelte@4.2.19) pretty-bytes: 6.1.1 diff --git a/src/routes/(public)/auth/+layout.svelte b/src/routes/(public)/auth/+layout.svelte index 24921622c..a51b92215 100644 --- a/src/routes/(public)/auth/+layout.svelte +++ b/src/routes/(public)/auth/+layout.svelte @@ -1,10 +1,64 @@ - - - +
+
+ + + +
+ +
+ + diff --git a/src/routes/(public)/auth/preview/+page.svelte b/src/routes/(public)/auth/preview/+page.svelte index d65c1672f..9f82172eb 100644 --- a/src/routes/(public)/auth/preview/+page.svelte +++ b/src/routes/(public)/auth/preview/+page.svelte @@ -1,227 +1,28 @@ - -
- - {#if state === 'login'} - - - - {#if isCloud} - or - - {/if} - - {:else if state === 'register'} - - - - - By registering, you agree that you have read, understand, and acknowledge our - Privacy Policy - and accept our - General Terms of Use. - - {#if isCloud} - or - - {/if} - - {:else if state === 'authenticated'} - - -

- You're signed in as {data.account.email} -

- { - logout(); - state = 'login'; - }}>Swith account -
-
- {/if} -
-
+ + Preview - Appwrite + - - - -
+ + + + Authenticating... + + Please wait while we authenticate you + diff --git a/src/routes/(public)/auth/preview/+page.ts b/src/routes/(public)/auth/preview/+page.ts index 87603f585..c13cb1228 100644 --- a/src/routes/(public)/auth/preview/+page.ts +++ b/src/routes/(public)/auth/preview/+page.ts @@ -1,7 +1,14 @@ +import { base } from '$app/paths'; +import { redirect } from '@sveltejs/kit'; + export const load = async ({ parent }) => { const { account } = await parent(); - return { - account - }; + if (!account) { + redirect(303, `${base}/auth/preview/access`); + } else { + return { + account + }; + } }; diff --git a/src/routes/(public)/auth/preview/access/+page.svelte b/src/routes/(public)/auth/preview/access/+page.svelte new file mode 100644 index 000000000..b64444ed5 --- /dev/null +++ b/src/routes/(public)/auth/preview/access/+page.svelte @@ -0,0 +1,245 @@ + + +{#if $app.themeInUse === 'dark'} + +{:else} + +{/if} + + + Preview access - Appwrite + + + +
+ + {#if state === 'login'} + + + + {#if isCloud} + or + + {/if} + + {:else if state === 'register'} + + + + + By registering, you agree that you have read, understand, and acknowledge our + Privacy Policy + and accept our + General Terms of Use. + + {#if isCloud} + or + + {/if} + + {:else if state === 'authenticated'} + + +

+ You're signed in as {data.account.email} +

+ { + logout(); + state = 'login'; + }}>Swith account +
+
+ {/if} +
+
+ + + + +
+ + diff --git a/src/routes/(public)/auth/preview/access/+page.ts b/src/routes/(public)/auth/preview/access/+page.ts new file mode 100644 index 000000000..87603f585 --- /dev/null +++ b/src/routes/(public)/auth/preview/access/+page.ts @@ -0,0 +1,7 @@ +export const load = async ({ parent }) => { + const { account } = await parent(); + + return { + account + }; +}; diff --git a/src/routes/(public)/auth/preview/access/bg_dark.jpg b/src/routes/(public)/auth/preview/access/bg_dark.jpg new file mode 100644 index 000000000..1fbbdc128 Binary files /dev/null and b/src/routes/(public)/auth/preview/access/bg_dark.jpg differ diff --git a/src/routes/(public)/auth/preview/access/bg_light.jpg b/src/routes/(public)/auth/preview/access/bg_light.jpg new file mode 100644 index 000000000..febb1bab8 Binary files /dev/null and b/src/routes/(public)/auth/preview/access/bg_light.jpg differ