From ca3e4174c03d768ef803428e82ae35353ce6e29a Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 4 Feb 2025 18:02:07 +0100 Subject: [PATCH] chore: update pink --- package.json | 4 +- pnpm-lock.yaml | 32 +++++----- src/lib/components/tabs.svelte | 57 +---------------- src/lib/layout/cover.svelte | 2 +- .../organization-[organization]/header.svelte | 64 ++++++++----------- .../project-[project]/auth/+page.svelte | 4 +- 6 files changed, 51 insertions(+), 112 deletions(-) diff --git a/package.json b/package.json index 24f043682..80d488cf9 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,9 @@ "dependencies": { "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@9193", "@appwrite.io/pink-icons": "0.25.0", - "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@1e68aef5", + "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@ed1c55b6", "@appwrite.io/pink-legacy": "^1.0.0", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@1e68aef5", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@ed1c55b6", "@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 6d1f56a27..d157bce42 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,14 +15,14 @@ importers: specifier: 0.25.0 version: 0.25.0 '@appwrite.io/pink-icons-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@1e68aef5 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@1e68aef5(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@ed1c55b6 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@ed1c55b6(svelte@4.2.19) '@appwrite.io/pink-legacy': specifier: ^1.0.0 version: 1.0.0 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@1e68aef5 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@1e68aef5(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@ed1c55b6 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@ed1c55b6(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -107,7 +107,7 @@ importers: version: 6.6.3 '@testing-library/svelte': specifier: ^5.2.4 - version: 5.2.6(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))(vitest@1.6.0(@types/node@22.12.0)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sass@1.83.4)) + version: 5.2.6(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))(vitest@1.6.0) '@testing-library/user-event': specifier: ^14.5.2 version: 14.6.1(@testing-library/dom@10.4.0) @@ -218,14 +218,14 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@9193} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@1e68aef5': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@1e68aef5} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@ed1c55b6': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@ed1c55b6} 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@1e68aef5b9e86db01776ba1b734cecc49bb678e7': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@1e68aef5b9e86db01776ba1b734cecc49bb678e7} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@ed1c55b661bc7366834955c04bbcabca06a49e3d': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@ed1c55b661bc7366834955c04bbcabca06a49e3d} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -239,8 +239,8 @@ packages: '@appwrite.io/pink-legacy@1.0.0': resolution: {integrity: sha512-EZk/wX8oDhIsCXf2A0oQjdNOaHvh5MnWbLQI4pAiGrdy5qQGPoU19AK6iVX6z3QoOq7geoEu0zVwAowBy5hZbQ==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@1e68aef5': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@1e68aef5} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@ed1c55b6': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@ed1c55b6} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4089,11 +4089,11 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@9193': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@1e68aef5(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@ed1c55b6(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@1e68aef5b9e86db01776ba1b734cecc49bb678e7(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@ed1c55b661bc7366834955c04bbcabca06a49e3d(svelte@4.2.19)': dependencies: svelte: 4.2.19 @@ -4106,9 +4106,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@1e68aef5(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@ed1c55b6(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@1e68aef5b9e86db01776ba1b734cecc49bb678e7(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@ed1c55b661bc7366834955c04bbcabca06a49e3d(svelte@4.2.19) '@floating-ui/dom': 1.6.13 '@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) @@ -5349,7 +5349,7 @@ snapshots: lodash: 4.17.21 redent: 3.0.0 - '@testing-library/svelte@5.2.6(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))(vitest@1.6.0(@types/node@22.12.0)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sass@1.83.4))': + '@testing-library/svelte@5.2.6(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))(vitest@1.6.0)': dependencies: '@testing-library/dom': 10.4.0 svelte: 4.2.19 diff --git a/src/lib/components/tabs.svelte b/src/lib/components/tabs.svelte index 6f81b1208..8910320fe 100644 --- a/src/lib/components/tabs.svelte +++ b/src/lib/components/tabs.svelte @@ -1,58 +1,7 @@ - - -
- {#if showLeft} - - {/if} - {#if showRight} - - {/if} -
- - - -
-
+ + + diff --git a/src/lib/layout/cover.svelte b/src/lib/layout/cover.svelte index 6878720e8..6d836ef7d 100644 --- a/src/lib/layout/cover.svelte +++ b/src/lib/layout/cover.svelte @@ -10,7 +10,7 @@
- + diff --git a/src/routes/(console)/organization-[organization]/header.svelte b/src/routes/(console)/organization-[organization]/header.svelte index e3d18706c..d2740ce30 100644 --- a/src/routes/(console)/organization-[organization]/header.svelte +++ b/src/routes/(console)/organization-[organization]/header.svelte @@ -2,15 +2,7 @@ import { goto } from '$app/navigation'; import { base } from '$app/paths'; import { page } from '$app/stores'; - import { - AvatarGroup, - DropList, - DropListItem, - DropListLink, - Heading, - Tab, - Tabs - } from '$lib/components'; + import { AvatarGroup, Heading, Tab, Tabs } from '$lib/components'; import { BillingPlan } from '$lib/constants'; import { Pill } from '$lib/elements'; import { Button } from '$lib/elements/forms'; @@ -101,44 +93,42 @@ {#if $organization?.$id} - - - - {$organization.name} - - {#if isCloud && $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION} - - - {:else if isCloud && $organization?.billingPlan === BillingPlan.FREE} - FREE - {/if} - {#if isCloud && $organization?.billingTrialStartDate && $daysLeftInTrial > 0 && $organization.billingPlan !== BillingPlan.FREE && $plansInfo.get($organization.billingPlan)?.trialDays} - -
- TRIAL -
- {`Your trial ends on ${toLocaleDate( - $organization.billingStartDate - )}. ${$daysLeftInTrial} days remaining.`} -
- {/if} + + + {$organization.name} -
+ {#if isCloud && $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION} + + + {:else if isCloud && $organization?.billingPlan === BillingPlan.FREE} + FREE + {/if} + {#if isCloud && $organization?.billingTrialStartDate && $daysLeftInTrial > 0 && $organization.billingPlan !== BillingPlan.FREE && $plansInfo.get($organization.billingPlan)?.trialDays} + +
+ TRIAL +
+ {`Your trial ends on ${toLocaleDate( + $organization.billingStartDate + )}. ${$daysLeftInTrial} days remaining.`} +
+ {/if} +
- +
{#if $isOwner}