From 5202598df60fd86714593944ea962abdf4bf1c16 Mon Sep 17 00:00:00 2001 From: Karan Jagtiani Date: Tue, 15 Aug 2023 19:16:34 +0530 Subject: [PATCH 01/10] Fix 5204 CDN code sample script tag using self-closing syntax --- .../overview/platforms/wizard/web/step2.svelte | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/web/step2.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/web/step2.svelte index 3e1921ef0..75007597f 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/web/step2.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/web/step2.svelte @@ -14,10 +14,12 @@ const example1 = `import { Client } from 'appwrite';`; const example2 = - ` From 969ecc7901b5e45b9fa92f8d28b20755ab415b33 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 28 Aug 2023 21:19:59 +0200 Subject: [PATCH 02/10] chore: add functions missing doc links --- src/lib/pages/domains/wizard/step1.svelte | 8 ++++++-- .../function-[function]/createManual.svelte | 9 +++++---- .../functions/function-[function]/execute.svelte | 5 +++-- .../function-[function]/settings/+page.svelte | 13 +++++++++---- .../settings/updateConfiguration.svelte | 8 ++++++-- .../templates/template-[template]/+page.svelte | 8 ++++++-- .../settings/updateInstallations.svelte | 8 ++++++-- 7 files changed, 41 insertions(+), 18 deletions(-) diff --git a/src/lib/pages/domains/wizard/step1.svelte b/src/lib/pages/domains/wizard/step1.svelte index 6c37353c2..fa00ce536 100644 --- a/src/lib/pages/domains/wizard/step1.svelte +++ b/src/lib/pages/domains/wizard/step1.svelte @@ -78,8 +78,12 @@ To add a domain to a locally hosted Appwrite project, you must first configure your server domain. - - + {/if} diff --git a/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte b/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte index 75437ae81..cada9f7e5 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte @@ -80,12 +80,13 @@ required /> {#if $func.version !== 'v3'} - Build commands now available for functions v3.0 + + Build commands now available for functions v3.0 + Update your function version to make use of new features including build commands. - - + {:else} diff --git a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte index 1ddddbb7f..26824e5f7 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte @@ -113,8 +113,9 @@ Update your function version to make use of new features including customizable HTTP data in your executions. - - + Your function is outdated Update your function version to make use of new features including build commands and HTTP data in your executions. To update, follow the steps outlined in our - - documentation. + documentation. - - + {/if} diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte index edebc1d10..8f59e953a 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte @@ -290,8 +290,12 @@ When installing Git in a locally hosted Appwrite project, you must first configure your environment variables. - - + {/if} diff --git a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte index 6b089bce2..2e0b9c2b3 100644 --- a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte +++ b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte @@ -70,8 +70,12 @@ In order to clone a template to a locally hosted Appwrite project, you must set up a Git integration and configure your environment variables. - - + {/if} diff --git a/src/routes/console/project-[project]/settings/updateInstallations.svelte b/src/routes/console/project-[project]/settings/updateInstallations.svelte index 6a36b1452..7f2d79998 100644 --- a/src/routes/console/project-[project]/settings/updateInstallations.svelte +++ b/src/routes/console/project-[project]/settings/updateInstallations.svelte @@ -189,8 +189,12 @@ When installing Git in a locally hosted Appwrite project, you must first configure your environment variables. - - + {/if} From 42b9c8d47ffbb9019f3cfaaa1e5cf5b9cc162d33 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Tue, 29 Aug 2023 08:20:59 +0100 Subject: [PATCH 03/10] feat: Add marketplace usecases & missing templates --- src/lib/stores/marketplace.ts | 58 ++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/src/lib/stores/marketplace.ts b/src/lib/stores/marketplace.ts index d38c3d679..1a36bf6d9 100644 --- a/src/lib/stores/marketplace.ts +++ b/src/lib/stores/marketplace.ts @@ -9,7 +9,7 @@ export const marketplace = [ events: [], cron: '', timeout: 15, - usecases: ['placeholder'], + usecases: ['starter'], runtimes: [ { name: 'node-18.0', @@ -66,13 +66,31 @@ export const marketplace = [ events: [], cron: '', timeout: 15, - usecases: ['placeholder'], + usecases: ['ai', 'chatbot'], runtimes: [ { name: 'node-18.0', commands: 'npm install', entrypoint: 'src/main.js', providerRootDirectory: 'node/prompt-chatgpt' + }, + { + name: 'python-3.9', + commands: 'pip install -r requirements.txt', + entrypoint: 'src/main.py', + providerRootDirectory: 'python/prompt_chatgpt' + }, + { + name: 'php-8.0', + commands: 'composer install', + entrypoint: 'src/index.php', + providerRootDirectory: 'php/prompt-chatgpt' + }, + { + name: 'dart-2.17', + commands: 'dart pub get', + entrypoint: 'lib/main.dart', + providerRootDirectory: 'dart/prompt_chatgpt' } ], instructions: `For documentation and instructions check out file.`, @@ -106,13 +124,19 @@ export const marketplace = [ events: [], cron: '', timeout: 15, - usecases: ['placeholder'], + usecases: ['chatbot', 'discord'], runtimes: [ { name: 'node-18.0', commands: 'npm install && npm run setup', - entrypoint: 'src/main.js', + entrypoint: 'src/main.js && npm run setup', providerRootDirectory: 'node/discord-command-bot' + }, + { + name: 'python-3.9', + commands: 'pip install -r requirements.txt && python src/setup.py', + entrypoint: 'src/main.py', + providerRootDirectory: 'python/discord_command_bot' } ], instructions: `For documentation and instructions check out file.`, @@ -139,7 +163,7 @@ export const marketplace = [ events: [], cron: '', timeout: 15, - usecases: ['placeholder'], + usecases: ['ai', 'moderation'], runtimes: [ { name: 'node-18.0', @@ -173,7 +197,7 @@ export const marketplace = [ events: [], cron: '', timeout: 15, - usecases: ['placeholder'], + usecases: ['ai', 'moderation'], runtimes: [ { name: 'node-18.0', @@ -206,7 +230,7 @@ export const marketplace = [ events: [], cron: '', timeout: 15, - usecases: ['placeholder'], + usecases: ['pdf', 'invoice'], runtimes: [ { name: 'node-18.0', @@ -232,7 +256,7 @@ export const marketplace = [ events: [], cron: '', timeout: 15, - usecases: ['placeholder'], + usecases: ['github'], runtimes: [ { name: 'node-18.0', @@ -272,7 +296,7 @@ export const marketplace = [ events: [], cron: '', timeout: 15, - usecases: ['placeholder'], + usecases: ['url', 'link'], runtimes: [ { name: 'node-18.0', @@ -326,13 +350,19 @@ export const marketplace = [ events: [], cron: '', timeout: 15, - usecases: ['placeholder'], + usecases: ['search', 'algolia'], runtimes: [ { name: 'node-18.0', commands: 'npm install', entrypoint: 'src/main.js', providerRootDirectory: 'node/sync-with-algolia' + }, + { + name: 'python-3.9', + commands: 'pip install -r requirements.txt', + entrypoint: 'src/main.py', + providerRootDirectory: 'python/sync_with_algolia' } ], instructions: `For documentation and instructions check out file.`, @@ -396,7 +426,7 @@ export const marketplace = [ events: [], cron: '', timeout: 15, - usecases: ['placeholder'], + usecases: ['search', 'meilisearch'], runtimes: [ { name: 'node-18.0', @@ -472,7 +502,7 @@ export const marketplace = [ events: [], cron: '', timeout: 15, - usecases: ['placeholder'], + usecases: ['sms', 'whatsapp', 'vonage'], runtimes: [ { name: 'node-18.0', @@ -523,7 +553,7 @@ export const marketplace = [ events: [], cron: '', timeout: 15, - usecases: ['placeholder'], + usecases: ['notification', 'fcm'], runtimes: [ { name: 'node-18.0', @@ -574,7 +604,7 @@ export const marketplace = [ events: [], cron: '', timeout: 15, - usecases: ['placeholder'], + usecases: ['form', 'email'], runtimes: [ { name: 'node-18.0', From 9ab06c13702e9887a5b6b6b8fd5ac2b3c400c618 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Tue, 29 Aug 2023 08:23:14 +0100 Subject: [PATCH 04/10] chore: prettier --- src/lib/stores/marketplace.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/stores/marketplace.ts b/src/lib/stores/marketplace.ts index 1a36bf6d9..17a54c337 100644 --- a/src/lib/stores/marketplace.ts +++ b/src/lib/stores/marketplace.ts @@ -357,7 +357,7 @@ export const marketplace = [ commands: 'npm install', entrypoint: 'src/main.js', providerRootDirectory: 'node/sync-with-algolia' - }, + }, { name: 'python-3.9', commands: 'pip install -r requirements.txt', From b970f09edc0c8156a8a6e02fce858d83c4b2ac37 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Tue, 29 Aug 2023 09:48:24 +0100 Subject: [PATCH 05/10] feat: new template ports --- src/lib/stores/marketplace.ts | 38 ++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/src/lib/stores/marketplace.ts b/src/lib/stores/marketplace.ts index 17a54c337..c3e836fcc 100644 --- a/src/lib/stores/marketplace.ts +++ b/src/lib/stores/marketplace.ts @@ -204,6 +204,18 @@ export const marketplace = [ commands: 'npm install', entrypoint: 'src/main.js', providerRootDirectory: 'node/censor-with-redact' + }, + { + name: 'python-3.9', + commands: 'pip install -r requirements.txt', + entrypoint: 'src/main.py', + providerRootDirectory: 'python/censor_with_redact' + }, + { + name: 'dart-2.17', + commands: 'dart pub get', + entrypoint: 'lib/main.dart', + providerRootDirectory: 'dart/censor_with_redact' } ], instructions: `For documentation and instructions check out file.`, @@ -338,6 +350,12 @@ export const marketplace = [ value: 'urls', placeholder: 'urls', required: false + }, + { + name: 'SHORT_BASE_URL', + description: `The domain to use for the short URLs. You can use your functions subdomain or a custom domain.`, + value: '', + placeholder: 'https://shortdomain.io' } ] }, @@ -363,6 +381,12 @@ export const marketplace = [ commands: 'pip install -r requirements.txt', entrypoint: 'src/main.py', providerRootDirectory: 'python/sync_with_algolia' + }, + { + name: 'php-8.0', + commands: 'composer install', + entrypoint: 'src/index.php', + providerRootDirectory: 'php/sync-with-algolia' } ], instructions: `For documentation and instructions check out file.`, @@ -399,7 +423,7 @@ export const marketplace = [ { name: 'ALGOLIA_INDEX_ID', description: `The ID of the index in Algolia where the documents are to be synced. Learn more.`, - placeholder: 'appwrite_index', + placeholder: 'my_index', required: true }, { @@ -611,6 +635,18 @@ export const marketplace = [ commands: 'npm install', entrypoint: 'src/main.js', providerRootDirectory: 'node/email-contact-form' + }, + { + name: 'python-3.9', + commands: 'pip install -r requirements.txt', + entrypoint: 'src/main.py', + providerRootDirectory: 'python/email_contact_form' + }, + { + name: 'php-8.0', + commands: 'composer install', + entrypoint: 'src/index.php', + providerRootDirectory: 'php/email-contact-form' } ], instructions: `For documentation and instructions check out file.`, From d05a3d69212d7ce2310ae00dcd6ad092cc0cda57 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Tue, 29 Aug 2023 09:52:40 +0100 Subject: [PATCH 06/10] chore: additional usecases --- src/lib/stores/marketplace.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/stores/marketplace.ts b/src/lib/stores/marketplace.ts index c3e836fcc..87564d31d 100644 --- a/src/lib/stores/marketplace.ts +++ b/src/lib/stores/marketplace.ts @@ -124,7 +124,7 @@ export const marketplace = [ events: [], cron: '', timeout: 15, - usecases: ['chatbot', 'discord'], + usecases: ['bot', 'discord'], runtimes: [ { name: 'node-18.0', @@ -268,7 +268,7 @@ export const marketplace = [ events: [], cron: '', timeout: 15, - usecases: ['github'], + usecases: ['github', 'bot'], runtimes: [ { name: 'node-18.0', @@ -577,7 +577,7 @@ export const marketplace = [ events: [], cron: '', timeout: 15, - usecases: ['notification', 'fcm'], + usecases: ['notification', 'fcm', 'firebase'], runtimes: [ { name: 'node-18.0', From ee815afa597d57c18c50ce711e3212ee10ac1047 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Tue, 29 Aug 2023 09:58:46 +0100 Subject: [PATCH 07/10] fix: missing required field --- src/lib/stores/marketplace.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/stores/marketplace.ts b/src/lib/stores/marketplace.ts index 87564d31d..adc387831 100644 --- a/src/lib/stores/marketplace.ts +++ b/src/lib/stores/marketplace.ts @@ -1,4 +1,4 @@ -export const marketplace = [ +export const marketplace: MarketplaceTemplate[] = [ { icon: 'icon-lightning-bolt', id: 'starter', @@ -355,7 +355,8 @@ export const marketplace = [ name: 'SHORT_BASE_URL', description: `The domain to use for the short URLs. You can use your functions subdomain or a custom domain.`, value: '', - placeholder: 'https://shortdomain.io' + placeholder: 'https://shortdomain.io', + required: true } ] }, From 1771c6648d5a0d478e60c9290ffcad22b1e1de86 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 29 Aug 2023 11:08:07 +0200 Subject: [PATCH 08/10] fix: disable buttons when vcs disabled --- .../function-[function]/settings/updateConfiguration.svelte | 1 + .../functions/templates/template-[template]/+page.svelte | 5 ++++- .../project-[project]/settings/updateInstallations.svelte | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte index 8f59e953a..3113e5d18 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte @@ -317,6 +317,7 @@ diff --git a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte index 2e0b9c2b3..e70569173 100644 --- a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte +++ b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte @@ -87,7 +87,10 @@ View source - diff --git a/src/routes/console/project-[project]/settings/updateInstallations.svelte b/src/routes/console/project-[project]/settings/updateInstallations.svelte index 7f2d79998..4c6f52ee7 100644 --- a/src/routes/console/project-[project]/settings/updateInstallations.svelte +++ b/src/routes/console/project-[project]/settings/updateInstallations.svelte @@ -206,7 +206,10 @@
- From 8a43dc13574058f7436d13b7e4e6c23c4382aa88 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Tue, 29 Aug 2023 10:21:47 +0100 Subject: [PATCH 09/10] feat: simplify use cases --- src/lib/stores/marketplace.ts | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lib/stores/marketplace.ts b/src/lib/stores/marketplace.ts index adc387831..54d80e23e 100644 --- a/src/lib/stores/marketplace.ts +++ b/src/lib/stores/marketplace.ts @@ -9,7 +9,7 @@ export const marketplace: MarketplaceTemplate[] = [ events: [], cron: '', timeout: 15, - usecases: ['starter'], + usecases: ['Starter'], runtimes: [ { name: 'node-18.0', @@ -66,7 +66,7 @@ export const marketplace: MarketplaceTemplate[] = [ events: [], cron: '', timeout: 15, - usecases: ['ai', 'chatbot'], + usecases: ['AI'], runtimes: [ { name: 'node-18.0', @@ -124,7 +124,7 @@ export const marketplace: MarketplaceTemplate[] = [ events: [], cron: '', timeout: 15, - usecases: ['bot', 'discord'], + usecases: ['Messaging'], runtimes: [ { name: 'node-18.0', @@ -163,7 +163,7 @@ export const marketplace: MarketplaceTemplate[] = [ events: [], cron: '', timeout: 15, - usecases: ['ai', 'moderation'], + usecases: ['AI'], runtimes: [ { name: 'node-18.0', @@ -197,7 +197,7 @@ export const marketplace: MarketplaceTemplate[] = [ events: [], cron: '', timeout: 15, - usecases: ['ai', 'moderation'], + usecases: ['ai'], runtimes: [ { name: 'node-18.0', @@ -242,7 +242,7 @@ export const marketplace: MarketplaceTemplate[] = [ events: [], cron: '', timeout: 15, - usecases: ['pdf', 'invoice'], + usecases: ['Utilities'], runtimes: [ { name: 'node-18.0', @@ -268,7 +268,7 @@ export const marketplace: MarketplaceTemplate[] = [ events: [], cron: '', timeout: 15, - usecases: ['github', 'bot'], + usecases: ['Dev Tools'], runtimes: [ { name: 'node-18.0', @@ -308,7 +308,7 @@ export const marketplace: MarketplaceTemplate[] = [ events: [], cron: '', timeout: 15, - usecases: ['url', 'link'], + usecases: ['Utilities'], runtimes: [ { name: 'node-18.0', @@ -369,7 +369,7 @@ export const marketplace: MarketplaceTemplate[] = [ events: [], cron: '', timeout: 15, - usecases: ['search', 'algolia'], + usecases: ['Databases'], runtimes: [ { name: 'node-18.0', @@ -451,7 +451,7 @@ export const marketplace: MarketplaceTemplate[] = [ events: [], cron: '', timeout: 15, - usecases: ['search', 'meilisearch'], + usecases: ['Databases'], runtimes: [ { name: 'node-18.0', @@ -527,7 +527,7 @@ export const marketplace: MarketplaceTemplate[] = [ events: [], cron: '', timeout: 15, - usecases: ['sms', 'whatsapp', 'vonage'], + usecases: ['Messaging'], runtimes: [ { name: 'node-18.0', @@ -578,7 +578,7 @@ export const marketplace: MarketplaceTemplate[] = [ events: [], cron: '', timeout: 15, - usecases: ['notification', 'fcm', 'firebase'], + usecases: ['Messaging'], runtimes: [ { name: 'node-18.0', @@ -629,7 +629,7 @@ export const marketplace: MarketplaceTemplate[] = [ events: [], cron: '', timeout: 15, - usecases: ['form', 'email'], + usecases: ['Utilities'], runtimes: [ { name: 'node-18.0', From 594c6560e2754d78134dbfed0547d2dec4285266 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Tue, 29 Aug 2023 10:23:20 +0100 Subject: [PATCH 10/10] fix: uppercase ai usecase --- src/lib/stores/marketplace.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/stores/marketplace.ts b/src/lib/stores/marketplace.ts index 54d80e23e..3c76be73a 100644 --- a/src/lib/stores/marketplace.ts +++ b/src/lib/stores/marketplace.ts @@ -197,7 +197,7 @@ export const marketplace: MarketplaceTemplate[] = [ events: [], cron: '', timeout: 15, - usecases: ['ai'], + usecases: ['AI'], runtimes: [ { name: 'node-18.0',