diff --git a/package.json b/package.json index 6ab641f3c..6c6a955c9 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16", "@appwrite.io/pink-legacy": "^1.0.0", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@464cb37", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 05f1f12f6..938b8cda0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@464cb37 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@464cb37(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -218,14 +218,14 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@70f1b0c} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@464cb37a6262e37aac7d9211e0d4986556a6c39c': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@464cb37a6262e37aac7d9211e0d4986556a6c39c} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@a7f04622ed0e219920d7194a21aae086ef8c61f7': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@a7f04622ed0e219920d7194a21aae086ef8c61f7} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -239,8 +239,8 @@ packages: '@appwrite.io/pink-legacy@1.0.0': resolution: {integrity: sha512-EZk/wX8oDhIsCXf2A0oQjdNOaHvh5MnWbLQI4pAiGrdy5qQGPoU19AK6iVX6z3QoOq7geoEu0zVwAowBy5hZbQ==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@464cb37': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@464cb37} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4090,11 +4090,11 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@70f1b0c': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@464cb37a6262e37aac7d9211e0d4986556a6c39c(svelte@4.2.19)': dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@a7f04622ed0e219920d7194a21aae086ef8c61f7(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16(svelte@4.2.19)': dependencies: svelte: 4.2.19 @@ -4107,9 +4107,9 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@464cb37(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@a7f04622ed0e219920d7194a21aae086ef8c61f7(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@464cb37a6262e37aac7d9211e0d4986556a6c39c(svelte@4.2.19) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.2(svelte@4.2.19))(svelte@4.2.19) '@melt-ui/svelte': 0.86.2(svelte@4.2.19) diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/+page.svelte index ecdf9b408..0c0db6c8f 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/+page.svelte @@ -19,13 +19,16 @@ - - - - - - - + {#if data.deployment} + + + + + + + + {/if} 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 88918bc2f..b332c7dc6 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts +++ b/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts @@ -7,8 +7,7 @@ export const load = async ({ params, depends, parent }) => { depends(Dependencies.SITES_DOMAINS); const { site, proxyRuleList } = await parent(); - const [deployment, deploymentList, prodReadyDeployments] = await Promise.all([ - sdk.forProject.sites.getDeployment(params.site, site.deploymentId), + 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(1) @@ -18,8 +17,10 @@ export const load = async ({ params, depends, parent }) => { ]); return { site, - deployment, deploymentList, + deployment: deploymentList?.total + ? await sdk.forProject.sites.getDeployment(params.site, site.deploymentId) + : null, proxyRuleList, hasProdReadyDeployments: prodReadyDeployments?.deployments?.length > 0 }; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte index 68208a18d..d8ea7dcb2 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte @@ -1,25 +1,22 @@ - - - - Metrics for {range !== SiteUsageRange.TwentyFourHours - ? `${toLocaleDate( - new Date( - now.getTime() - - parseInt(range.split('d')[0]) * 24 * 60 * 60 * 1000 - ).toString() - )} to` - : ''} - {toLocaleDate(now.toString())} - -
- -
-
- - {#each metrics as metric} - - {/each} - -
+ {#if data.deploymentList.total} + + {/if} - - - - - {#if $tags?.length} - -
-
- - {/if} -
-
+ {#if data.deploymentList.total} + + + + + {#if $tags?.length} + +
+
+ + {/if} +
+
+ {/if}
- + {#if data.deploymentList.total} + + {/if} - +
-
- - + {#if data.deploymentList.total} +
+ + - - -
- + + +
+ - - - - More filters - - - - + + + + More filters + + + + +
-
+ {/if} {#if data.deploymentList.total} @@ -234,6 +162,17 @@ total={data.deploymentList?.total} /> {:else if data?.query} + {:else} + { + if (!hasInstallation) { + showConnectRepo = true; + } else { + showCreateDeployment = true; + } + }} /> {/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.ts b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.ts index 3722cfb36..ac0d0eecf 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.ts +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.ts @@ -5,7 +5,7 @@ import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import { queries, queryParamToMap } from '$lib/components/filters'; export const load = async ({ params, depends, url, route, parent }) => { - const data = await parent(); + const { site } = await parent(); depends(Dependencies.DEPLOYMENTS); const page = getPage(url); const limit = getLimit(url, route, PAGE_LIMIT); @@ -29,10 +29,11 @@ export const load = async ({ params, depends, url, route, parent }) => { offset, limit, query, - activeDeployment: data.site.deploymentId - ? await sdk.forProject.sites.getDeployment(params.site, data.site.deploymentId) - : null, deploymentList, + activeDeployment: + site.deploymentId && deploymentList?.total + ? await sdk.forProject.sites.getDeployment(params.site, site.deploymentId) + : null, installations }; }; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte index f0c33b1cf..53b5667d8 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte @@ -143,6 +143,7 @@ + import { InputSelect } from '$lib/elements/forms'; + import { toLocaleDate } from '$lib/helpers/date'; + import { Layout, Typography } from '@appwrite.io/pink-svelte'; + import UsageCard from './usageCard.svelte'; + import { sdk } from '$lib/stores/sdk'; + import { SiteUsageRange, type Models } from '@appwrite.io/console'; + import { onMount } from 'svelte'; + import { page } from '$app/stores'; + + export let deploymentList: Models.DeploymentList; + let range = SiteUsageRange.ThirtyDays; + const rangeOptions = [ + { value: SiteUsageRange.TwentyFourHours, label: 'Last 24 hours' }, + { value: SiteUsageRange.ThirtyDays, label: 'Last 30 days' }, + { value: SiteUsageRange.NinetyDays, label: 'Last 90 days' } + ]; + const now = new Date(); + let metrics = [ + { + id: 'buildsTotal', + value: null, + description: 'Total build count' + }, + { + id: 'buildsStorageTotal', + value: null, + description: 'Total build size' + }, + { + id: 'buildsTimeTotal', + value: null, + description: 'Total build time' + }, + { + id: 'avgTime', + value: null, + description: 'Average build time' + }, + { + id: 'success', + value: null, + description: 'Successful deployment' + }, + { + id: 'failed', + value: null, + description: 'Failed deployment' + } + ]; + onMount(async () => { + if (deploymentList.total) { + await fetchUsage(); + } + }); + + async function fetchUsage() { + metrics.forEach((metric) => { + metric.value = null; + }); + metrics = metrics; + try { + const usage = await sdk.forProject.sites.getSiteUsage($page.params.site, range); + metrics = metrics.map((metric) => { + metric.value = usage[metric.id]; + return metric; + }); + metrics = metrics; + console.log(usage); + } catch (error) { + console.log(error); + } + } + + $: console.log(metrics); + + + + + + Metrics for {range !== SiteUsageRange.TwentyFourHours + ? `${toLocaleDate( + new Date( + now.getTime() - parseInt(range.split('d')[0]) * 24 * 60 * 60 * 1000 + ).toString() + )} to` + : ''} + {toLocaleDate(now.toString())} + +
+ +
+
+ + {#each metrics as metric} + + {/each} + +
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 5d372966a..b94f4dde2 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte @@ -31,98 +31,102 @@ $: console.log(deploymentList); - - - - Deployments +{#if deploymentList.total} + + + + 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} + - - - - - - - - - - - - { - e.preventDefault(); - selectedDeployment = deployment; - showRedeploy = true; - toggle(e); - }}> - Redeploy - - { - e.preventDefault(); - selectedDeployment = deployment; - showPromote = true; - toggle(e); - }}> - Promote - - - - - - - {/each} - - {/if} - + + + + + + + + + + + + { + e.preventDefault(); + selectedDeployment = deployment; + showRedeploy = true; + toggle(e); + }}> + Redeploy + + { + e.preventDefault(); + selectedDeployment = deployment; + showPromote = true; + toggle(e); + }}> + Promote + + + + + + + {/each} + + {/if} + +{:else} + hi +{/if} {#if selectedDeployment && showRedeploy}