Skip to content

Use domain.verified #2785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
hmacr wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use domain.verified #2785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"dependencies": {
"@ai-sdk/svelte": "^1.1.24",
"@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@9c55755",
"@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@8e384ac",
"@appwrite.io/pink-icons": "0.25.0",
"@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@bbad65f",
"@appwrite.io/pink-legacy": "^1.0.3",
Expand Down
24 changes: 19 additions & 5 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions src/routes/(console)/organization-[organization]/domains/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@
let showDelete = false;
let showRetry = false;
let selectedDomain: Models.Domain = null;

const isDomainVerified = (domain: Models.Domain) => {
return domain.nameservers.toLowerCase() === 'appwrite';
};
</script>

<Container>
Expand Down Expand Up @@ -90,7 +86,7 @@
{domain.domain}
</Typography.Text>
</Link>
{#if !isDomainVerified(domain)}
{#if !domain.verified}
<Badge
variant="secondary"
type="error"
Expand Down Expand Up @@ -132,7 +128,7 @@

<svelte:fragment slot="tooltip" let:toggle>
<ActionMenu.Root>
{#if !isDomainVerified(domain)}
{#if !domain.verified}
<ActionMenu.Item.Button
leadingIcon={IconRefresh}
on:click={(e) => {
Expand Down
3 changes: 1 addition & 2 deletions src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
});

await invalidate(Dependencies.DOMAINS);
const verified = domain.nameservers.toLowerCase() === 'appwrite';
if (verified) {
if (domain.verified) {
await goto(backPage);
addNotification({
type: 'success',
Expand Down
8 changes: 3 additions & 5 deletions ...routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@
retryVerification: () => void;
} = $props();

const isDomainVerified = $derived(domain.nameservers.toLowerCase() === 'appwrite');

const metrics = $derived([
{
value: isDomainVerified ? 'Verified' : 'Not verified',
value: domain.verified ? 'Verified' : 'Not verified',
description: 'Status'
},
{
Expand Down Expand Up @@ -56,9 +54,9 @@
<Status
--font-size-s="var(--font-size-xs)"
label={metric.value.toString()}
status={isDomainVerified ? 'complete' : 'pending'} />
status={domain.verified ? 'complete' : 'pending'} />

{#if !isDomainVerified}
{#if !domain.verified}
<Link size="s" on:click={retryVerification}>Retry</Link>
{/if}
</Layout.Stack>
Expand Down
3 changes: 1 addition & 2 deletions src/routes/(console)/organization-[organization]/domains/recordsCard.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
async function verifyStatus() {
try {
domain = await sdk.forConsole.domains.updateNameservers({ domainId: domain.$id });
verified = domain.nameservers.toLowerCase() === 'appwrite';
if (verified) {
if (domain.verified) {
addNotification({
type: 'success',
message: 'Domain verified successfully'
Expand Down
3 changes: 1 addition & 2 deletions src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@

await Promise.all([invalidate(Dependencies.DOMAIN), invalidate(Dependencies.DOMAINS)]);

const verified = domain?.nameservers.toLowerCase() === 'appwrite';
if (!verified) {
if (!domain.verified) {
throw new Error(
'Domain verification failed. Please check your domain settings or try again later'
);
Expand Down
Loading