From 895ed98ad258268628b92ae4485b496bc29abeeb Mon Sep 17 00:00:00 2001 From: ernstmul Date: Tue, 21 Jan 2025 12:24:16 +0100 Subject: [PATCH 01/19] Use pink package with fixes --- package.json | 2 +- pnpm-lock.yaml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index dc6a20723..eb87a727c 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@28b6051", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9547fa7", "@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 bafa67859..fb9d79dec 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@28b6051 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@28b6051(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9547fa7 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9547fa7(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@28b6051f819c0d832e1edfa77d9e3cc8850f7428': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@28b6051f819c0d832e1edfa77d9e3cc8850f7428} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9547fa78d343cf664864b0f173a331d292c37e68': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9547fa78d343cf664864b0f173a331d292c37e68} 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@28b6051': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@28b6051} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9547fa7': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9547fa7} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4044,15 +4044,15 @@ snapshots: dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@28b6051f819c0d832e1edfa77d9e3cc8850f7428(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9547fa78d343cf664864b0f173a331d292c37e68(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@28b6051(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@9547fa7(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@28b6051f819c0d832e1edfa77d9e3cc8850f7428(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9547fa78d343cf664864b0f173a331d292c37e68(svelte@4.2.19) '@floating-ui/dom': 1.6.12 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.2(svelte@4.2.19))(svelte@4.2.19) '@melt-ui/svelte': 0.86.2(svelte@4.2.19) From 7f7f7a93a013a342df43eb54a530e61ac475728d Mon Sep 17 00:00:00 2001 From: ernstmul Date: Tue, 21 Jan 2025 13:02:37 +0100 Subject: [PATCH 02/19] responsive change --- src/lib/components/breadcrumbsConsole.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/components/breadcrumbsConsole.svelte b/src/lib/components/breadcrumbsConsole.svelte index 140c6b79e..2988883a5 100644 --- a/src/lib/components/breadcrumbsConsole.svelte +++ b/src/lib/components/breadcrumbsConsole.svelte @@ -353,7 +353,7 @@ max-width: 95px; } - @media (min-width: 390px) { + @media (min-width: 400px) { max-width: 105px; } From 01a627f81db13d9778904973f2c4f6f586a300a7 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Tue, 21 Jan 2025 13:03:59 +0100 Subject: [PATCH 03/19] Rename --- .../{breadcrumbsConsole.svelte => breadcrumbs.svelte} | 0 src/lib/components/index.ts | 2 +- src/lib/components/navbar.svelte | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/lib/components/{breadcrumbsConsole.svelte => breadcrumbs.svelte} (100%) diff --git a/src/lib/components/breadcrumbsConsole.svelte b/src/lib/components/breadcrumbs.svelte similarity index 100% rename from src/lib/components/breadcrumbsConsole.svelte rename to src/lib/components/breadcrumbs.svelte diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index 991341e5f..c760d57ad 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -78,5 +78,5 @@ export { default as ImagePreview } from './imagePreview.svelte'; export { default as MfaChallengeFormList } from './mfaChallengeFormList.svelte'; export { default as BottomModalAlert } from './bottomModalAlert.svelte'; export { default as Navbar } from './navbar.svelte'; -export { default as BreadcrumbsConsole } from './breadcrumbsConsole.svelte'; +export { default as Breadcrumbs } from './breadcrumbs.svelte'; export { default as Sidebar } from './sidebar.svelte'; diff --git a/src/lib/components/navbar.svelte b/src/lib/components/navbar.svelte index c9a885fbf..dc2620ff9 100644 --- a/src/lib/components/navbar.svelte +++ b/src/lib/components/navbar.svelte @@ -22,7 +22,7 @@ IconSun, IconUser } from '@appwrite.io/pink-icons-svelte'; - import { DropList, Support, BreadcrumbsConsole } from '$lib/components'; + import { DropList, Support, Breadcrumbs } from '$lib/components'; import { Feedback } from '$lib/components/feedback'; import { feedback } from '$lib/stores/feedback'; import { isMac } from '$lib/helpers/platform'; @@ -105,7 +105,7 @@ }}> {logo.alt} - +
From a7c63e5867da7c5e025bc6853cd66876289bf300 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Tue, 21 Jan 2025 13:12:23 +0100 Subject: [PATCH 04/19] Update listener --- src/lib/components/breadcrumbs.svelte | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/lib/components/breadcrumbs.svelte b/src/lib/components/breadcrumbs.svelte index 2988883a5..668f26ce0 100644 --- a/src/lib/components/breadcrumbs.svelte +++ b/src/lib/components/breadcrumbs.svelte @@ -132,25 +132,14 @@ } }; - onMount(() => { + function updateViewport() { if (window) { - const mediaQuery = window.matchMedia('(max-width: 768px)'); - const updateViewport = () => (isSmallViewport = mediaQuery.matches); - - // Initial check - updateViewport(); - - // Listen for changes - mediaQuery.addEventListener('change', updateViewport); - - return () => { - // Cleanup listener - mediaQuery.removeEventListener('change', updateViewport); - }; + isSmallViewport = window.matchMedia('(max-width: 768px)').matches; } - }); + } +
{#if !isSmallViewport} / From ea6c3e0bee168f9d5283311f0aa4aed4107c03aa Mon Sep 17 00:00:00 2001 From: ernstmul Date: Tue, 21 Jan 2025 13:14:32 +0100 Subject: [PATCH 05/19] Rename classes --- src/lib/components/breadcrumbs.svelte | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/components/breadcrumbs.svelte b/src/lib/components/breadcrumbs.svelte index 668f26ce0..2a62f2608 100644 --- a/src/lib/components/breadcrumbs.svelte +++ b/src/lib/components/breadcrumbs.svelte @@ -148,7 +148,7 @@ class="trigger" use:melt={$triggerOrganizations} aria-label="Open organizations tab"> - {selectedOrg?.name ?? 'Organization'} + {selectedOrg?.name ?? 'Organization'} {#if selectedOrg?.tierName} - {selectedOrg?.name ?? 'Organization'} + {selectedOrg?.name ?? 'Organization'} @@ -228,7 +228,7 @@ class="trigger" use:melt={$triggerProjects} aria-label="Open projects tab"> - {selectedProject.name} + {selectedProject.name} {:else} @@ -239,7 +239,7 @@ projectsBottomSheetOpen = true; }} aria-label="Open projects tab"> - {selectedProject.name} + {selectedProject.name} {/if} @@ -332,7 +332,8 @@ letter-spacing: -0.063px; } - .orgNameProject { + .orgName, + .projectName { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; From e4deccc83675ec3955b858fd62ba65851e06bf9f Mon Sep 17 00:00:00 2001 From: ernstmul Date: Tue, 21 Jan 2025 13:18:49 +0100 Subject: [PATCH 06/19] Use var --- src/lib/components/breadcrumbs.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/components/breadcrumbs.svelte b/src/lib/components/breadcrumbs.svelte index 2a62f2608..b0ebe9fc2 100644 --- a/src/lib/components/breadcrumbs.svelte +++ b/src/lib/components/breadcrumbs.svelte @@ -284,7 +284,7 @@ flex-direction: column; outline: none !important; min-width: 220px; - border-radius: 12px; + border-radius: var(--border-radius-m, 12px); border: 1px solid var(--color-border-neutral, #ededf0); background: var(--color-bgcolor-neutral-primary, #fff); z-index: 20; From 3abffc9d911ca4960702d80f8025ea35a3388ff8 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Tue, 21 Jan 2025 13:28:50 +0100 Subject: [PATCH 07/19] Update listener --- src/lib/components/breadcrumbs.svelte | 4 +--- src/lib/components/navbar.svelte | 21 ++++----------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/lib/components/breadcrumbs.svelte b/src/lib/components/breadcrumbs.svelte index b0ebe9fc2..6e65e025b 100644 --- a/src/lib/components/breadcrumbs.svelte +++ b/src/lib/components/breadcrumbs.svelte @@ -133,9 +133,7 @@ }; function updateViewport() { - if (window) { - isSmallViewport = window.matchMedia('(max-width: 768px)').matches; - } + isSmallViewport = window.matchMedia('(max-width: 768px)').matches; } diff --git a/src/lib/components/navbar.svelte b/src/lib/components/navbar.svelte index dc2620ff9..d146055ae 100644 --- a/src/lib/components/navbar.svelte +++ b/src/lib/components/navbar.svelte @@ -47,23 +47,9 @@ showAccountMenu: boolean; }; - onMount(() => { - if (window) { - const mediaQuery = window.matchMedia('(max-width: 768px)'); - const updateViewport = () => (isSmallViewport = mediaQuery.matches); - - // Initial check - updateViewport(); - - // Listen for changes - mediaQuery.addEventListener('change', updateViewport); - - return () => { - // Cleanup listener - mediaQuery.removeEventListener('change', updateViewport); - }; - } - }); + function updateViewport() { + isSmallViewport = window.matchMedia('(max-width: 768px)').matches; + } function updateTheme(theme: 'light' | 'dark' | 'system') { const themeInUse = @@ -95,6 +81,7 @@ export let showAccountMenu = false; +
From 91850fea6c534d8669a631095068ccd8fca967da Mon Sep 17 00:00:00 2001 From: ernstmul Date: Tue, 21 Jan 2025 13:31:57 +0100 Subject: [PATCH 08/19] Update css vars --- src/lib/components/sidebar.svelte | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/components/sidebar.svelte b/src/lib/components/sidebar.svelte index 2c36140a4..636410040 100644 --- a/src/lib/components/sidebar.svelte +++ b/src/lib/components/sidebar.svelte @@ -370,10 +370,10 @@ flex-direction: row; justify-content: center; align-items: center; - gap: 10px; - margin-bottom: 12px; + gap: var(--space-5, 10px); + margin-block-end: var(--space-6, 12px); align-self: stretch; - border-radius: 8px; + border-radius: var(--border-radius-s, 8px); border: 1px solid var(--color-border-neutral, #ededf0); background: var(--color-bgcolor-neutral-default, #fafafb); transition: all 0.2s ease-in-out; @@ -412,7 +412,7 @@ } .icons .progress-card { - width: 32px; + width: var(--base-32, 32px); border-color: transparent; background: transparent; } From 4b952b0e27a9b025a2b960b2216dc36baac36dbc Mon Sep 17 00:00:00 2001 From: ernstmul Date: Tue, 21 Jan 2025 13:34:06 +0100 Subject: [PATCH 09/19] Update listener --- src/lib/layout/shell.svelte | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index b79dbd090..0a4a99491 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -74,30 +74,11 @@ $: state = sideBarIsOpen ? 'open' : 'closed'; $: state = subNavigation && !isSmallViewport ? 'icons' : sideBarIsOpen ? 'open' : 'closed'; - onMount(() => { - if (window) { - const mediaQuery = window.matchMedia('(max-width: 768px)'); - const updateViewport = () => (isSmallViewport = mediaQuery.matches); - const handleResize = () => { - sideBarIsOpen = false; - showAccountMenu = false; - }; - - // Initial check - updateViewport(); - handleResize(); - - // Listen for changes - mediaQuery.addEventListener('change', updateViewport); - window.addEventListener('resize', handleResize); - - return () => { - // Cleanup listener - mediaQuery.removeEventListener('change', updateViewport); - window.removeEventListener('resize', handleResize); - }; - } - }); + function handleResize() { + isSmallViewport = window.matchMedia('(max-width: 768px)').matches; + sideBarIsOpen = false; + showAccountMenu = false; + } $: progressCard = function getProgressCard() { if (selectedProject) { @@ -120,8 +101,7 @@ }; - - +
Date: Tue, 21 Jan 2025 13:59:42 +0100 Subject: [PATCH 10/19] Simplify progresscard --- src/lib/layout/shell.svelte | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index 0a4a99491..b657119ab 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -84,17 +84,10 @@ if (selectedProject) { const currentProject = projects.find((project) => project.$id === selectedProject.$id); - if (currentProject && currentProject.platforms.length === 0) { - return { - title: 'Get started', - percentage: 33 - }; - } else { - return { - title: 'Get started', - percentage: 100 - }; - } + return { + title: 'Get started', + percentage: currentProject && currentProject.platforms.length ? 33 : 100 + }; } return undefined; From 3ec80d2f6121ea22411894efb9e16f097cc6ccfe Mon Sep 17 00:00:00 2001 From: ernstmul Date: Tue, 21 Jan 2025 14:00:21 +0100 Subject: [PATCH 11/19] Remove ! --- src/routes/(console)/onboarding/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/(console)/onboarding/+page.svelte b/src/routes/(console)/onboarding/+page.svelte index 021226bc9..b4a9b4aba 100644 --- a/src/routes/(console)/onboarding/+page.svelte +++ b/src/routes/(console)/onboarding/+page.svelte @@ -103,7 +103,7 @@ - Create a new organization! + Create a new organization
Date: Tue, 21 Jan 2025 14:03:34 +0100 Subject: [PATCH 12/19] Move logic to script tag --- .../onboarding/create-project/+page.svelte | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/src/routes/(console)/onboarding/create-project/+page.svelte b/src/routes/(console)/onboarding/create-project/+page.svelte index 625d81b02..1a95c5450 100644 --- a/src/routes/(console)/onboarding/create-project/+page.svelte +++ b/src/routes/(console)/onboarding/create-project/+page.svelte @@ -71,6 +71,25 @@ isLoading = false; } } + + function getRegions() { + return regions.regions + .filter((region) => region.$id !== 'default') + .sort((regionA, regionB) => { + if (regionA.disabled && !regionB.disabled) { + return 1; + } + return regionA.name > regionB.name ? 1 : -1; + }) + .map((region) => { + return { + label: region.name, + value: region.$id, + leadingHtml: `Region flag`, + disabled: region.disabled + }; + }); + }
region.$id !== 'default') - .sort((regionA, regionB) => { - if (regionA.disabled && !regionB.disabled) { - return 1; - } - return regionA.name > regionB.name ? 1 : -1; - }) - .map((region) => { - return { - label: region.name, - value: region.$id, - leadingHtml: `Region flag`, - disabled: region.disabled - }; - })} + options={getRegions()} label="Region" /> {/if}
From 29e038892931d8ee767d5a779c1683fec1d004fa Mon Sep 17 00:00:00 2001 From: ernstmul Date: Tue, 21 Jan 2025 14:21:26 +0100 Subject: [PATCH 13/19] Change url scheme --- .../project-[project]/{getstarted => get-started}/+page.svelte | 0 src/routes/(console)/project-[project]/overview/onboard.svelte | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/routes/(console)/project-[project]/{getstarted => get-started}/+page.svelte (100%) diff --git a/src/routes/(console)/project-[project]/getstarted/+page.svelte b/src/routes/(console)/project-[project]/get-started/+page.svelte similarity index 100% rename from src/routes/(console)/project-[project]/getstarted/+page.svelte rename to src/routes/(console)/project-[project]/get-started/+page.svelte diff --git a/src/routes/(console)/project-[project]/overview/onboard.svelte b/src/routes/(console)/project-[project]/overview/onboard.svelte index 188666f80..7bbd737a9 100644 --- a/src/routes/(console)/project-[project]/overview/onboard.svelte +++ b/src/routes/(console)/project-[project]/overview/onboard.svelte @@ -46,7 +46,7 @@ size="s" on:click={() => { setHasOnboardingDismissed(projectId); - if (location.href.endsWith('getstarted')) { + if (location.href.endsWith('get-started')) { goto(`${base}/project-${projectId}`); } else { location.reload(); From 4b1e45fb8fdd75af64dc1f35fa3a043b4579a0a1 Mon Sep 17 00:00:00 2001 From: Ernst Mulders Date: Tue, 21 Jan 2025 14:22:40 +0100 Subject: [PATCH 14/19] Update src/routes/(console)/project-[project]/overview/onboard.svelte Co-authored-by: Darshan --- src/routes/(console)/project-[project]/overview/onboard.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/(console)/project-[project]/overview/onboard.svelte b/src/routes/(console)/project-[project]/overview/onboard.svelte index 188666f80..6581bd5e4 100644 --- a/src/routes/(console)/project-[project]/overview/onboard.svelte +++ b/src/routes/(console)/project-[project]/overview/onboard.svelte @@ -150,7 +150,7 @@ class="onboarding-card platform-card" on:click={() => addPlatform(1)}> From 8b15b9ca0d96defdc71e4a6c1e95a14aff8a49d3 Mon Sep 17 00:00:00 2001 From: Ernst Mulders Date: Tue, 21 Jan 2025 14:22:47 +0100 Subject: [PATCH 15/19] Update src/routes/(console)/project-[project]/overview/onboard.svelte Co-authored-by: Darshan --- src/routes/(console)/project-[project]/overview/onboard.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/(console)/project-[project]/overview/onboard.svelte b/src/routes/(console)/project-[project]/overview/onboard.svelte index 6581bd5e4..98932bdb9 100644 --- a/src/routes/(console)/project-[project]/overview/onboard.svelte +++ b/src/routes/(console)/project-[project]/overview/onboard.svelte @@ -130,7 +130,7 @@ class="onboarding-card platform-card" on:click={() => addPlatform(2)}> From e93deefe0404cfcf13935b97eb33257020cc4de4 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Tue, 21 Jan 2025 14:24:47 +0100 Subject: [PATCH 16/19] Change cursor to pointer --- src/lib/components/breadcrumbs.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/components/breadcrumbs.svelte b/src/lib/components/breadcrumbs.svelte index 6e65e025b..6a2b4ef10 100644 --- a/src/lib/components/breadcrumbs.svelte +++ b/src/lib/components/breadcrumbs.svelte @@ -315,7 +315,7 @@ outline: none; display: flex; align-items: center; - cursor: default; + cursor: pointer; margin: 0 4px; padding: var(--space-3, 6px) var(--space-4, 8px) var(--space-3, 6px) var(--space-5, 10px); From 5b9c19bd06ab0d35069bb4c395f48bb783b33aa2 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Tue, 21 Jan 2025 15:51:31 +0100 Subject: [PATCH 17/19] Typescript fixes --- package.json | 4 ++-- pnpm-lock.yaml | 29 ++++++++++++++------------- src/lib/components/breadcrumbs.svelte | 7 +++---- src/lib/components/navbar.svelte | 23 ++++++--------------- src/lib/components/sidebar.svelte | 2 +- 5 files changed, 27 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index eb87a727c..b7076fd06 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,8 @@ "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@9193", "@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@9547fa7", + "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@72b1958", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@1fe7674", "@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 fb9d79dec..ad9f34fc3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,11 +18,11 @@ importers: specifier: 0.25.0 version: 0.25.0 '@appwrite.io/pink-icons-svelte': - specifier: 1.0.0-next.7 - version: 1.0.0-next.7(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@72b1958 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@72b1958(svelte@4.2.19) '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9547fa7 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9547fa7(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@1fe7674 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@1fe7674(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -218,13 +218,14 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@9193} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@1.0.0-next.7': - resolution: {integrity: sha512-Bmff3YGEliIetqc3UyjzJNLg88FIC6UXYwTzGqHm+0QLCRJxwAFpTkfTCLIqMe5PUqGshq6jM9SPyCCSVVS3aw==} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@1fe7674343bab0dc86d4cbc98c74055c9e87be0b': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@1fe7674343bab0dc86d4cbc98c74055c9e87be0b} + version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9547fa78d343cf664864b0f173a331d292c37e68': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9547fa78d343cf664864b0f173a331d292c37e68} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@72b1958': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@72b1958} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -232,8 +233,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@9547fa7': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9547fa7} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@1fe7674': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@1fe7674} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4040,19 +4041,19 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@9193': {} - '@appwrite.io/pink-icons-svelte@1.0.0-next.7(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@1fe7674343bab0dc86d4cbc98c74055c9e87be0b(svelte@4.2.19)': dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9547fa78d343cf664864b0f173a331d292c37e68(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@72b1958(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@9547fa7(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@1fe7674(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@9547fa78d343cf664864b0f173a331d292c37e68(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@1fe7674343bab0dc86d4cbc98c74055c9e87be0b(svelte@4.2.19) '@floating-ui/dom': 1.6.12 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.2(svelte@4.2.19))(svelte@4.2.19) '@melt-ui/svelte': 0.86.2(svelte@4.2.19) diff --git a/src/lib/components/breadcrumbs.svelte b/src/lib/components/breadcrumbs.svelte index 6a2b4ef10..f5bf1cd89 100644 --- a/src/lib/components/breadcrumbs.svelte +++ b/src/lib/components/breadcrumbs.svelte @@ -2,7 +2,6 @@ import { createMenubar, melt } from '@melt-ui/svelte'; import { Badge, Icon, BottomSheet, type SheetMenu } from '@appwrite.io/pink-svelte'; import { IconChevronDown, IconChevronRight, IconPlus } from '@appwrite.io/pink-icons-svelte'; - import { onMount } from 'svelte'; type Project = { name: string; @@ -362,7 +361,7 @@ margin-bottom: 4px; } - .item[data-highlighted] { + :global(.item[data-highlighted]) { border-radius: var(--border-radius-S, 8px); background: var(--color-overlay-neutral-hover, rgba(25, 25, 28, 0.03)); } @@ -392,12 +391,12 @@ background: var(--color-overlay-neutral-hover, rgba(25, 25, 28, 0.03)); } - .trigger[data-highlighted] { + :global(.trigger[data-highlighted]) { outline: none; background: var(--color-bgcolor-neutral-secondary, #f4f4f7); } - .trigger[data-highlighted]:focus { + :global(.trigger[data-highlighted]:focus) { outline: none; box-shadow: 0 0 0 2px var(--color-bgcolor-neutral-secondary, #f4f4f7); } diff --git a/src/lib/components/navbar.svelte b/src/lib/components/navbar.svelte index d146055ae..034e50dde 100644 --- a/src/lib/components/navbar.svelte +++ b/src/lib/components/navbar.svelte @@ -29,7 +29,6 @@ import { base } from '$app/paths'; import { logout } from '$lib/helpers/logout'; import { app } from '$lib/stores/app'; - import { onMount } from 'svelte'; let showSupport = false; let isSmallViewport = false; @@ -38,12 +37,11 @@ links: Array<{ label: string; href: string }>; organizations: Array<{ name: string; - id: string; - isSelected?: boolean; - tier: string; - projects: Array<{ name: string; id: string }>; + $id: string; + isSelected: boolean; + tierName: string; + projects: Array<{ name: string; $id: string; isSelected: boolean }>; }>; - showSideNavigation: boolean; showAccountMenu: boolean; }; @@ -77,7 +75,6 @@ export let organizations: $$Props['organizations']; export let avatar: $$Props['avatar']; export let sideBarIsOpen: $$Props['sideBarIsOpen'] = false; - export let showSideNavigation: boolean; export let showAccountMenu = false; @@ -222,7 +219,8 @@ } } ] - } + }, + bottom: undefined } } ] @@ -279,10 +277,6 @@ display: none; } - .only-mobile-tablet { - display: block; - } - @media (min-width: 768px) { .only-desktop { display: block; @@ -292,11 +286,6 @@ } } - @media (min-width: 1024px) { - .only-mobile-tablet { - display: none; - } - } :global(.icons div:first-of-type:not(:has(.progress-card))) { height: 20px; } diff --git a/src/lib/components/sidebar.svelte b/src/lib/components/sidebar.svelte index 636410040..f6d2dcb71 100644 --- a/src/lib/components/sidebar.svelte +++ b/src/lib/components/sidebar.svelte @@ -43,7 +43,7 @@ export let state: $$Props['state'] = 'closed'; export let project: $$Props['project']; export let avatar: $$Props['avatar']; - export let progressCard: $$Props['progressCard']; + export let progressCard: $$Props['progressCard'] = undefined; export let sideBarIsOpen: boolean; export let showAccountMenu: boolean; export let subNavigation = undefined; From e51e0d1ac4a1a1cc45f21d0631100e2fd253bc35 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Wed, 22 Jan 2025 10:07:48 +0100 Subject: [PATCH 18/19] Fix ref and show sidebar value --- src/lib/components/sidebar.svelte | 2 +- src/lib/layout/shell.svelte | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/components/sidebar.svelte b/src/lib/components/sidebar.svelte index f6d2dcb71..772dd0465 100644 --- a/src/lib/components/sidebar.svelte +++ b/src/lib/components/sidebar.svelte @@ -91,7 +91,7 @@ { sideBarIsOpen = false; }}> diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index b657119ab..069a22a8c 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -5,7 +5,7 @@ import { log } from '$lib/stores/logs'; import { wizard } from '$lib/stores/wizard'; import { activeHeaderAlert } from '$routes/(console)/store'; - import { type ComponentType, onMount, setContext } from 'svelte'; + import { type ComponentType, setContext } from 'svelte'; import { writable } from 'svelte/store'; import { showSubNavigation } from '$lib/stores/layout'; import { organization, organizationList } from '$lib/stores/organization'; @@ -105,7 +105,6 @@ {/if} @@ -129,7 +128,6 @@ {#if $page.data?.header} {/if} - {#if showFooter && showSideNavigation} From 0609a7c315e3dd2eeda8a0d4d99e6f7ce830352f Mon Sep 17 00:00:00 2001 From: ernstmul Date: Wed, 22 Jan 2025 10:28:32 +0100 Subject: [PATCH 19/19] Fix for not loading orgs when first creating account --- src/lib/layout/shell.svelte | 6 +----- src/routes/(console)/+layout.ts | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index 069a22a8c..31f79a5c2 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -102,11 +102,7 @@ class:is-fixed-layout={$activeHeaderAlert?.show} style:--p-side-size={sideSize}> {#if showHeader} - + {/if} { roles: [], scopes: [], projects: projects, - currentProjectId: params.project ?? '' + currentProjectId: params.project ?? '', + organizations: await sdk.forConsole.teams.list() }; };