From 48841147862d42bf00bd7c6ca222a23a419fb73b Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 26 Feb 2025 15:20:31 +0100 Subject: [PATCH] fix: depoyment screen accordion --- .../sites/(components)/logs.svelte | 20 +++------------ .../sites/(components)/logsTimer.svelte | 25 +++++++++++++++++++ .../deployment-[deployment]/+page.svelte | 4 +++ 3 files changed, 32 insertions(+), 17 deletions(-) create mode 100644 src/routes/(console)/project-[project]/sites/(components)/logsTimer.svelte diff --git a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte index 1ad4ab3bf..c6835bbb0 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte @@ -19,17 +19,16 @@ import { goto, invalidate } from '$app/navigation'; import { base } from '$app/paths'; import { page } from '$app/stores'; - import { timer } from '$lib/actions/timer'; import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; import { capitalize } from '$lib/helpers/string'; - import { formatTimeDetailed } from '$lib/helpers/timeConversion'; import { app } from '$lib/stores/app'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; import type { Models } from '@appwrite.io/console'; - import { Badge, Layout, Logs, Spinner, Typography } from '@appwrite.io/pink-svelte'; + import { Badge, Layout, Logs, Typography } from '@appwrite.io/pink-svelte'; import { onMount } from 'svelte'; + import LogsTimer from './logsTimer.svelte'; export let site: Models.Site; export let deployment: Models.Deployment; @@ -91,20 +90,7 @@ variant="secondary" type={badgeTypeDeployment(status)} /> - - {#if ['processing', 'building'].includes(status)} - - -

- - - - {:else} - - {formatTimeDetailed(deployment.buildTime)} - - {/if} - + {/if} {#key buildLogs} diff --git a/src/routes/(console)/project-[project]/sites/(components)/logsTimer.svelte b/src/routes/(console)/project-[project]/sites/(components)/logsTimer.svelte new file mode 100644 index 000000000..e8f2c25b8 --- /dev/null +++ b/src/routes/(console)/project-[project]/sites/(components)/logsTimer.svelte @@ -0,0 +1,25 @@ + + + + {#if ['processing', 'building'].includes(status)} + + +

+ + + + {:else} + + {formatTimeDetailed(deployment.buildTime)} + + {/if} + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte index 384757fc6..870e48e0b 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte @@ -19,6 +19,7 @@ import { protocol } from '$routes/(console)/store'; import { Accordion } from '@appwrite.io/pink-svelte'; import { capitalize } from '$lib/helpers/string'; + import LogsTimer from '../../../(components)/logsTimer.svelte'; export let data; @@ -78,6 +79,9 @@ badgeType={badgeTypeDeployment(data.deployment.status)} hideDivider> + + +