From b414f4ace406b9c7e0bd6fe5b66602510aa9f90c Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 14 Nov 2022 17:11:47 +0100 Subject: [PATCH 1/5] chore: update ui --- package-lock.json | 28 ++++++++++++++-------------- package.json | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index a1ffcfa0f..0c4f1fff6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,8 @@ "version": "0.0.1", "dependencies": { "@aw-labs/appwrite-console": "^11.0.0", - "@aw-labs/icons": "0.0.0-76", - "@aw-labs/ui": "0.0.0-76", + "@aw-labs/icons": "0.0.0-77", + "@aw-labs/ui": "0.0.0-77", "@popperjs/core": "^2.11.6", "echarts": "^5.4.0", "pretty-bytes": "^6.0.0", @@ -81,14 +81,14 @@ } }, "node_modules/@aw-labs/icons": { - "version": "0.0.0-76", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-76.tgz", - "integrity": "sha512-i22WHSl3aYCKqaEt87OKUmOZ9Q/LDUeqDJ7eab4dhey1+W3dqt+nF21YR38iRVtV08+0KniiwPxagBjjSSrmlg==" + "version": "0.0.0-77", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-77.tgz", + "integrity": "sha512-z/gH6B//qShnlJbf1sxv0ltSbRvJha1El0pl4jACAWDD+orgh2hzBrv6YdgPi1AVBTacu2GWWTcyobItghbpgA==" }, "node_modules/@aw-labs/ui": { - "version": "0.0.0-76", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-76.tgz", - "integrity": "sha512-Cfik0wm2dDKnLTxWSdNkaw76HqoKD1JNjfKzkBT+Hertl2Gae0C/ykc8MjCHsO8lu6FulVQ6uqSLqfiKR1T6zQ==", + "version": "0.0.0-77", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-77.tgz", + "integrity": "sha512-y/7cbPFcK+jUnarsn9X1arrIB69RVMPWMjjIiiaX7uSa0rq9ZN1agBZxfA63meyh23kdIK4K5CcJhatShMMsYg==", "dependencies": { "@aw-labs/icons": "*", "normalize.css": "^8.0.1", @@ -7467,14 +7467,14 @@ } }, "@aw-labs/icons": { - "version": "0.0.0-76", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-76.tgz", - "integrity": "sha512-i22WHSl3aYCKqaEt87OKUmOZ9Q/LDUeqDJ7eab4dhey1+W3dqt+nF21YR38iRVtV08+0KniiwPxagBjjSSrmlg==" + "version": "0.0.0-77", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-77.tgz", + "integrity": "sha512-z/gH6B//qShnlJbf1sxv0ltSbRvJha1El0pl4jACAWDD+orgh2hzBrv6YdgPi1AVBTacu2GWWTcyobItghbpgA==" }, "@aw-labs/ui": { - "version": "0.0.0-76", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-76.tgz", - "integrity": "sha512-Cfik0wm2dDKnLTxWSdNkaw76HqoKD1JNjfKzkBT+Hertl2Gae0C/ykc8MjCHsO8lu6FulVQ6uqSLqfiKR1T6zQ==", + "version": "0.0.0-77", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-77.tgz", + "integrity": "sha512-y/7cbPFcK+jUnarsn9X1arrIB69RVMPWMjjIiiaX7uSa0rq9ZN1agBZxfA63meyh23kdIK4K5CcJhatShMMsYg==", "requires": { "@aw-labs/icons": "*", "normalize.css": "^8.0.1", diff --git a/package.json b/package.json index f67b84622..105dc73c7 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ }, "dependencies": { "@aw-labs/appwrite-console": "^11.0.0", - "@aw-labs/icons": "0.0.0-76", - "@aw-labs/ui": "0.0.0-76", + "@aw-labs/icons": "0.0.0-77", + "@aw-labs/ui": "0.0.0-77", "@popperjs/core": "^2.11.6", "echarts": "^5.4.0", "pretty-bytes": "^6.0.0", From f3c8f51267f8c7c13ace497667a88b017f0a797a Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 14 Nov 2022 17:15:26 +0100 Subject: [PATCH 2/5] fix: databases title --- src/routes/console/project-[project]/databases/+layout.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/databases/+layout.svelte b/src/routes/console/project-[project]/databases/+layout.svelte index 766790be1..17c589c7d 100644 --- a/src/routes/console/project-[project]/databases/+layout.svelte +++ b/src/routes/console/project-[project]/databases/+layout.svelte @@ -1,5 +1,5 @@ - Database - Appwrite + Databases - Appwrite From b38dc73a5a3e8d7c3b062d747e946c38df2cfa52 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 14 Nov 2022 17:25:39 +0100 Subject: [PATCH 3/5] feat: add logs button --- .../executions/[[page]]/+page.svelte | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte index 4910bd111..a85816e1b 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte @@ -9,7 +9,7 @@ TableCellHead, TableCell, TableCellText, - TableRowButton + TableRow } from '$lib/elements/table'; import { toLocaleDateTime } from '$lib/helpers/date'; import { calculateTime } from '$lib/helpers/timeConversion'; @@ -51,25 +51,22 @@ {#if data.executions.total} - Execution ID + Execution ID Created Status Trigger Duration + {#each data.executions.executions as execution} - { - $log.show = true; - $log.func = $func; - $log.data = execution; - }}> + - + + @@ -87,7 +84,18 @@ {calculateTime(execution.duration)} - + + + + {/each}
From f652fbde1b51e56daeba77827c8822143b26e12a Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 14 Nov 2022 17:36:26 +0100 Subject: [PATCH 4/5] feat: function screens, and upload icon --- src/lib/components/status.svelte | 2 +- src/lib/elements/forms/inputFile.svelte | 2 +- src/lib/layout/logs.svelte | 7 ++++++- .../function-[function]/[[page]]/+page.svelte | 15 ++++++++++----- .../functions/function-[function]/header.svelte | 2 +- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/lib/components/status.svelte b/src/lib/components/status.svelte index 0e857f1f1..148be03ed 100644 --- a/src/lib/components/status.svelte +++ b/src/lib/components/status.svelte @@ -21,5 +21,5 @@ {#if status} {/if} - + diff --git a/src/lib/elements/forms/inputFile.svelte b/src/lib/elements/forms/inputFile.svelte index 3dedef76e..f9f13908f 100644 --- a/src/lib/elements/forms/inputFile.svelte +++ b/src/lib/elements/forms/inputFile.svelte @@ -48,7 +48,7 @@ on:dragleave|preventDefault={() => (hovering = false)}>
-

Drag and drop files here to upload

diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte index 4ba527597..4297e0dc6 100644 --- a/src/lib/layout/logs.svelte +++ b/src/lib/layout/logs.svelte @@ -79,7 +79,12 @@
Size: {size.value} {size.unit}
- {$log.data.status} +
+ {$log.data.status} +

+ {calculateTime($log.data.buildTime)} +

+
diff --git a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte index 0ed65344f..1fa257b88 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte @@ -38,6 +38,7 @@ import { sdkForConsole } from '$lib/stores/sdk'; import { page } from '$app/stores'; import Output from '$lib/components/output.svelte'; + import { calculateTime } from '$lib/helpers/timeConversion'; export let data: PageData; @@ -119,10 +120,14 @@

Updated at: {toLocaleDateTime($func.$updatedAt)}

Entrypoint: {activeDeployment?.entrypoint}

- - - {activeDeployment.status} - +
+ + {activeDeployment.status} + +

+ {calculateTime(activeDeployment.buildTime)} +

+
@@ -184,7 +189,7 @@ {#if deployment.status === 'ready'} - {deployment.buildTime}s + {calculateTime(deployment.buildTime)} {/if} diff --git a/src/routes/console/project-[project]/functions/function-[function]/header.svelte b/src/routes/console/project-[project]/functions/function-[function]/header.svelte index 19c0de0c6..701f7cb5b 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/header.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/header.svelte @@ -39,7 +39,7 @@ From ca5929848592e2da62f8c10f959619fbf0de247c Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 14 Nov 2022 18:15:46 +0100 Subject: [PATCH 5/5] fix: remove app_domain_target --- .env.example | 1 - .../project-[project]/settings/domains/[[page]]/+page.svelte | 2 +- .../project-[project]/settings/domains/wizard/cnameTable.svelte | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index f403c6f09..897876704 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,3 @@ -VITE_APP_DOMAIN_TARGET= VITE_APPWRITE_ENDPOINT= VITE_GOOGLE_ANALYTICS= VITE_SENTRY_DSN= \ No newline at end of file diff --git a/src/routes/console/project-[project]/settings/domains/[[page]]/+page.svelte b/src/routes/console/project-[project]/settings/domains/[[page]]/+page.svelte index 8ac3de78a..39dbeea8c 100644 --- a/src/routes/console/project-[project]/settings/domains/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/settings/domains/[[page]]/+page.svelte @@ -26,7 +26,7 @@ export let data: PageData; const projectId = $page.params.project; - const target = import.meta.env?.VITE_APP_DOMAIN_TARGET?.toString() ?? ''; + const target = window?.location.hostname ?? ''; let showDelete = false; let selectedDomain: Models.Domain; let isVerifying = {}; diff --git a/src/routes/console/project-[project]/settings/domains/wizard/cnameTable.svelte b/src/routes/console/project-[project]/settings/domains/wizard/cnameTable.svelte index 63d859f0b..55eff5170 100644 --- a/src/routes/console/project-[project]/settings/domains/wizard/cnameTable.svelte +++ b/src/routes/console/project-[project]/settings/domains/wizard/cnameTable.svelte @@ -12,7 +12,7 @@ } from '$lib/elements/table'; import { domain } from './store'; - const target = import.meta.env?.VITE_APP_DOMAIN_TARGET?.toString() ?? ''; + const target = window?.location.hostname ?? ''; $: parts = $domain.domain.split('.'); $: registerable = [parts[parts.length - 2], parts[parts.length - 1]].join('.'); $: cnameValue = $domain.domain.replace('.' + registerable, '');