diff --git a/package.json b/package.json index 82989cec4..dbbcb2fa8 100644 --- a/package.json +++ b/package.json @@ -23,9 +23,9 @@ "dependencies": { "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@7773939", "@appwrite.io/pink-icons": "0.25.0", - "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@6c85487", + "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@6c85487", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@bd21ff7f", "@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 38d52105d..d4b835570 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@6c85487 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@6c85487(svelte@5.25.3) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f(svelte@5.25.3) '@appwrite.io/pink-legacy': specifier: ^1.0.3 version: 1.0.3 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@6c85487 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@6c85487(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@bd21ff7f + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@bd21ff7f(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -221,14 +221,14 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@7773939} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@6c85487': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@6c85487} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f} 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@6c85487cf9b15630ea5b7df69b56e02877dbdf1c': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@6c85487cf9b15630ea5b7df69b56e02877dbdf1c} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f1fe1b018f3ef6aa6091874b28cfc4554': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f1fe1b018f3ef6aa6091874b28cfc4554} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -242,8 +242,8 @@ packages: '@appwrite.io/pink-legacy@1.0.3': resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@6c85487': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@6c85487} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@bd21ff7f': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@bd21ff7f} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -3536,11 +3536,11 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@7773939': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@6c85487(svelte@5.25.3)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f(svelte@5.25.3)': dependencies: svelte: 5.25.3 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@6c85487cf9b15630ea5b7df69b56e02877dbdf1c(svelte@5.25.3)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f1fe1b018f3ef6aa6091874b28cfc4554(svelte@5.25.3)': dependencies: svelte: 5.25.3 @@ -3553,9 +3553,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@6c85487(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@bd21ff7f(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@6c85487cf9b15630ea5b7df69b56e02877dbdf1c(svelte@5.25.3) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f1fe1b018f3ef6aa6091874b28cfc4554(svelte@5.25.3) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.6(svelte@5.25.3))(svelte@5.25.3) '@melt-ui/svelte': 0.86.6(svelte@5.25.3) diff --git a/src/routes/(console)/organization-[organization]/domains/+page.svelte b/src/routes/(console)/organization-[organization]/domains/+page.svelte index dddcb3ffe..555b0d147 100644 --- a/src/routes/(console)/organization-[organization]/domains/+page.svelte +++ b/src/routes/(console)/organization-[organization]/domains/+page.svelte @@ -20,7 +20,8 @@ Icon, Layout, Popover, - Table + Table, + Typography } from '@appwrite.io/pink-svelte'; import DeleteDomainModal from './deleteDomainModal.svelte'; import RetryDomainModal from './retryDomainModal.svelte'; @@ -73,25 +74,27 @@ href={`${base}/organization-${page.params.organization}/domains/domain-${domain.$id}`}> {#each $columns as column} - {#if column.id === 'domain'} - - {domain.domain} - - {:else if column.id === 'registrar'} - {domain.registrar || '-'} - {:else if column.id === 'nameservers'} - {domain.nameservers || '-'} - {:else if column.id === 'expiry_date'} - {domain?.expiry ? toLocaleDateTime(domain.expiry) : '-'} - {:else if column.id === 'renewal'} - {domain?.renewal ? toLocaleDateTime(domain.renewal) : '-'} - {:else if column.id === 'auto_renewal'} - {domain?.autoRenewal ? 'On' : 'Off'} - {/if} + + {#if column.id === 'domain'} + + {domain.domain} + + {:else if column.id === 'registrar'} + {domain.registrar || '-'} + {:else if column.id === 'nameservers'} + {domain.nameservers || '-'} + {:else if column.id === 'expiry_date'} + {domain?.expiry ? toLocaleDateTime(domain.expiry) : '-'} + {:else if column.id === 'renewal'} + {domain?.renewal ? toLocaleDateTime(domain.renewal) : '-'} + {:else if column.id === 'auto_renewal'} + {domain?.autoRenewal ? 'On' : 'Off'} + {/if} + {/each} diff --git a/src/routes/(console)/organization-[organization]/domains/store.ts b/src/routes/(console)/organization-[organization]/domains/store.ts index b8a22477d..87872c277 100644 --- a/src/routes/(console)/organization-[organization]/domains/store.ts +++ b/src/routes/(console)/organization-[organization]/domains/store.ts @@ -3,9 +3,9 @@ import { writable } from 'svelte/store'; export const columns = writable([ { id: 'domain', title: 'Domain', type: 'string', width: { min: 300 } }, - { id: 'registrar', title: 'Registrar', type: 'string' }, - { id: 'nameservers', title: 'Nameservers', type: 'string' }, - { id: 'expiry_date', title: 'Expiry Date', type: 'datetime' }, - { id: 'renewal', title: 'Renewal', type: 'boolean' }, - { id: 'auto_renewal', title: 'Auto Renewal', type: 'boolean' } + { id: 'registrar', title: 'Registrar', type: 'string', width: { min: 120 } }, + { id: 'nameservers', title: 'Nameservers', type: 'string', width: { min: 120 } }, + { id: 'expiry_date', title: 'Expiry Date', type: 'datetime', width: { min: 120 } }, + { id: 'renewal', title: 'Renewal', type: 'datetime', width: { min: 120 } }, + { id: 'auto_renewal', title: 'Auto Renewal', type: 'boolean', width: { min: 80 } } ]); diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte index 80a3d9bb5..898212605 100644 --- a/src/routes/(console)/organization-[organization]/members/+page.svelte +++ b/src/routes/(console)/organization-[organization]/members/+page.svelte @@ -79,10 +79,10 @@ @@ -107,16 +107,18 @@ - + {member.userName ? member.userName : 'n/a'} - + {#if member.invited && !member.joined} {/if} - {member.userEmail} + + {member.userEmail} + {member.roles.map((role) => getRoleLabel(role)).join(', ')}