From 94da049056f75d5a34fd99d2211ad96d7094a0f5 Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 10 Nov 2022 17:11:31 +0100 Subject: [PATCH 1/5] feat: center stuff --- src/routes/console/account/sessions/[[page]]/+page.svelte | 2 +- .../auth/user-[user]/sessions/[[page]]/+page.svelte | 2 +- .../console/project-[project]/overview/keys/scopes.svelte | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/routes/console/account/sessions/[[page]]/+page.svelte b/src/routes/console/account/sessions/[[page]]/+page.svelte index 9d52e08d41..a810362a87 100644 --- a/src/routes/console/account/sessions/[[page]]/+page.svelte +++ b/src/routes/console/account/sessions/[[page]]/+page.svelte @@ -55,7 +55,7 @@ {#each data.sessions.sessions as session} -
+
{#if session.clientName}
diff --git a/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.svelte b/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.svelte index 44daf3d1d5..44df5194b7 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.svelte @@ -45,7 +45,7 @@ {#each data.sessions.sessions as session} -
+
- +
From 326d8a2dd0bb7a527767cb71027049cee3b5c742 Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 10 Nov 2022 17:24:05 +0100 Subject: [PATCH 2/5] feat: add danger zone --- package-lock.json | 28 +++++++++---------- package.json | 4 +-- src/lib/components/card.svelte | 7 ++++- src/lib/components/cardGrid.svelte | 4 ++- src/routes/console/account/+page.svelte | 2 +- .../settings/+page.svelte | 2 +- .../auth/teams/team-[team]/+page.svelte | 2 +- .../auth/user-[user]/+page.svelte | 2 +- .../document-[document]/+page.svelte | 2 +- .../settings/+page.svelte | 2 +- .../database-[database]/settings/+page.svelte | 2 +- .../function-[function]/settings/+page.svelte | 2 +- .../keys/[key]/+page@project-[project].svelte | 2 +- .../[platform]/+page@project-[project].svelte | 2 +- .../project-[project]/settings/+page.svelte | 2 +- .../settings/webhooks/[webhook]/+page.svelte | 2 +- .../bucket-[bucket]/file-[file]/+page.svelte | 2 +- .../bucket-[bucket]/settings/+page.svelte | 2 +- 18 files changed, 39 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index d7a077f1ec..40cf403bae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,8 @@ "version": "0.0.1", "dependencies": { "@aw-labs/appwrite-console": "^10.0.0", - "@aw-labs/icons": "0.0.0-72", - "@aw-labs/ui": "0.0.0-72", + "@aw-labs/icons": "0.0.0-74", + "@aw-labs/ui": "0.0.0-74", "@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-72", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-72.tgz", - "integrity": "sha512-z3k9ex4oKdE/VUPeqc6lpo2HuhC39Dov2NEXv/1v6YBw2l20LavNA6m7NU/DFkq+m286un/dp6w7ORbgpZlIvw==" + "version": "0.0.0-74", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-74.tgz", + "integrity": "sha512-aWb1OV8QEvw2BgJNK3P92wmfXlHw15wKOqMndx4kGrof+FCEekplohCnO1WZYZODoE+rF8DKHUE8RodVbJzo4A==" }, "node_modules/@aw-labs/ui": { - "version": "0.0.0-72", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-72.tgz", - "integrity": "sha512-+NR8p3fRMVj/RMPmyVJPcdaRwYkWNw7jJ/wxT4zjYxa7QeeMJwILYfYIFYnnu0GG9SN9nOc2z+yISqL0p0HgfA==", + "version": "0.0.0-74", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-74.tgz", + "integrity": "sha512-bg8j0XiB9+PwBUXVehKcxjdIS/GH9aJ1+RtdghDNBhOPc2A5zX+MmTCDsN071qlmDfW3pnufiCoQlek/qBvcdQ==", "dependencies": { "@aw-labs/icons": "*", "normalize.css": "^8.0.1", @@ -7467,14 +7467,14 @@ } }, "@aw-labs/icons": { - "version": "0.0.0-72", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-72.tgz", - "integrity": "sha512-z3k9ex4oKdE/VUPeqc6lpo2HuhC39Dov2NEXv/1v6YBw2l20LavNA6m7NU/DFkq+m286un/dp6w7ORbgpZlIvw==" + "version": "0.0.0-74", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-74.tgz", + "integrity": "sha512-aWb1OV8QEvw2BgJNK3P92wmfXlHw15wKOqMndx4kGrof+FCEekplohCnO1WZYZODoE+rF8DKHUE8RodVbJzo4A==" }, "@aw-labs/ui": { - "version": "0.0.0-72", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-72.tgz", - "integrity": "sha512-+NR8p3fRMVj/RMPmyVJPcdaRwYkWNw7jJ/wxT4zjYxa7QeeMJwILYfYIFYnnu0GG9SN9nOc2z+yISqL0p0HgfA==", + "version": "0.0.0-74", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-74.tgz", + "integrity": "sha512-bg8j0XiB9+PwBUXVehKcxjdIS/GH9aJ1+RtdghDNBhOPc2A5zX+MmTCDsN071qlmDfW3pnufiCoQlek/qBvcdQ==", "requires": { "@aw-labs/icons": "*", "normalize.css": "^8.0.1", diff --git a/package.json b/package.json index 93c13d4a4a..fed4a0d116 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ }, "dependencies": { "@aw-labs/appwrite-console": "^10.0.0", - "@aw-labs/icons": "0.0.0-72", - "@aw-labs/ui": "0.0.0-72", + "@aw-labs/icons": "0.0.0-74", + "@aw-labs/ui": "0.0.0-74", "@popperjs/core": "^2.11.6", "echarts": "^5.4.0", "pretty-bytes": "^6.0.0", diff --git a/src/lib/components/card.svelte b/src/lib/components/card.svelte index cac926f54d..2a9d495d25 100644 --- a/src/lib/components/card.svelte +++ b/src/lib/components/card.svelte @@ -1,8 +1,13 @@ -
+
diff --git a/src/lib/components/cardGrid.svelte b/src/lib/components/cardGrid.svelte index 665e642b69..2215cc6dcd 100644 --- a/src/lib/components/cardGrid.svelte +++ b/src/lib/components/cardGrid.svelte @@ -1,8 +1,10 @@ - +
diff --git a/src/routes/console/account/+page.svelte b/src/routes/console/account/+page.svelte index b0e8be9e0e..461c6f9681 100644 --- a/src/routes/console/account/+page.svelte +++ b/src/routes/console/account/+page.svelte @@ -155,7 +155,7 @@ - +
Delete Account
diff --git a/src/routes/console/organization-[organization]/settings/+page.svelte b/src/routes/console/organization-[organization]/settings/+page.svelte index 6c1d30e525..d2fc50b8f7 100644 --- a/src/routes/console/organization-[organization]/settings/+page.svelte +++ b/src/routes/console/organization-[organization]/settings/+page.svelte @@ -59,7 +59,7 @@ - +
Delete Organization
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte index ac8cfa54b4..43e53afb2c 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte @@ -77,7 +77,7 @@ - +
Danger Zone
diff --git a/src/routes/console/project-[project]/auth/user-[user]/+page.svelte b/src/routes/console/project-[project]/auth/user-[user]/+page.svelte index 48ecb3e62c..35c47ec8ca 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/+page.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/+page.svelte @@ -444,7 +444,7 @@ - +
Danger Zone
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte index a30fb0afbb..4bc625c9b6 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte @@ -83,7 +83,7 @@ - + Delete Document

The document will be permanently deleted, including all the data within it. This action diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte index 89913133fc..c8abe4744f 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte @@ -211,7 +211,7 @@ - + Delete Collection

The collection will be permanently deleted, including all the documents within it. diff --git a/src/routes/console/project-[project]/databases/database-[database]/settings/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/settings/+page.svelte index f4525455a2..abb475132e 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/settings/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/settings/+page.svelte @@ -85,7 +85,7 @@ - +

Danger Zone
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte index 87a1f88994..c1e8ad1253 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte @@ -539,7 +539,7 @@ - + Delete Function

The function will be permanently deleted, including all deployments associated with it. diff --git a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte index 154c9f2882..4e82451be7 100644 --- a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte +++ b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte @@ -164,7 +164,7 @@ - +

Delete API Key
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte index 9ffa44411f..baec0ded46 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte @@ -87,7 +87,7 @@ - +
Delete Platform
diff --git a/src/routes/console/project-[project]/settings/+page.svelte b/src/routes/console/project-[project]/settings/+page.svelte index d78f84f0bb..ac7495b862 100644 --- a/src/routes/console/project-[project]/settings/+page.svelte +++ b/src/routes/console/project-[project]/settings/+page.svelte @@ -124,7 +124,7 @@ - +
Delete Project
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/+page.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/+page.svelte index dcde9a6585..de473e5cbe 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/+page.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/+page.svelte @@ -315,7 +315,7 @@ - +
Delete Webhook
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte index 4e2f5d3b35..c65632b9e8 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte @@ -125,7 +125,7 @@ - + Delete File

The file will be permanently deleted, including all the files within it. This action diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte index 7768b0a5db..e712af75d5 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte @@ -421,7 +421,7 @@ - + Delete Bucket

The bucket will be permanently deleted, including all the files within it. This From 99b767a14235dcef389ccf8f0e4294893d556aeb Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 10 Nov 2022 18:09:44 +0100 Subject: [PATCH 3/5] feat: add output copy to function and logs --- src/lib/components/index.ts | 1 + src/lib/components/output.svelte | 17 +++++++++++++++++ src/lib/layout/logs.svelte | 16 +++++++++++++--- .../function-[function]/[[page]]/+page.svelte | 14 ++++++++++++-- 4 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 src/lib/components/output.svelte diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index 1752e1a211..c070333614 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -42,3 +42,4 @@ export { default as Tab } from './tab.svelte'; export { default as EventModal } from './eventModal.svelte'; export { default as Status } from './status.svelte'; export { default as Heading } from './heading.svelte'; +export { default as Output } from './output.svelte'; diff --git a/src/lib/components/output.svelte b/src/lib/components/output.svelte new file mode 100644 index 0000000000..1430ef4092 --- /dev/null +++ b/src/lib/components/output.svelte @@ -0,0 +1,17 @@ + + + +

+ + +
+ +
+
+ diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte index 7b9c14fa5a..6ec59687d5 100644 --- a/src/lib/layout/logs.svelte +++ b/src/lib/layout/logs.svelte @@ -2,7 +2,7 @@ import { toLocaleDateTime } from '$lib/helpers/date'; import { humanFileSize } from '$lib/helpers/sizeConvertion'; import { log } from '$lib/stores/logs'; - import { Status, Tab, Tabs } from '../components'; + import { Output, Status, Tab, Tabs } from '../components'; import { Button } from '$lib/elements/forms'; import { base } from '$app/paths'; import { app } from '$lib/stores/app'; @@ -68,7 +68,12 @@ alt="technology" />
-

Deployment ID: {$log.data.$id}

+
+

Deployment ID:

+ + {$log.data.$id} + +
Size: {size.value} {size.unit}
@@ -131,7 +136,12 @@ alt="technology" />
-

Execution ID: {$log.data.$id}

+
+

Execution ID:

+ + {$log.data.$id} + +
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 fa4083cdfb..44b48650ad 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 @@ -37,6 +37,7 @@ import { browser } from '$app/environment'; import { sdkForConsole } from '$lib/stores/sdk'; import { page } from '$app/stores'; + import Output from '$lib/components/output.svelte'; export let data: PageData; @@ -98,8 +99,17 @@ alt="technology" />
-

Function ID: {$func.$id}

-

Deployment ID: {$func.deployment}

+
+

Function ID:

+ {$func.$id} +
+ +
+

Deployment ID:

+ + {$func.deployment} + +
From a6fb9798410bef6069fe4337af5e0fa1bfb05c5f Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 10 Nov 2022 18:53:02 +0100 Subject: [PATCH 4/5] feat: change entrypoin language --- .../function-[function]/create.svelte | 93 ++++++++++++------- 1 file changed, 62 insertions(+), 31 deletions(-) diff --git a/src/routes/console/project-[project]/functions/function-[function]/create.svelte b/src/routes/console/project-[project]/functions/function-[function]/create.svelte index 59322faff2..f61a1c1c9f 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/create.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/create.svelte @@ -2,12 +2,13 @@ import { InputChoice, Button, InputText, InputFile, FormList } from '$lib/elements/forms'; import { Modal, Collapsible, CollapsibleItem, Tabs, Tab, Code } from '$lib/components'; import { sdkForProject } from '$lib/stores/sdk'; - import { createEventDispatcher } from 'svelte'; + import { createEventDispatcher, onMount } from 'svelte'; import { addNotification } from '$lib/stores/notifications'; import { page } from '$app/stores'; import Github from '$lib/images/github-illustration.svg'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; + import { func } from './store'; export let showCreate = false; @@ -20,11 +21,69 @@ let entrypoint: string; let active: boolean; let files: FileList; + let codeSnippets = {}; const functionId = $page.params.function; const dispatch = createEventDispatcher(); - const create = async () => { + onMount(() => { + const lang = setLanguage($func.runtime); + codeSnippets = setCodeSnippets(lang); + }); + + function setLanguage(runtime: string) { + if (runtime.includes('node') || runtime.includes('deno')) { + return 'js'; + } else if (runtime.includes('php')) { + return 'php'; + } else if (runtime.includes('python')) { + return 'py'; + } else if (runtime.includes('dart')) { + return 'dart'; + } else if (runtime.includes('dotnet')) { + return 'cs'; + } else if (runtime.includes('ruby')) { + return 'rb'; + } else if (runtime.includes('swift')) { + return 'swift'; + } else if (runtime.includes('kotlin')) { + return 'kt'; + } else if (runtime.includes('java')) { + return 'java'; + } + } + + function setCodeSnippets(lang: string) { + return { + Unix: { + code: `appwrite functions createDeployment \\ + --functionId=${functionId} \\ + --entrypoint='index.${lang}' \\ + --code="." \\ + --activate=true`, + language: 'bash' + }, + + CMD: { + code: `appwrite functions createDeployment ^ + --functionId=${functionId} ^ + --entrypoint='index.${lang}' ^ + --code="." ^ + --activate=true`, + language: 'CMD' + }, + PowerShell: { + code: `appwrite functions createDeployment , + --functionId=${functionId} , + --entrypoint='index.${lang}' , + --code="." , + --activate=true`, + language: 'PowerShell' + } + }; + } + + async function create() { try { await sdkForProject.functions.createDeployment( functionId, @@ -42,35 +101,7 @@ message: error.message }); } - }; - - const codeSnippets = { - Unix: { - code: `appwrite functions createDeployment \\ - --functionId=${functionId} \\ - --entrypoint='index.js' \\ - --code="." \\ - --activate=true`, - language: 'bash' - }, - - CMD: { - code: `appwrite functions createDeployment ^ - --functionId=${functionId} ^ - --entrypoint='index.js' ^ - --code="." ^ - --activate=true`, - language: 'CMD' - }, - PowerShell: { - code: `appwrite functions createDeployment , - --functionId=${functionId} , - --entrypoint='index.js' , - --code="." , - --activate=true`, - language: 'PowerShell' - } - }; + } From f5cf015943389f0db5b20a2411ff25b41834a5ea Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 11 Nov 2022 09:20:48 +0100 Subject: [PATCH 5/5] fix: typo, add lang to placeholder --- .../functions/function-[function]/create.svelte | 5 +++-- .../console/project-[project]/overview/keys/scopes.svelte | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/routes/console/project-[project]/functions/function-[function]/create.svelte b/src/routes/console/project-[project]/functions/function-[function]/create.svelte index f61a1c1c9f..4d3469bc82 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/create.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/create.svelte @@ -21,13 +21,14 @@ let entrypoint: string; let active: boolean; let files: FileList; + let lang = 'js'; let codeSnippets = {}; const functionId = $page.params.function; const dispatch = createEventDispatcher(); onMount(() => { - const lang = setLanguage($func.runtime); + lang = setLanguage($func.runtime); codeSnippets = setCodeSnippets(lang); }); @@ -159,7 +160,7 @@ diff --git a/src/routes/console/project-[project]/overview/keys/scopes.svelte b/src/routes/console/project-[project]/overview/keys/scopes.svelte index a292e3f36f..4f3b44036d 100644 --- a/src/routes/console/project-[project]/overview/keys/scopes.svelte +++ b/src/routes/console/project-[project]/overview/keys/scopes.svelte @@ -78,7 +78,7 @@
- +