From 2ea6df9fbe0d023d42374c4f64e417d535c65020 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Mon, 5 Feb 2024 15:40:03 +0100 Subject: [PATCH] feat: particle mode switcher and linting --- .../src/lib/components/site/icons/index.ts | 2 +- .../src/lib/components/site/icons/logo.svelte | 4 +- .../src/lib/components/site/particles.svelte | 51 +++++++++++-------- .../src/routes/(auth)/login/+page.server.ts | 2 +- apps/web/src/routes/(auth)/login/+page.svelte | 11 ++-- apps/web/src/routes/+layout.server.ts | 2 +- apps/web/src/routes/+page.svelte | 4 +- 7 files changed, 42 insertions(+), 34 deletions(-) diff --git a/apps/web/src/lib/components/site/icons/index.ts b/apps/web/src/lib/components/site/icons/index.ts index ecd7398..b1ab459 100644 --- a/apps/web/src/lib/components/site/icons/index.ts +++ b/apps/web/src/lib/components/site/icons/index.ts @@ -31,5 +31,5 @@ export const Icons = { facebook: FacebookLogo, google: GoogleLogo, instagram: InstagramLogo, - twitter: TwitterLogo, + twitter: TwitterLogo }; diff --git a/apps/web/src/lib/components/site/icons/logo.svelte b/apps/web/src/lib/components/site/icons/logo.svelte index 474c673..60e545a 100644 --- a/apps/web/src/lib/components/site/icons/logo.svelte +++ b/apps/web/src/lib/components/site/icons/logo.svelte @@ -3,8 +3,8 @@ topleft: '#FF6C22', topright: '#FF9209', bottomleft: '#2B3499', - bottomright: '#FFD099', - } + bottomright: '#FFD099' + }; { + console.log('value', value); + color = value === 'dark' ? '#ffffff' : '#000000'; + + // Move the `rgb` calculation inside the `mode.subscribe` callback + rgb = hexToRgb(color); + }); + + /** + * @param {{ x: any; y: any; translateX: any; translateY: any; size: any; alpha: any; targetAlpha?: number; dx?: number; dy?: number; magnetism?: number; }} circle + */ + function drawCircle(circle, update = false) { + if (context) { + const { x, y, translateX, translateY, size, alpha } = circle; + context.translate(translateX, translateY); + context.beginPath(); + context.arc(x, y, size, 0, 2 * Math.PI); + context.fillStyle = `rgba(${rgb.join(', ')}, ${alpha})`; + context.fill(); + context.setTransform(dpr, 0, 0, dpr, 0, 0); + + if (!update) { + circles.push(circle); + } + } + } + function initCanvas() { resizeCanvas(); drawParticles(); @@ -113,27 +141,6 @@ }; } - const rgb = hexToRgb(color); - - /** - * @param {{ x: any; y: any; translateX: any; translateY: any; size: any; alpha: any; targetAlpha?: number; dx?: number; dy?: number; magnetism?: number; }} circle - */ - function drawCircle(circle, update = false) { - if (context) { - const { x, y, translateX, translateY, size, alpha } = circle; - context.translate(translateX, translateY); - context.beginPath(); - context.arc(x, y, size, 0, 2 * Math.PI); - context.fillStyle = `rgba(${rgb.join(', ')}, ${alpha})`; - context.fill(); - context.setTransform(dpr, 0, 0, dpr, 0, 0); - - if (!update) { - circles.push(circle); - } - } - } - function clearContext() { if (context) { context.clearRect(0, 0, canvasSize.w, canvasSize.h); diff --git a/apps/web/src/routes/(auth)/login/+page.server.ts b/apps/web/src/routes/(auth)/login/+page.server.ts index 5535651..ea72fd7 100644 --- a/apps/web/src/routes/(auth)/login/+page.server.ts +++ b/apps/web/src/routes/(auth)/login/+page.server.ts @@ -29,4 +29,4 @@ export const actions: Actions = { console.log('provider: ', provider); await locals.pocketBase.collection('users').authWithOAuth2({ provider: provider }); } -} \ No newline at end of file +}; diff --git a/apps/web/src/routes/(auth)/login/+page.svelte b/apps/web/src/routes/(auth)/login/+page.svelte index c8f3ef7..9c3e645 100644 --- a/apps/web/src/routes/(auth)/login/+page.svelte +++ b/apps/web/src/routes/(auth)/login/+page.svelte @@ -18,6 +18,7 @@ const { providers } = data; const providersWithIcons = providers.map((provider) => ({ ...provider, + /* eslint-disable @typescript-eslint/no-explicit-any */ icon: (Icons as { [key: string]: any })[provider.name] || undefined })); let currentProvider = providersWithIcons[0]; @@ -27,7 +28,7 @@

Log into your account

-

+

Enter your email and password below to log into your account

@@ -90,11 +91,11 @@
- Or continue with + Or continue with
@@ -125,7 +126,7 @@ @@ -157,7 +158,7 @@ {/if}
-

+

Don't have an account? Sign up.
Forgot password? Reset password.

diff --git a/apps/web/src/routes/+layout.server.ts b/apps/web/src/routes/+layout.server.ts index b71d50b..acffcc6 100644 --- a/apps/web/src/routes/+layout.server.ts +++ b/apps/web/src/routes/+layout.server.ts @@ -17,6 +17,6 @@ export const load: LayoutServerLoad = async ({ locals }: { locals: App.Locals }) return { authenticated: locals.pocketBase.authStore.isValid, user, - providers: (await locals.pocketBase.collection('users').listAuthMethods()).authProviders, + providers: (await locals.pocketBase.collection('users').listAuthMethods()).authProviders }; }; diff --git a/apps/web/src/routes/+page.svelte b/apps/web/src/routes/+page.svelte index 0fa944f..4835b3d 100644 --- a/apps/web/src/routes/+page.svelte +++ b/apps/web/src/routes/+page.svelte @@ -11,7 +11,7 @@

One Dashboard @@ -19,7 +19,7 @@ Countless Solutions

-

+

Tame ticket overload and keep your operations teams sane