Merge branch 'feat-pink-v2' of https://github.com/appwrite/console into feat-pink-v2

This commit is contained in:
Torsten Dittmann committed 2025-03-03 14:34:38 +04:00
commit e27f9e63bf
17 files changed
+146 -127

No files matched your search

+2 -2
View File
@@ -45,8 +45,8 @@
title="No installation was added to the project yet"
description="Add an installation to connect repositories">
<svelte:fragment slot="actions">
<Button size="m" secondary href={connectGitHub().toString()} disabled={!isVcsEnabled}>
<Icon slot="start" icon={IconGithub} size="m" />
<Button secondary href={connectGitHub().toString()} disabled={!isVcsEnabled}>
<Icon slot="start" icon={IconGithub} />
Connect to GitHub
</Button>
</svelte:fragment>
+2 -2
View File
@@ -18,10 +18,10 @@ export enum View {
Grid = 'grid'
}
export function getView(url: URL, route: Page['route'], fallback: View): View {
export function getView(url: URL, route: Page['route'], fallback: View, overwrite?: View): View {
return (url.searchParams.get('view') ?? preferences.get(route).view) === View.Grid
? View.Grid
: (View.Table ?? fallback);
: (overwrite ?? View.Table ?? fallback);
}
export function getColumns(route: Page['route'], fallback: string[]): string[] {
@@ -35,21 +35,21 @@
{#if !$isTabletViewport}
<Sidebar.Base state="open" resizable={false}>
<section class="list-container" slot="top" style:width="100%">
<h5
class="u-flex u-cross-center body-text-2 u-gap-8 u-padding-inline-12 u-padding-block-8 is-not-mobile is-selected">
<a
href={`${base}/project-${project}/databases/database-${databaseId}`}
class="database-name u-flex u-cross-center body-text-2 u-gap-8 is-not-mobile is-selected">
<Icon icon={IconDatabase} size="s" color="--color-fgcolor-neutral-weak" />
{data.database.name}
</h5>
</a>
<div class="collection-content">
{#if data?.allCollections?.total}
<ul
class="drop-list u-padding-inline-8 u-margin-inline-start-20 u-margin-block-start-8">
<ul class="drop-list u-margin-inline-start-8 u-margin-block-start-8">
{#each sortedCollections as collection}
{@const href = `${base}/project-${project}/databases/database-${databaseId}/collection-${collection.$id}`}
{@const isSelected = collectionId === collection.$id}
<li class:is-selected={isSelected}>
<a
class="u-padding-block-4 u-padding-inline-12 u-flex u-cross-center u-gap-8"
class="u-padding-block-4 u-padding-inline-end-4 u-padding-inline-start-8 u-flex u-cross-center u-gap-8"
{href}>
<Icon
icon={IconTable}
@@ -133,6 +133,12 @@
min-height: 0;
}
.database-name {
font-size: var(--font-size-sm);
font-weight: 500;
color: var(--color-fgcolor-neutral-secondary);
}
.collection-content {
flex: 1;
overflow-y: auto;
@@ -166,9 +172,14 @@
.drop-list {
border-left: 1px solid var(--color-border-neutral, #ededf0);
flex: 1;
padding-left: 4px;
font-size: var(--font-size-sm);
font-weight: 500;
color: var(--color-fgcolor-neutral-secondary);
.is-selected,
li:hover {
color: var(--color-fgcolor-neutral-primary);
border-radius: var(--border-radius-xs, 4px);
background: var(--color-bgcolor-neutral-tertiary, #fafafb);
}
@@ -1,14 +1,7 @@
<script lang="ts">
import { goto } from '$app/navigation';
import { page } from '$app/stores';
import {
Alert,
Arrow,
AvatarGroup,
CardGrid,
PaginationInline,
SvgIcon
} from '$lib/components';
import { Alert, CardGrid, PaginationInline } from '$lib/components';
import { Button } from '$lib/elements/forms';
import { sdk } from '$lib/stores/sdk';
import type { Models } from '@appwrite.io/console';
@@ -17,18 +10,21 @@
import dayjs from 'dayjs';
import { isSelfHosted } from '$lib/system';
import { consoleVariables } from '$routes/(console)/store';
import { ActionMenu, Icon, Popover, Table } from '@appwrite.io/pink-svelte';
import {
IconAppwrite,
IconAzure,
IconBitBucket,
ActionMenu,
Card,
Empty,
Icon,
Layout,
Popover,
Table
} from '@appwrite.io/pink-svelte';
import {
IconExternalLink,
IconGithub,
IconGitlab,
IconPlus,
IconXCircle
} from '@appwrite.io/pink-icons-svelte';
import Avatar from '$lib/components/avatar.svelte';
export let total: number;
export let limit: number;
@@ -156,51 +152,37 @@
</Table.Root>
</div>
{#if total > limit}
<div class="u-flex u-main-space-between">
<Layout.Stack justifyContent="space-between">
<p class="text">Total installations: {total}</p>
<PaginationInline
{limit}
sum={total}
on:change={navigateInstallations}
bind:offset />
</div>
</Layout.Stack>
{/if}
{:else}
{#if isSelfHosted && !isVcsEnabled}
<Alert type="info">
<svelte:fragment slot="title">
Installing Git to a self-hosted instance
</svelte:fragment>
When installing Git in a locally hosted Appwrite project, you must first configure
environment variables.
<svelte:fragment slot="buttons">
<Button
href="https://appwrite.io/docs/advanced/self-hosting/functions"
external
text>
Learn more
</Button>
</svelte:fragment>
</Alert>
{/if}
<article class="card-git card is-border-dashed is-no-shadow">
<div class="u-flex u-cross-center u-flex-vertical u-gap-32">
<div class="u-flex u-cross-center u-flex-vertical u-gap-8">
<AvatarGroup icons={[IconGithub, IconGitlab, IconBitBucket, IconAzure]} />
<Arrow direction="down" />
<Avatar alt="appwrite" --icon-fill="var(--color-bgcolor-accent)">
<Icon icon={IconAppwrite} />
</Avatar>
</div>
<Button
disabled={isSelfHosted && !isVcsEnabled}
on:click={() => (showGitIstall = true)}
secondary>
<span class="text">Add installation</span>
</Button>
</div>
</article>
{:else if isSelfHosted && !isVcsEnabled}
<Alert type="info">
<svelte:fragment slot="title">
Installing Git to a self-hosted instance
</svelte:fragment>
Before installing Git in a locally hosted Appwrite project, ensure your environment variables
are configured.
</Alert>
{/if}
<Card.Base padding="none" border="dashed">
<Empty
type="secondary"
title="No installation was added to the project yet"
description="Add an installation to connect repositories">
<svelte:fragment slot="actions">
<Button secondary href={configureGitHub()} external>
<Icon icon={IconGithub} size="s" slot="start" />
Add installation
</Button>
</svelte:fragment>
</Empty>
</Card.Base>
</svelte:fragment>
</CardGrid>
@@ -211,9 +193,3 @@
{#if showGitDisconnect}
<GitDisconnectModal bind:showGitDisconnect {selectedInstallation} />
{/if}
<style>
:global(.git-installation-avatar-group .icon-gitlab, .icon-bitBucket, .icon-azure) {
color: hsl(var(--color-neutral-50));
}
</style>
@@ -10,37 +10,43 @@
</script>
<Layout.Stack gap="xxs" direction="row" alignItems="center">
<Link external href={`${$protocol}${domains.rules[0].domain}`} variant="muted">
<Layout.Stack gap="xxs" direction="row" alignItems="center">
<Trim alternativeTrim>
<Typography.Text variant="m-400" color="--color-fgcolor-neutral-primary">
{domains.rules[0].domain}
</Typography.Text>
</Trim>
<Icon icon={IconExternalLink} size="s" />
</Layout.Stack>
</Link>
{#if domains.rules.length > 1}
<Popover padding="none" let:toggle>
<Tag size="s" on:click={toggle}>
+{domains.rules.length - 1}
</Tag>
<svelte:fragment slot="tooltip">
<ActionMenu.Root>
{#each domains.rules as rule, i}
{#if i !== 0}
<ActionMenu.Item.Anchor
href={`${$protocol}${rule.domain}`}
external
leadingIcon={IconExternalLink}>
<Trim alternativeTrim>
{rule.domain}
</Trim>
</ActionMenu.Item.Anchor>
{/if}
{/each}
</ActionMenu.Root>
</svelte:fragment>
</Popover>
{#if domains.total}
<Link external href={`${$protocol}${domains.rules[0]?.domain}`} variant="muted">
<Layout.Stack gap="xxs" direction="row" alignItems="center">
<Trim alternativeTrim>
<Typography.Text variant="m-400" color="--color-fgcolor-neutral-primary">
{domains.rules[0]?.domain}
</Typography.Text>
</Trim>
<Icon icon={IconExternalLink} size="s" />
</Layout.Stack>
</Link>
{#if domains.rules.length > 1}
<Popover padding="none" let:toggle>
<Tag size="s" on:click={toggle}>
+{domains.rules.length - 1}
</Tag>
<svelte:fragment slot="tooltip">
<ActionMenu.Root>
{#each domains.rules as rule, i}
{#if i !== 0}
<ActionMenu.Item.Anchor
href={`${$protocol}${rule.domain}`}
external
leadingIcon={IconExternalLink}>
<Trim alternativeTrim>
{rule.domain}
</Trim>
</ActionMenu.Item.Anchor>
{/if}
{/each}
</ActionMenu.Root>
</svelte:fragment>
</Popover>
{/if}
{:else}
<Typography.Text variant="m-400" color="--color-fgcolor-neutral-primary">
No domains available
</Typography.Text>
{/if}
</Layout.Stack>
@@ -94,7 +94,7 @@
</Layout.Stack>
{/if}
{#key buildLogs}
<Logs logs={buildLogs || 'No logs available'} bind:theme={$app.themeInUse} />
<Logs logs={buildLogs || 'Waiting for build to start...'} bind:theme={$app.themeInUse} />
{/key}
{#if ['processing', 'building'].includes(status)}
<Layout.Stack alignItems="flex-end">
@@ -99,10 +99,15 @@
}
}
function handleSubmit() {
rootDir = currentPath;
show = false;
}
// $: console.log(rootDir);
</script>
<Modal title="Root directory" bind:show>
<Modal title="Root directory" bind:show onSubmit={handleSubmit}>
<span slot="description">
Select the directory where your site code is located using the menu below.
</span>
@@ -110,5 +115,6 @@
<svelte:fragment slot="footer">
<Button secondary on:click={() => (show = false)}>Cancel</Button>
<Button submit>Save</Button>
</svelte:fragment>
</Modal>
@@ -10,7 +10,7 @@ export const load = async ({ url, depends, route }) => {
const search = getSearch(url);
const limit = getLimit(url, route, CARD_LIMIT);
const offset = pageToOffset(page, limit);
const view = getView(url, route, View.Grid);
const view = getView(url, route, View.Grid, View.Grid);
const siteList = await sdk.forProject.sites.list(
[Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
@@ -182,6 +182,7 @@
</Tooltip>
{:else}
<InteractiveText
variant="secret"
isVisible={false}
text={variable.value} />
{/if}
@@ -37,12 +37,12 @@
</Fieldset>
</Layout.Stack>
<svelte:fragment slot="aside">
<!-- TODO: fix use repository name instead of id-->
<Aside
framework={data.frameworks.frameworks.find((f) => f.key === data.site.framework)}
repositoryName={data?.repository?.name}
branch={data.repository?.id ? data.site.providerBranch : ''}
rootDir={data.repository?.id ? data.site.providerRootDirectory : ''} />
rootDir={data.repository?.id ? data.site.providerRootDirectory : ''}
domain={data.proxyRuleList.rules[0]?.domain} />
</svelte:fragment>
<svelte:fragment slot="footer">
<Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
@@ -1,20 +1,26 @@
import { sdk } from '$lib/stores/sdk';
import { RuleType, sdk } from '$lib/stores/sdk';
import { error } from '@sveltejs/kit';
import type { PageLoad } from './$types';
import { Query } from '@appwrite.io/console';
export const load: PageLoad = async ({ url }) => {
if (!url.searchParams.has('site')) error(404, 'Site is not optional');
if (!url.searchParams.has('deployment')) error(404, 'Deployment is not optional');
const siteId = url.searchParams.get('site');
const deploymentId = url.searchParams.get('deployment');
const [site, deployment] = await Promise.all([
const [site, deployment, proxyRuleList] = await Promise.all([
sdk.forProject.sites.get(siteId),
sdk.forProject.sites.getDeployment(siteId, deploymentId)
sdk.forProject.sites.getDeployment(siteId, deploymentId),
sdk.forProject.proxy.listRules([
Query.equal('type', [RuleType.DEPLOYMENT]),
Query.equal('automation', `site=${siteId}`)
])
]);
return {
site,
deployment,
proxyRuleList,
repository: site?.installationId
? await sdk.forProject.vcs.getRepository(site.installationId, site.providerRepositoryId)
: undefined
@@ -61,7 +61,7 @@
Drag and drop files here or click to upload
</Typography.Text>
<Tooltip>
<Layout.Stack alignItems="center" justifyContent="center">
<Layout.Stack alignItems="center" justifyContent="center" inline>
<Icon icon={IconInfo} size="s" />
</Layout.Stack>
<svelte:fragment slot="tooltip">
@@ -69,8 +69,9 @@
</svelte:fragment>
</Tooltip>
</Layout.Stack>
<Typography.Caption variant="400"
>Up to 100 variables allowed</Typography.Caption>
<Typography.Caption variant="400">
Up to 100 variables allowed
</Typography.Caption>
</Layout.Stack>
</Upload.Dropzone>
{#if variables?.length > 0}
@@ -14,8 +14,9 @@
import { BuildRuntime, Framework, ID } from '@appwrite.io/console';
import type { Models } from '@appwrite.io/console';
import Configuration from '../configuration.svelte';
import Domain from '../domain.svelte';
import InputFile from '$lib/elements/forms/inputFile.svelte';
import { buildVerboseDomain } from '../store';
import { project } from '$routes/(console)/project-[project]/store';
export let data;
let showExitModal = false;
@@ -23,10 +24,9 @@
let formComponent: Form;
let isSubmitting = writable(false);
let name = '';
let name = 'My website';
let id = ID.unique();
let domain = id;
let domainIsValid = true;
let framework: Models.Framework = data.frameworks.frameworks[0];
let adapter = framework?.adapters[0];
let installCommand = adapter?.installCommand;
@@ -37,6 +37,8 @@
async function create() {
try {
domain = await buildVerboseDomain(name, $project.name, id);
const fr = Object.values(Framework).find((f) => f === framework.key);
const buildRuntime = Object.values(BuildRuntime).find(
(f) => f === framework.buildRuntime
@@ -126,7 +128,7 @@
bind:variables
frameworks={data.frameworks.frameworks} />
<Domain bind:domain bind:domainIsValid />
<!-- <Domain bind:domain bind:domainIsValid /> -->
</Layout.Stack>
</Form>
<svelte:fragment slot="aside">
@@ -1,10 +1,14 @@
<script lang="ts">
import { base } from '$app/paths';
import { Card } from '$lib/components';
import { Button, InputSelect } from '$lib/elements/forms';
import { app } from '$lib/stores/app';
import { IconDownload } from '@appwrite.io/pink-icons-svelte';
import { Icon, Image, Layout, Typography } from '@appwrite.io/pink-svelte';
let framework: 'react' | 'vue' | 'angular' | 'svelte' | 'web' = 'web';
let starterKit;
</script>
<Card padding="xs">
@@ -27,10 +31,16 @@
]}
bind:value={framework} />
<Image src="https://placehold.co/349x201/111/bbb?text=Preview&font=inter" alt="preview" />
<Image
ratio="16/9"
src={starterKit?.preview ||
($app.themeInUse === 'dark'
? `${base}/images/sites/screenshot-placeholder-dark.svg`
: `${base}/images/sites/screenshot-placeholder-light.svg`)}
alt="preview" />
<Button size="s" fullWidth secondary href="#">
<Icon icon={IconDownload} /> Starter kit
<Button fullWidth secondary href="#">
<Icon icon={IconDownload} slot="start" /> Starter kit
</Button>
</Layout.Stack>
</Card>
@@ -209,7 +209,7 @@
</Layout.Stack>
</Form>
<svelte:fragment slot="aside">
<Aside {framework} repositoryName={data.repository.name} {branch} {rootDir} {domain} />
<Aside {framework} repositoryName={data.repository.name} {branch} {rootDir} />
</svelte:fragment>
<svelte:fragment slot="footer">
@@ -336,7 +336,7 @@
</Layout.Stack>
</Form>
<svelte:fragment slot="aside">
<Aside {framework} {repositoryName} {branch} {rootDir} {domain} showAfter={showSiteConfig}>
<Aside {framework} {repositoryName} {branch} {rootDir} showAfter={showSiteConfig}>
<Layout.Stack>
<Layout.Stack direction="row" justifyContent="space-between" alignItems="center">
<Typography.Text
@@ -5,7 +5,7 @@
import OpenOnMobileModal from '../(components)/openOnMobileModal.svelte';
import { timeFromNow } from '$lib/helpers/date';
import { IconExternalLink, IconQrcode } from '@appwrite.io/pink-icons-svelte';
import { consoleVariables, protocol } from '$routes/(console)/store';
import { protocol } from '$routes/(console)/store';
import { type Models } from '@appwrite.io/console';
import { Link } from '$lib/elements';
import { Button } from '$lib/elements/forms';
@@ -16,11 +16,11 @@
let showDomainQR = false;
let selectedDomainURL: string;
$: hasCustomDomain = proxyRuleList?.total
? proxyRuleList.rules.some((rule) =>
rule.domain.includes($consoleVariables._APP_DOMAIN_TARGET)
)
: false;
// $: hasCustomDomain = proxyRuleList?.total
// ? proxyRuleList.rules.some((rule) =>
// rule.domain.includes($consoleVariables._APP_DOMAIN_TARGET)
// )
// : false;
</script>
<Layout.Stack>
@@ -42,7 +42,7 @@
{#if proxyRuleList?.rules?.length <= 1}
<Layout.Stack gap="l">
<Layout.Stack gap="xxs">
<Typography.Text variant="l-500">
<Typography.Text variant="m-500">
Add your first custom domain
</Typography.Text>
<Typography.Caption variant="500" color="--color-fgcolor-neutral-tertiary">
@@ -53,7 +53,7 @@
<div>
<Button
secondary
size="xs"
size="s"
href={`${base}/project-${$page.params.project}/sites/site-${$page.params.site}/domains/add-domain`}>
Add domain
</Button>