From 847e004b0ab9d4b6c25044f23eecd6d5880c6dca Mon Sep 17 00:00:00 2001 From: ernstmul Date: Mon, 3 Mar 2025 10:14:35 +0100 Subject: [PATCH 01/12] Fix: move connect button even closer --- src/lib/components/navbar.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/components/navbar.svelte b/src/lib/components/navbar.svelte index 8f73da3f7..ab0f037ab 100644 --- a/src/lib/components/navbar.svelte +++ b/src/lib/components/navbar.svelte @@ -120,7 +120,7 @@ {#if selectedProject && selectedProject.pingCount === 0} -
+
Date: Mon, 3 Mar 2025 10:19:03 +0100 Subject: [PATCH 02/12] Fix: changes to create your project card --- src/routes/(console)/onboarding/create-project/+page.svelte | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/routes/(console)/onboarding/create-project/+page.svelte b/src/routes/(console)/onboarding/create-project/+page.svelte index ec7dca776..981fc348d 100644 --- a/src/routes/(console)/onboarding/create-project/+page.svelte +++ b/src/routes/(console)/onboarding/create-project/+page.svelte @@ -147,9 +147,7 @@
-
- Create your project -
+ Create your project @@ -191,7 +189,7 @@ > Create From 7ccd645fd28f297857ce54c3b039b6e415256425 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Mon, 3 Mar 2025 10:24:31 +0100 Subject: [PATCH 03/12] Feat: add sidebar categories deploy and build --- src/lib/components/sidebar.svelte | 51 +++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/src/lib/components/sidebar.svelte b/src/lib/components/sidebar.svelte index cdfacfb81..c2d80809e 100644 --- a/src/lib/components/sidebar.svelte +++ b/src/lib/components/sidebar.svelte @@ -70,12 +70,12 @@ $: isOnProjectSettings = /^\/console\/project-[a-zA-Z0-9-]+\/settings$/.test(pathname); const projectOptions = [ - { name: 'Auth', icon: IconUserGroup, slug: 'auth' }, - { name: 'Databases', icon: IconDatabase, slug: 'databases' }, - { name: 'Functions', icon: IconLightningBolt, slug: 'functions' }, - { name: 'Messaging', icon: IconChatBubble, slug: 'messaging' }, - { name: 'Sites', icon: IconGlobeAlt, slug: 'sites' }, - { name: 'Storage', icon: IconFolder, slug: 'storage' } + { name: 'Auth', icon: IconUserGroup, slug: 'auth', category: 'build' }, + { name: 'Databases', icon: IconDatabase, slug: 'databases', category: 'build' }, + { name: 'Functions', icon: IconLightningBolt, slug: 'functions', category: 'build' }, + { name: 'Messaging', icon: IconChatBubble, slug: 'messaging', category: 'build' }, + { name: 'Storage', icon: IconFolder, slug: 'storage', category: 'build' }, + { name: 'Sites', icon: IconGlobeAlt, slug: 'sites', category: 'deploy' } ]; @@ -157,12 +157,45 @@
- Products + Build
- {#each projectOptions as projectOption} + {@const buildProjectOptions = projectOptions.filter( + (projectOption) => projectOption.category === 'build' + )} + {#each buildProjectOptions as projectOption} + + { + trackEvent(`click_menu_${projectOption.slug}`); + sideBarIsOpen = false; + }} + > + {projectOption.name} + {projectOption.name} + + {/each} +
+ +
+
+ Deploy + +
+ {@const deployProjectOptions = projectOptions.filter( + (projectOption) => projectOption.category === 'deploy' + )} + {#each deployProjectOptions as projectOption} Date: Mon, 3 Mar 2025 10:36:54 +0100 Subject: [PATCH 04/12] Fix: margins on in progress badge --- .../project-[project]/overview/onboard.svelte | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/routes/(console)/project-[project]/overview/onboard.svelte b/src/routes/(console)/project-[project]/overview/onboard.svelte index 6bb95c213..01c7f36a6 100644 --- a/src/routes/(console)/project-[project]/overview/onboard.svelte +++ b/src/routes/(console)/project-[project]/overview/onboard.svelte @@ -122,7 +122,7 @@ content="In progress">
+ style:margin="-4px 0 0 2px">
+ style:margin="-4px 0 0 2px">
+ style:margin="-4px 0 0 2px">
+ style:margin="-4px 0 0 2px">
+ style:margin="-4px 0 0 2px"> Date: Mon, 3 Mar 2025 10:49:39 +0100 Subject: [PATCH 05/12] Fix: Search button to correct icon button --- src/lib/components/navbar.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/components/navbar.svelte b/src/lib/components/navbar.svelte index ab0f037ab..cd6f6aacc 100644 --- a/src/lib/components/navbar.svelte +++ b/src/lib/components/navbar.svelte @@ -186,7 +186,8 @@ + on:click={toggleCommandCenter} + icon={true}> {isMac() ? '⌘ + K' : 'Ctrl + K'} From 25e0621d3b5f72fb6de181a5d196513aeaae6d52 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Mon, 3 Mar 2025 11:11:28 +0100 Subject: [PATCH 06/12] Fix: support cards --- src/lib/components/support.svelte | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte index 25ea6859c..3211caf5f 100644 --- a/src/lib/components/support.svelte +++ b/src/lib/components/support.svelte @@ -10,6 +10,7 @@ import { app } from '$lib/stores/app'; import { currentPlan } from '$lib/stores/organization'; import { isCloud } from '$lib/system'; + import { Typography } from '@appwrite.io/pink-svelte'; export let show = false; @@ -61,21 +62,18 @@
{#if showHeader} -

Support

+ Support {/if} {#each supportOptions as option, index} {#if showCloudSupport(index)} + class="support-option-card " + style="border-radius: var(--border-radius-small, 8px); --gap-xl: 16px">
-

{option.label}

- -

- {option.description} -

+ {option.label} + {option.description}
{#if option.showSupport} From d09743fc64935e82e607df6f8eeb3fd1074f197b Mon Sep 17 00:00:00 2001 From: ernstmul Date: Mon, 3 Mar 2025 11:35:16 +0100 Subject: [PATCH 07/12] Fix: set correct action menu width --- src/lib/components/breadcrumbs.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/components/breadcrumbs.svelte b/src/lib/components/breadcrumbs.svelte index ca2d55d16..43f469bd7 100644 --- a/src/lib/components/breadcrumbs.svelte +++ b/src/lib/components/breadcrumbs.svelte @@ -348,7 +348,7 @@ From e1dfd367cc3df2e97d50933512f81389bd3051f2 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Mon, 3 Mar 2025 15:06:50 +0100 Subject: [PATCH 09/12] Update pink --- package.json | 2 +- pnpm-lock.yaml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 64914b6cf..ede3468cc 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@dd94b87a ", "@appwrite.io/pink-legacy": "^1.0.2", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9251adb", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@92f19f5", "@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 59586cd80..44bd1d1fc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,8 +24,8 @@ importers: specifier: ^1.0.2 version: 1.0.2 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9251adb - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9251adb(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@92f19f5 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@92f19f5(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -221,8 +221,8 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@ac51fcb} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9251adbe6cbe884afc7e103128486154b78bb151': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9251adbe6cbe884afc7e103128486154b78bb151} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@92f19f58b2d9458cb6eefc15e7085ae921e96286': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@92f19f58b2d9458cb6eefc15e7085ae921e96286} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -242,8 +242,8 @@ packages: '@appwrite.io/pink-legacy@1.0.2': resolution: {integrity: sha512-1AYNcfbV+x0Tyj56CoieSq5g7+u+7F5/LDVN/z+Hx1kp9gj7xc1eT39Dy832xxfihImF6ksjp0FXEMVSBR8cew==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9251adb': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9251adb} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@92f19f5': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@92f19f5} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4105,7 +4105,7 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@ac51fcb': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9251adbe6cbe884afc7e103128486154b78bb151(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@92f19f58b2d9458cb6eefc15e7085ae921e96286(svelte@4.2.19)': dependencies: svelte: 4.2.19 @@ -4122,9 +4122,9 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9251adb(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@92f19f5(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@9251adbe6cbe884afc7e103128486154b78bb151(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@92f19f58b2d9458cb6eefc15e7085ae921e96286(svelte@4.2.19) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.3(svelte@4.2.19))(svelte@4.2.19) '@melt-ui/svelte': 0.86.3(svelte@4.2.19) From b7808751d41466550b6269d5f67f7e53e341ee10 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Mon, 3 Mar 2025 15:08:24 +0100 Subject: [PATCH 10/12] Remove locally linked dep --- package.json | 1 - pnpm-lock.yaml | 3 --- 2 files changed, 4 deletions(-) diff --git a/package.json b/package.json index ede3468cc..429382447 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "ignore": "^6.0.2", "nanoid": "^5.0.8", "nanotar": "^0.1.1", - "pink-svelte": "link:../../../Library/pnpm/global/5/node_modules/@appwrite.io/pink-svelte", "plausible-tracker": "^0.3.9", "pretty-bytes": "^6.1.1", "prismjs": "^1.29.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 44bd1d1fc..5e1147657 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -65,9 +65,6 @@ importers: nanotar: specifier: ^0.1.1 version: 0.1.1 - pink-svelte: - specifier: link:../../../Library/pnpm/global/5/node_modules/@appwrite.io/pink-svelte - version: link:../../../Library/pnpm/global/5/node_modules/@appwrite.io/pink-svelte plausible-tracker: specifier: ^0.3.9 version: 0.3.9 From d079632c9cb8a3ea42a90c3ac36bf945de13d3a2 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Mon, 3 Mar 2025 15:09:05 +0100 Subject: [PATCH 11/12] Remove locally linked dep --- package.json | 7 +------ pnpm-lock.yaml | 3 --- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/package.json b/package.json index 429382447..e192064b6 100644 --- a/package.json +++ b/package.json @@ -80,10 +80,5 @@ "vitest": "^1.6.0" }, "type": "module", - "packageManager": "pnpm@10.4.1", - "pnpm": { - "overrides": { - "pink-svelte": "link:../../../Library/pnpm/global/5/node_modules/@appwrite.io/pink-svelte" - } - } + "packageManager": "pnpm@10.4.1" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5e1147657..a985a424b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,9 +4,6 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false -overrides: - pink-svelte: link:../../../Library/pnpm/global/5/node_modules/@appwrite.io/pink-svelte - importers: .: From 47c6452718256c403a3b279c855a27146b7b6c22 Mon Sep 17 00:00:00 2001 From: Ernst Mulders Date: Mon, 3 Mar 2025 15:15:45 +0100 Subject: [PATCH 12/12] Update src/lib/components/navbar.svelte Co-authored-by: Torsten Dittmann --- src/lib/components/navbar.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/components/navbar.svelte b/src/lib/components/navbar.svelte index 87a1ef2c2..3f7f5fe86 100644 --- a/src/lib/components/navbar.svelte +++ b/src/lib/components/navbar.svelte @@ -189,7 +189,7 @@ variant="text" aria-label="Toggle Command Center" on:click={toggleCommandCenter} - icon={true}> + icon> {isMac() ? '⌘ + K' : 'Ctrl + K'}