feat: more work on domains

This commit is contained in:
Arman committed 2025-02-18 17:12:29 +01:00
1 parent 3f9718f42b
commit cde7f904d7
14 files changed
+380 -179

No files matched your search

+4 -4
View File
@@ -8,15 +8,15 @@
<Card radius="s" padding="xs" isTile>
<Layout.Stack gap="xxs">
<Typography.Text variant="m-400" color="--color-fgcolor-neutral-tertiary">
{description}
</Typography.Text>
<slot>
{#if value !== null && value !== undefined}
<Typography.Title size="s">{value}</Typography.Title>
<Typography.Title size="s" truncate>{value}</Typography.Title>
{:else}
<Skeleton variant="line" width={100} height={26} />
{/if}
</slot>
<Typography.Text variant="m-400" color="--color-fgcolor-neutral-tertiary">
{description}
</Typography.Text>
</Layout.Stack>
</Card>
@@ -94,11 +94,11 @@
{/if}
</Layout.Stack>
</Table.Cell>
<Table.Cell>{domain?.registrar ?? 'N/A'}</Table.Cell>
<Table.Cell>{domain?.nameservers ?? 'N/A'}</Table.Cell>
<Table.Cell>{domain?.expiry ?? 'N/A'}</Table.Cell>
<Table.Cell>{domain?.registrar ?? '-'}</Table.Cell>
<Table.Cell>{domain?.nameservers ?? '-'}</Table.Cell>
<Table.Cell>{domain?.expiry ?? '-'}</Table.Cell>
<Table.Cell>
{domain.renewAt ? toLocaleDateTime(domain.renewAt) : 'N/A'}
{domain.renewAt ? toLocaleDateTime(domain.renewAt) : '-'}
</Table.Cell>
<Table.Cell>{domain.autoRenewal ? 'On' : 'Off'}</Table.Cell>
<Table.Cell>
@@ -4,145 +4,107 @@
ActionMenu,
Card,
Empty,
HiddenText,
Icon,
InlineCode,
Layout,
Popover,
Table,
Typography
Button as PinkButton,
Popover
} from '@appwrite.io/pink-svelte';
import DomainMetrics from './domainMetrics.svelte';
import { base } from '$app/paths';
import { app } from '$lib/stores/app';
import { Button } from '$lib/elements/forms';
import { IconDotsHorizontal, IconPencil, IconTrash } from '@appwrite.io/pink-icons-svelte';
import { PaginationWithLimit } from '$lib/components';
import { timeFromNow } from '$lib/helpers/date';
import { IconDownload, IconPlus, IconUpload } from '@appwrite.io/pink-icons-svelte';
import { ViewSelector } from '$lib/components';
import { View } from '$lib/helpers/load';
import { columns } from './store';
import CreateRecordModal from './createRecordModal.svelte';
import Table from './table.svelte';
import AddPresetModal from './addPresetModal.svelte';
export let data;
let selectedRecord; //TODO: add type
let showCreate = false;
let showEdit = false;
let showDelete = false;
let showPresetModal = false;
let selectedPreset = '';
const presets = ['Zoho', 'Mailgun', 'Outlook', 'Proton Mail', 'iCloud', 'Google Workspace'];
</script>
<Container>
<DomainMetrics domain={data.domain} />
<Layout.Stack gap="xxl">
<DomainMetrics domain={data.domain} />
{#if data.records.total}
<Table.Root>
<svelte:fragment slot="header">
<Table.Header.Cell>Name</Table.Header.Cell>
<Table.Header.Cell>Type</Table.Header.Cell>
<Table.Header.Cell>Value</Table.Header.Cell>
<Table.Header.Cell>TTL</Table.Header.Cell>
<Table.Header.Cell>Created</Table.Header.Cell>
<Table.Header.Cell />
</svelte:fragment>
{#each data.records.records as record}
<Table.Row>
<Table.Cell>
<Typography.Code>
{record.name}
</Typography.Code>
</Table.Cell>
<Table.Cell>
<Typography.Text>
{record.type}
</Typography.Text>
</Table.Cell>
<Table.Cell>
<HiddenText text={record.value} isVisible />
</Table.Cell>
<Table.Cell>
<Typography.Text>
{record.ttl}
</Typography.Text>
</Table.Cell>
<Table.Cell>
<Typography.Text>
{timeFromNow(record.$createdAt)}
</Typography.Text>
</Table.Cell>
<Table.Cell>
<Layout.Stack direction="row" justifyContent="flex-end">
<Popover let:toggle placement="bottom-start" padding="none">
<Button
text
icon
on:click={(e) => {
e.preventDefault();
toggle(e);
}}>
<Icon icon={IconDotsHorizontal} size="s" />
</Button>
<svelte:fragment slot="tooltip" let:toggle>
<ActionMenu.Root>
<Layout.Stack gap="l">
{#if data.records.total}
<Layout.Stack direction="row" justifyContent="space-between">
<Layout.Stack direction="row" gap="s" inline>
<Button secondary>
<Icon icon={IconUpload} size="s" slot="start" />
Import zone file
</Button>
<PinkButton.Button variant="secondary" icon>
<Icon icon={IconDownload} size="s" />
</PinkButton.Button>
</Layout.Stack>
<Layout.Stack direction="row" gap="s" inline>
<ViewSelector view={View.Table} {columns} hideView allowNoColumns />
<Popover let:toggle>
<Button secondary on:click={toggle}>Add preset</Button>
<svelte:fragment slot="tooltip">
<ActionMenu.Root>
{#each presets as preset}
<ActionMenu.Item.Button
leadingIcon={IconPencil}
on:click={(e) => {
e.preventDefault();
selectedRecord = record;
showEdit = true;
toggle(e);
}}>
Edit
</ActionMenu.Item.Button>
<ActionMenu.Item.Button
status="danger"
leadingIcon={IconTrash}
on:click={(e) => {
e.preventDefault();
selectedRecord = record;
showDelete = true;
toggle(e);
}}>
Delete
</ActionMenu.Item.Button>
</ActionMenu.Root>
</svelte:fragment>
</Popover>
</Layout.Stack>
</Table.Cell>
</Table.Row>
{/each}
</Table.Root>
on:click={() => {
selectedPreset = preset;
showPresetModal = true;
}}>{preset}</ActionMenu.Item.Button>
{/each}
</ActionMenu.Root>
</svelte:fragment>
</Popover>
<Button size="s" on:click={() => (showCreate = true)}>
<Icon size="s" icon={IconPlus} slot="start" />
Create record
</Button>
</Layout.Stack>
</Layout.Stack>
<Table {data} />
{:else}
<Card.Base padding="none">
<Empty
src={$app.themeInUse === 'dark'
? `${base}/images/domains/empty-records-dark.svg`
: `${base}/images/domains/empty-records-light.svg`}
title="Get started with Appwrite DNS">
<span slot="description">
Navigate to your domain provider and update the nameservers to <InlineCode
code="ns1.appwrite-dns.com"
size="s" /> and <InlineCode code="ns2.appwrite-dns.com" size="s" />.
Note that DNS changes may take time to propagate fully.
</span>
<svelte:fragment slot="actions">
<Button
external
href="#"
text
event="empty_documentation"
size="s"
ariaLabel="add domain">Documentation</Button>
<PaginationWithLimit
name="Domains"
limit={data.limit}
offset={data.offset}
total={data.records.total} />
{:else}
<Card.Base padding="none">
<Empty
src={$app.themeInUse === 'dark'
? `${base}/images/domains/empty-records-dark.svg`
: `${base}/images/domains/empty-records-light.svg`}
title="Get started with Appwrite DNS">
<span slot="description">
Navigate to your domain provider and update the nameservers to <InlineCode
code="ns1.appwrite-dns.com"
size="s" /> and <InlineCode code="ns2.appwrite-dns.com" size="s" />. Note
that DNS changes may take time to propagate fully.
</span>
<svelte:fragment slot="actions">
<Button
external
href="#"
text
event="empty_documentation"
size="s"
ariaLabel="add domain">Documentation</Button>
<Button secondary size="s">Verify DNS setup</Button>
</svelte:fragment>
</Empty>
</Card.Base>
{/if}
<Button secondary size="s">Verify DNS setup</Button>
</svelte:fragment>
</Empty>
</Card.Base>
{/if}
</Layout.Stack>
</Layout.Stack>
</Container>
{#if showCreate}
<CreateRecordModal bind:show={showCreate} />
{/if}
{#if showPresetModal}
<AddPresetModal bind:show={showPresetModal} {selectedPreset} />
{/if}
@@ -1,29 +0,0 @@
<script lang="ts">
import { CardGrid } from '$lib/components';
import type { Models } from '@appwrite.io/console';
import { Table } from '@appwrite.io/pink-svelte';
export let domain: Models.ProxyRule;
</script>
<CardGrid>
<svelte:fragment slot="title">SSL certificates</svelte:fragment>
SSL certificates secure your site with HTTPS, protecting data and boosting trust. Appwrite renews
your SSL certificates automatically.
<svelte:fragment slot="aside">
<Table.Root>
<svelte:fragment slot="header">
<Table.Header.Cell>Domain</Table.Header.Cell>
<Table.Header.Cell>Expiration date</Table.Header.Cell>
<Table.Header.Cell>Renewal</Table.Header.Cell>
<Table.Header.Cell>Created</Table.Header.Cell>
<Table.Header.Cell />
</svelte:fragment>
{#each domain.logs as log}
<Table.Row>
{JSON.stringify(log)}
</Table.Row>
{/each}
</Table.Root>
</svelte:fragment>
</CardGrid>
@@ -0,0 +1,83 @@
<script lang="ts">
import { Button } from '$lib/elements/forms';
import { Modal } from '$lib/components';
import { addNotification } from '$lib/stores/notifications';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import { Skeleton, Table } from '@appwrite.io/pink-svelte';
import { onMount } from 'svelte';
import { capitalize } from '$lib/helpers/string';
export let show = false;
export let selectedPreset;
let error = '';
async function fetchPreset() {
//TODO: fetch preset data
let presetData;
return presetData;
}
async function handleSubmit() {
try {
//TODO: create DNS records
show = false;
addNotification({
type: 'success',
message: `Preset has been added`
});
trackEvent(Submit.RecordCreate, {
preset: selectedPreset
});
} catch (e) {
error = e.message;
trackError(e, Submit.RecordCreate);
}
}
</script>
<Modal
title={`Add ${capitalize(selectedPreset)} DNS record`}
bind:show
bind:error
onSubmit={handleSubmit}>
<span slot="description">
Forward emails to your domain using the following {capitalize(selectedPreset)} DNS records.
</span>
<Table.Root>
<svelte:fragment slot="header">
<Table.Header.Cell>Type</Table.Header.Cell>
<Table.Header.Cell>Name</Table.Header.Cell>
<Table.Header.Cell>Value</Table.Header.Cell>
<Table.Header.Cell>TTL</Table.Header.Cell>
<Table.Header.Cell>Priority</Table.Header.Cell>
</svelte:fragment>
{#await fetchPreset()}
{#each Array(2) as _}
<Table.Row>
{#each Array(5) as _}
<Table.Cell>
<Skeleton variant="line" width={70} height={15} />
</Table.Cell>
{/each}
</Table.Row>
{/each}
{:then presetData}
{#each presetData as record}
<Table.Row>
<Table.Cell>{record.type}</Table.Cell>
<Table.Cell>{record.name}</Table.Cell>
<Table.Cell>{record.value}</Table.Cell>
<Table.Cell>{record.ttl}</Table.Cell>
<Table.Cell>{record.priority}</Table.Cell>
</Table.Row>
{/each}
{/await}
</Table.Root>
<svelte:fragment slot="footer">
<Button text on:click={() => (show = false)}>Cancel</Button>
<Button size="s" submit>Add</Button>
</svelte:fragment>
</Modal>
@@ -1,33 +1,38 @@
<script lang="ts">
import { EmptySearch, Id, PaginationWithLimit } from '$lib/components/index.js';
import { Button } from '$lib/elements/forms';
import { toLocaleDateTime } from '$lib/helpers/date';
import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date';
import Container from '$lib/layout/container.svelte';
import { IconDotsHorizontal, IconInfo, IconTrash } from '@appwrite.io/pink-icons-svelte';
import {
ActionMenu,
Badge,
Card,
Empty,
Icon,
Layout,
Popover,
Table
Table,
Tooltip
} from '@appwrite.io/pink-svelte';
import SearchQuery from '$lib/components/searchQuery.svelte';
import { base } from '$app/paths';
import { page } from '$app/stores';
import CertificateInfoModal from './certificateInfoModal.svelte';
import DeleteCertificateModal from './deleteCertificateModal.svelte';
export let data;
let showDelete = false;
let showAdvancedInfo = false;
let selectedCertificate = null; //TODO: add type
const now = new Date();
</script>
<Container>
<Layout.Stack direction="row" justifyContent="space-between">
<SearchQuery search={data.search} placeholder="Search domains" />
<SearchQuery search={data.search} placeholder="Search by ID" />
</Layout.Stack>
{#if data.certificates.total}
@@ -39,15 +44,41 @@
<Table.Header.Cell />
</svelte:fragment>
{#each data.certificates.certificates as certificate}
{@const isExpired = new Date(certificate.expiresAt) < now}
<Table.Row>
<Table.Cell>
<Id value={certificate.$id}>{certificate.$id}</Id>
</Table.Cell>
<Table.Cell>
{certificate.autoRenewal ? 'Auto' : ''}
{certificate.renewAt ? toLocaleDateTime(certificate.renewAt) : '-'}
{#if certificate?.renewAt && !isExpired}
<Layout.Stack direction="row" gap="xs">
{certificate.autoRenewal ? 'Auto' : ''}
<Badge
size="xs"
variant="secondary"
content={`Next renewal in ${toLocaleDate(certificate.renewAt)}`}
type="success" />
</Layout.Stack>
{:else}
-
{/if}
</Table.Cell>
<Table.Cell>
{#if isExpired}
<Tooltip>
<Badge
variant="secondary"
content="Expired"
type="warning"
size="xs" />
<span slot="tooltip">
{toLocaleDateTime(certificate?.expiresAt)}
</span>
</Tooltip>
{:else}
{toLocaleDate(certificate?.expiresAt)}
{/if}
</Table.Cell>
<Table.Cell>{certificate?.expiresAt ?? '-'}</Table.Cell>
<Table.Cell>
<Layout.Stack direction="row" justifyContent="flex-end">
@@ -132,3 +163,6 @@
{#if showAdvancedInfo}
<CertificateInfoModal {selectedCertificate} show={showAdvancedInfo} />
{/if}
{#if showDelete}
<DeleteCertificateModal {selectedCertificate} show={showDelete} />
{/if}
@@ -28,7 +28,7 @@ const mockCertificates = {
renewAt: '2023-01-15T10:30:00Z',
autoRenewal: true,
issuedAt: '2023-01-15T10:30:00Z',
expiresAt: '2024-01-15T10:30:00Z',
expiresAt: '2026-01-15T10:30:00Z',
issuer: "Let's Encrypt",
status: 'active',
type: 'SSL/TLS',
@@ -1,13 +1,13 @@
<script lang="ts">
import { Button, InputText, InputTextarea } from '$lib/elements/forms';
import { Confirm } from '$lib/components';
import { Modal } from '$lib/components';
import { Layout, Typography } from '@appwrite.io/pink-svelte';
export let show = false;
export let selectedCertificate; //TODO: add type
</script>
<Confirm title="Advanced information" bind:open={show}>
<Modal title="Advanced information" bind:show>
<Layout.Stack gap="xxl">
<Layout.Stack gap="s">
<Typography.Text variant="m-600">Issued to</Typography.Text>
@@ -69,4 +69,4 @@
<Button text on:click={() => (show = false)}>Cancel</Button>
<Button secondary submit danger>Delete</Button>
</svelte:fragment>
</Confirm>
</Modal>
@@ -7,7 +7,7 @@
InputTextarea
} from '$lib/elements/forms';
import { Modal } from '$lib/components';
import { Icon, Input, Layout, Tooltip, Typography } from '@appwrite.io/pink-svelte';
import { Icon, Layout, Tooltip } from '@appwrite.io/pink-svelte';
import { IconInfo } from '@appwrite.io/pink-icons-svelte';
import { addNotification } from '$lib/stores/notifications';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
@@ -147,6 +147,6 @@
<svelte:fragment slot="footer">
<Button text on:click={() => (show = false)}>Cancel</Button>
<Button secondary submit danger>Delete</Button>
<Button secondary submit>Create DNS record</Button>
</svelte:fragment>
</Modal>
@@ -11,15 +11,15 @@
description: 'Domain'
},
{
value: domain?.registrar || 'N/A',
value: domain?.registrar || '-',
description: 'Registrar'
},
{
value: domain?.nameservers || 'N/A',
value: domain?.nameservers || '-',
description: 'Nameservers'
},
{
value: domain?.expiresAt ? toLocaleDate(domain?.expiresAt) : 'N/A',
value: domain?.expiresAt ? toLocaleDate(domain?.expiresAt) : '-',
description: 'Exipiry date'
},
{
@@ -27,7 +27,7 @@
description: 'Auto renewal'
},
{
value: domain?.renewalPrice || 'N/A',
value: domain?.renewalPrice || '-',
description: 'Renewal price'
}
];
@@ -1,4 +1,5 @@
<script lang="ts">
import { page } from '$app/stores';
import { CardGrid } from '$lib/components';
import { Button, InputSelect } from '$lib/elements/forms';
import type { OrganizationList } from '$lib/stores/organization';
@@ -13,7 +14,9 @@
}
$: options = organizations.total
? organizations.teams.map((org) => ({ label: org.name, value: org.$id }))
? organizations.teams
.map((org) => ({ label: org.name, value: org.$id }))
.filter((org) => org.value !== $page.params.organization)
: [];
</script>
@@ -25,6 +28,7 @@
id="orgs"
label="Move to"
placeholder="Select destination"
disabled={options?.length === 0}
{options}
bind:value={selectedOrg} />
</svelte:fragment>
@@ -1,5 +1,16 @@
import { page } from '$app/stores';
import type { Column } from '$lib/helpers/types';
import type { Models } from '@appwrite.io/console';
import { derived } from 'svelte/store';
import { derived, writable } from 'svelte/store';
export const domain = derived(page, ($page) => $page.data.domain as Models.ProxyRule);
// columns: namem type, value, ttl, priority, comment, created
export const columns = writable<Column[]>([
{ id: 'name', title: 'Name', type: 'string', show: true },
{ id: 'type', title: 'Type', type: 'string', show: true },
{ id: 'value', title: 'Value', type: 'string', show: true },
{ id: 'ttl', title: 'TTL', type: 'integer', show: true },
{ id: 'priority', title: 'Priority', type: 'integer', show: false },
{ id: 'comment', title: 'Comment', type: 'string', show: false },
{ id: '$createdAt', title: 'Created', type: 'datetime', show: true }
]);
@@ -0,0 +1,137 @@
<script lang="ts">
import { PaginationWithLimit } from '$lib/components';
import {
ActionMenu,
HiddenText,
Icon,
Layout,
Popover,
Table,
Typography
} from '@appwrite.io/pink-svelte';
import { IconDotsHorizontal, IconPencil, IconTrash } from '@appwrite.io/pink-icons-svelte';
import { columns } from './store';
import { timeFromNow } from '$lib/helpers/date';
import { Button } from '$lib/elements/forms';
export let data;
let showEdit = false;
let showDelete = false;
let selectedRecord; //TODO: add type
</script>
<Layout.Stack>
<Table.Root>
<svelte:fragment slot="header">
{#each $columns as column}
{#if column.show}
<Table.Header.Cell width={column?.width?.toString() ?? ''}>
{column.title}
</Table.Header.Cell>
{/if}
{/each}
<Table.Header.Cell width="40" />
</svelte:fragment>
{#each data.records.records as record}
<Table.Row>
{#each $columns as column}
{#if column.show}
{#if column.id === 'name'}
<Table.Cell>
<Typography.Code>
{record.name}
</Typography.Code>
</Table.Cell>
{:else if column.id === 'type'}
<Table.Cell>
<Typography.Text>
{record.type}
</Typography.Text>
</Table.Cell>
{:else if column.id === 'value'}
<Table.Cell>
<div>
<HiddenText text={record.value} isVisible />
</div>
</Table.Cell>
{:else if column.id === 'ttl'}
<Table.Cell>
<Typography.Text>
{record.ttl}
</Typography.Text>
</Table.Cell>
{:else if column.id === 'priority'}
<Table.Cell>
<Typography.Text>
{record?.priority ?? '-'}
</Typography.Text>
</Table.Cell>
{:else if column.id === 'comment'}
<Table.Cell>
<Typography.Text>
{record?.comment ?? '-'}
</Typography.Text>
</Table.Cell>
{:else if column.id === '$createdAt'}
<Table.Cell>
<Typography.Text>
{timeFromNow(record.$createdAt)}
</Typography.Text>
</Table.Cell>
{/if}
{/if}
{/each}
<Table.Cell>
<Layout.Stack direction="row" justifyContent="flex-end">
<Popover let:toggle placement="bottom-start" padding="none">
<Button
text
icon
on:click={(e) => {
e.preventDefault();
toggle(e);
}}>
<Icon icon={IconDotsHorizontal} size="s" />
</Button>
<svelte:fragment slot="tooltip" let:toggle>
<ActionMenu.Root>
<ActionMenu.Item.Button
leadingIcon={IconPencil}
on:click={(e) => {
e.preventDefault();
selectedRecord = record;
showEdit = true;
toggle(e);
}}>
Edit
</ActionMenu.Item.Button>
<ActionMenu.Item.Button
status="danger"
leadingIcon={IconTrash}
on:click={(e) => {
e.preventDefault();
selectedRecord = record;
showDelete = true;
toggle(e);
}}>
Delete
</ActionMenu.Item.Button>
</ActionMenu.Root>
</svelte:fragment>
</Popover>
</Layout.Stack>
</Table.Cell>
</Table.Row>
{/each}
</Table.Root>
<PaginationWithLimit
name="Domains"
limit={data.limit}
offset={data.offset}
total={data.records.total} />
</Layout.Stack>
@@ -96,7 +96,6 @@
);
// Add domain
console.log('test');
await sdk.forProject.proxy.createRule(
`${domain}.${$consoleVariables._APP_DOMAIN_SITES}`,
ResourceType.Site,