From ee90d55b36f78aba90a0456a2c1e6df5cc5a9907 Mon Sep 17 00:00:00 2001 From: Khaled Ferjani Date: Mon, 27 May 2024 15:36:58 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20show=20download=20banner=20?= =?UTF-8?q?using=20query=20params=20(#216)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- registration/src/app.d.ts | 3 ++- registration/src/routes/+page.server.ts | 13 ++++++------- registration/src/routes/+page.svelte | 4 +++- registration/src/store/banner.ts | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/registration/src/app.d.ts b/registration/src/app.d.ts index 947b5ca..19ca165 100644 --- a/registration/src/app.d.ts +++ b/registration/src/app.d.ts @@ -40,5 +40,6 @@ interface SessionData { recovery_otp_request_token?: string; verified_recovery_phone?: boolean; recovery_step?: PasswordRecoveryStepType = 'phone'; - simpleRedirect?: boolean = false; + simpleRedirect?: boolean = false; + banner?: boolean = false; } diff --git a/registration/src/routes/+page.server.ts b/registration/src/routes/+page.server.ts index 184d43a..ced77a1 100644 --- a/registration/src/routes/+page.server.ts +++ b/registration/src/routes/+page.server.ts @@ -30,6 +30,7 @@ export const load: PageServerLoad = async ({ locals, url, cookies, request, getC const app = (url.searchParams.get('app') as ApplicationType) ?? 'default'; const willLogin = url.searchParams.get('login') !== null; const simpleRedirect = url.searchParams.get('simple_redirect') !== null; + const banner = url.searchParams.get('banner') !== null; const cookie = cookies.get(authService.cookieName); @@ -39,7 +40,8 @@ export const load: PageServerLoad = async ({ locals, url, cookies, request, getC postLoginUrl, country, app, - simpleRedirect + simpleRedirect, + banner })); logger.info('detected context: ', { @@ -71,7 +73,8 @@ export const load: PageServerLoad = async ({ locals, url, cookies, request, getC isLogin: isLogin || willLogin, step: session.data.step || initialStep, verified: session.data.verified, - phone: session.data.phone + phone: session.data.phone, + banner }; }; @@ -385,11 +388,7 @@ export const actions: Actions = { }; const { login, password } = data; - const { - postLoginUrl = null, - simpleRedirect, - app - } = session.data; + const { postLoginUrl = null, simpleRedirect, app } = session.data; if (!login || !password) { logger.error('Missing login or password'); diff --git a/registration/src/routes/+page.svelte b/registration/src/routes/+page.svelte index 7a72de9..fb1a2de 100644 --- a/registration/src/routes/+page.svelte +++ b/registration/src/routes/+page.svelte @@ -6,7 +6,8 @@ userCountry, registrationStep, verified, - phone + phone, + showBanner } from '$store'; import AccessSelect from '$components/landing/AccessSelect.svelte'; import Hero from '$components/landing/Hero.svelte'; @@ -24,6 +25,7 @@ $: registrationStep.set(data.step); $: verified.set(data.verified); $: phone.set(data.phone ?? ''); + $: showBanner.set(data.banner);
diff --git a/registration/src/store/banner.ts b/registration/src/store/banner.ts index 5ca0995..6b9d32c 100644 --- a/registration/src/store/banner.ts +++ b/registration/src/store/banner.ts @@ -1,3 +1,3 @@ import { writable } from 'svelte/store'; -export const showBanner = writable(true); +export const showBanner = writable(false);