From 3bb439736c2d63f2dc3301feaba2cd6ba5e0c6c7 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 19 Feb 2025 11:36:06 +0100 Subject: [PATCH] design review with chen site overview screen --- .../sites/(components)/siteCard.svelte | 6 +- .../project-[project]/sites/grid.svelte | 2 +- .../sites/site-[site]/+page.svelte | 8 +- .../sites/site-[site]/+page.ts | 2 +- .../site-[site]/deploymentsOverview.svelte | 131 ++++++++++-------- .../sites/site-[site]/domainsOverview.svelte | 95 ++++++++----- .../site-[site]/empty-deployment-dark.svg | 88 ++++++------ src/themes/dark-cloud.json | 1 + src/themes/dark.json | 1 + src/themes/light-cloud.json | 1 + src/themes/light.json | 1 + 11 files changed, 189 insertions(+), 147 deletions(-) diff --git a/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte b/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte index 94572cbec..f0863bdd7 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte @@ -84,7 +84,7 @@ {#if siteUrl && !hideQRCode} {/if} @@ -114,7 +114,7 @@ {/if} - + {#if deployment?.buildTime} .card-grid { display: grid; - grid-template-columns: 45% 55%; + grid-template-columns: 45% auto; // justify-content: center; align-items: center; gap: var(--gap-xl); diff --git a/src/routes/(console)/project-[project]/sites/grid.svelte b/src/routes/(console)/project-[project]/sites/grid.svelte index ce3dbfc75..8c8a1b90f 100644 --- a/src/routes/(console)/project-[project]/sites/grid.svelte +++ b/src/routes/(console)/project-[project]/sites/grid.svelte @@ -22,7 +22,7 @@ let selectedSite: Models.Site = null; - + {#each siteList.sites as site} - + {#if data?.deployment && data.deployment.status === 'ready'} @@ -37,7 +37,7 @@ >Instant rollback - {:else if data.deployment && data.deployment.status === 'building'} + {:else} - + --> diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts b/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts index b332c7dc6..cc5279589 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts +++ b/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts @@ -8,7 +8,7 @@ export const load = async ({ params, depends, parent }) => { const { site, proxyRuleList } = await parent(); const [deploymentList, prodReadyDeployments] = await Promise.all([ - sdk.forProject.sites.listDeployments(params.site, [Query.limit(5), Query.orderDesc('')]), + sdk.forProject.sites.listDeployments(params.site, [Query.limit(4), Query.orderDesc('')]), sdk.forProject.sites.listDeployments(params.site, [ Query.limit(1) // Query.equal('status', 'ready') diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte index cb323a647..e09119271 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte @@ -2,6 +2,7 @@ import { ActionMenu, Badge, + Empty, Icon, Layout, Popover, @@ -26,6 +27,7 @@ import { Card } from '$lib/components'; import ActivateDeploymentModal from '../activateDeploymentModal.svelte'; import CancelDeploymentModal from './deployments/cancelDeploymentModal.svelte'; + import { capitalize } from '$lib/helpers/string'; export let site: Models.Site; export let activeDeployment: Models.Deployment; @@ -37,58 +39,60 @@ let selectedDeployment: Models.Deployment = null; -{#if deploymentList.total} - - - - Deployments - - + + + + + Deployments + - {#if deploymentList?.total} - - - Deployment ID - Status - Source - Updated - - - {#each deploymentList?.deployments as deployment} - - - {deployment.$id} - - - {@const status = deployment.status} - {#if activeDeployment?.$id === deployment?.$id} - - {:else} - - {/if} - + + + {#if deploymentList?.total} + + + Deployment ID + Status + Source + Updated + + + {#each deploymentList?.deployments as deployment} + + + {deployment.$id} + + + {@const status = deployment.status} + {#if activeDeployment?.$id === deployment?.$id} + + {:else} + + {/if} + - - - - - - - + + + + + + + + - - - {#if i < 2 && i < proxyRuleList.rules.length - 1} - + {#if proxyRuleList?.rules?.length} + + {/if} {/if} - {/each} + {#each proxyRuleList?.rules?.slice(0, 3) as rule, i} + + + + + + {rule.domain} + + + + + + Added {timeFromNow(rule.$createdAt)} + + + + + {#if i < 2 && i < proxyRuleList.rules.length - 1} + + {/if} + {/each} + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/empty-deployment-dark.svg b/src/routes/(console)/project-[project]/sites/site-[site]/empty-deployment-dark.svg index 997bad861..813d9fdae 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/empty-deployment-dark.svg +++ b/src/routes/(console)/project-[project]/sites/site-[site]/empty-deployment-dark.svg @@ -1,92 +1,92 @@ - - - - + + + + - - + + - - + + - - + + -
- - +
+ + - - + + - - - + + + - - - - - - - + + + + + + + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + - + diff --git a/src/themes/dark-cloud.json b/src/themes/dark-cloud.json index 248178d8a..3cf55bc71 100644 --- a/src/themes/dark-cloud.json +++ b/src/themes/dark-cloud.json @@ -184,6 +184,7 @@ "gap-l": "var(--base-16)", "gap-xl": "var(--base-20)", "gap-xxl": "var(--base-32)", + "gap-xxxl": "var(--base-40)", "border-width-m": "1.2000000476837158px", "border-width-l": "2px", "border-width-xl": "3px", diff --git a/src/themes/dark.json b/src/themes/dark.json index e9c21f808..589c49c29 100644 --- a/src/themes/dark.json +++ b/src/themes/dark.json @@ -185,6 +185,7 @@ "gap-l": "var(--base-16)", "gap-xl": "var(--base-20)", "gap-xxl": "var(--base-32)", + "gap-xxxl": "var(--base-40)", "border-width-m": "1.2000000476837158px", "border-width-l": "2px", "border-width-xl": "3px", diff --git a/src/themes/light-cloud.json b/src/themes/light-cloud.json index e7219a7bd..e8c714f98 100644 --- a/src/themes/light-cloud.json +++ b/src/themes/light-cloud.json @@ -184,6 +184,7 @@ "gap-l": "var(--base-16)", "gap-xl": "var(--base-20)", "gap-xxl": "var(--base-32)", + "gap-xxxl": "var(--base-40)", "border-width-m": "1.2000000476837158px", "border-width-l": "2px", "border-width-xl": "3px", diff --git a/src/themes/light.json b/src/themes/light.json index 65d4883dc..659c106cb 100644 --- a/src/themes/light.json +++ b/src/themes/light.json @@ -185,6 +185,7 @@ "gap-l": "var(--base-16)", "gap-xl": "var(--base-20)", "gap-xxl": "var(--base-32)", + "gap-xxxl": "var(--base-40)", "border-width-m": "1.2000000476837158px", "border-width-l": "2px", "border-width-xl": "3px",