-
-
-
-
-
-
-
-
-
-
-
- More filters
-
-
+
+ {#if data.deploymentList.total}
+
+ {/if}
+
+
+
+
+ {
+ if (!hasInstallation) {
+ showConnectRepo = true;
+ } else {
+ showCreateDeployment = true;
+ }
+ }}>
+ Git
+
+ {
+ showConnectCLI = true;
+ }}>
+ CLI
+
+ {
+ showConnectManual = true;
+ }}>
+ Manual
+
+
-
+
+
+
+ {#if data.deploymentList.total}
+
+
+
+
+
+
+
+
+
+
+
+
+ More filters
+
+
+
+
+
-
+ {/if}
{#if data.deploymentList.total}
@@ -232,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 69040cfaa..7a80fb3a7 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte
@@ -19,6 +19,7 @@
import { IconDotsHorizontal, IconGlobeAlt, IconRefresh } from '@appwrite.io/pink-icons-svelte';
import RedeployModal from '../redeployModal.svelte';
import PromoteModal from '../promoteModal.svelte';
+ import { Card } from '$lib/components';
export let site: Models.Site;
export let activeDeployment: Models.Deployment;
@@ -27,100 +28,108 @@
let showPromote = false;
let showRedeploy = false;
let selectedDeployment: Models.Deployment = null;
+
+ $: 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}
+
+ No deployments exist
+
+{/if}
{#if selectedDeployment && showRedeploy}
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte
index 5b0abf2c9..9a59cbbc5 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte
@@ -37,6 +37,12 @@
let selectedDomain: Models.ProxyRule = null;
$: console.log(data.domains);
+
+ // TODO: replace status once backend is fixed
+ // created - Verification Failed
+ // verified - Verification OK , Certificate OK
+ // verifying - Verifiacitok OK
+ // unverified - Verificaiton OK , Certificate Failed
@@ -69,7 +75,12 @@
{domain.domain}
- {#if domain.status !== 'verified'}
+ {#if domain.status === 'created'}
+
+ {:else if domain.status === 'veryfing'}
Verify
+ {:else if domainData.status === 'verifying'}
+
+
+ {domainData.domain}
+
+
+
+
+
+
+
+
{:else if domainData.status === 'verified'}
{domainData.domain}
+
{/if}
@@ -121,9 +135,8 @@
- A list of all domain providers and their DNS setting is available herehere.
@@ -133,9 +146,8 @@
-
- {#each siteDomainTips as tips}
-
+ {#each siteDomainTips as tips, i}
+
{tips.message}
{/each}
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/retryDomainModal.svelte
index c03adf3ee..0afc74175 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/retryDomainModal.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/retryDomainModal.svelte
@@ -12,6 +12,7 @@
export let show = false;
export let selectedDomain: Models.ProxyRule;
+ let error = null;
async function retryDomain() {
try {
await sdk.forProject.proxy.updateRuleVerification(selectedDomain.$id);
@@ -22,17 +23,18 @@
message: `${selectedDomain.domain} has been deleted`
});
trackEvent(Submit.DomainDelete);
- } catch (error) {
- addNotification({
- type: 'error',
- message: error.message
- });
- trackError(error, Submit.DomainDelete);
+ } catch (e) {
+ error = e;
+ trackError(e, Submit.DomainDelete);
}
}
+
+ $: if (!show) {
+ error = null;
+ }
-
+
{#if selectedDomain}
{/if}
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte
index f60a44970..ddaed6ba5 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte
@@ -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 { protocol } from '$routes/(console)/store';
+ import { consoleVariables, protocol } from '$routes/(console)/store';
import { type Models } from '@appwrite.io/console';
import { Link } from '$lib/elements';
import { Button } from '$lib/elements/forms';
@@ -15,6 +15,12 @@
let showDomainQR = false;
let selectedDomainURL: string;
+
+ $: hasCustomDomain = proxyRuleList?.total
+ ? proxyRuleList.rules.some((rule) =>
+ rule.domain.includes($consoleVariables._APP_DOMAIN_TARGET)
+ )
+ : false;
diff --git a/src/routes/(console)/project-[project]/sites/store.ts b/src/routes/(console)/project-[project]/sites/store.ts
index 03e0ddd7b..8912e25d0 100644
--- a/src/routes/(console)/project-[project]/sites/store.ts
+++ b/src/routes/(console)/project-[project]/sites/store.ts
@@ -32,8 +32,10 @@ export function getFrameworkIcon(framework: string) {
return 'nextjs';
case framework.toLocaleLowerCase().includes('astro'):
return 'astro';
+ case framework.toLocaleLowerCase().includes('remix'):
+ return 'remix';
default:
- return undefined;
+ return framework.toLocaleLowerCase();
}
}
diff --git a/static/icons/dark/color/astro.svg b/static/icons/dark/color/astro.svg
index eb4ffe0b4..ef225e517 100644
--- a/static/icons/dark/color/astro.svg
+++ b/static/icons/dark/color/astro.svg
@@ -1,4 +1,4 @@
diff --git a/static/icons/dark/color/nextjs.svg b/static/icons/dark/color/nextjs.svg
index ab548fda0..d1e0cbfb4 100644
--- a/static/icons/dark/color/nextjs.svg
+++ b/static/icons/dark/color/nextjs.svg
@@ -1,3 +1,3 @@
diff --git a/static/icons/dark/color/remix.svg b/static/icons/dark/color/remix.svg
new file mode 100644
index 000000000..fb817aebc
--- /dev/null
+++ b/static/icons/dark/color/remix.svg
@@ -0,0 +1,3 @@
+
diff --git a/static/icons/light/color/remix.svg b/static/icons/light/color/remix.svg
new file mode 100644
index 000000000..253f87fd3
--- /dev/null
+++ b/static/icons/light/color/remix.svg
@@ -0,0 +1,5 @@
+