From f6744fc07a2bedce11af9d12801bd380e26f6450 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 13 Jan 2023 13:29:22 +0100 Subject: [PATCH 1/3] feat: add console sdk --- app/config/platforms.php | 14 +++++++------- app/tasks/sdks.php | 11 ++++++++--- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/config/platforms.php b/app/config/platforms.php index eaebdb8e1c..7f5c2fccd7 100644 --- a/app/config/platforms.php +++ b/app/config/platforms.php @@ -11,7 +11,7 @@ return [ 'description' => 'Client libraries for integrating with Appwrite to build client-based applications and websites. Read the [getting started for web](/docs/getting-started-for-web) or [getting started for Flutter](/docs/getting-started-for-flutter) tutorials to start building your first application.', 'enabled' => true, 'beta' => false, - 'languages' => [ // TODO change key to 'sdks' + 'sdks' => [ [ 'key' => 'web', 'name' => 'Web', @@ -181,11 +181,11 @@ return [ 'name' => 'Console', 'enabled' => false, 'beta' => false, - 'languages' => [ + 'sdks' => [ [ 'key' => 'web', 'name' => 'Console', - 'version' => '7.2.0', + 'version' => '0.0.1', 'url' => 'https://github.com/appwrite/sdk-for-console', 'package' => '', 'enabled' => true, @@ -193,10 +193,10 @@ return [ 'dev' => false, 'hidden' => true, 'family' => APP_PLATFORM_CONSOLE, - 'prism' => 'console', + 'prism' => 'javascript', 'source' => \realpath(__DIR__ . '/../sdks/console-web'), - 'gitUrl' => '', - 'gitBranch' => '', + 'gitUrl' => 'git@github.com:appwrite/sdk-for-console.git', + 'gitBranch' => 'main', 'gitRepoName' => 'sdk-for-console', 'gitUserName' => 'appwrite', ], @@ -227,7 +227,7 @@ return [ 'description' => 'Libraries for integrating with Appwrite to build server side integrations. Read the [getting started for server](/docs/getting-started-for-server) tutorial to start building your first server integration.', 'enabled' => true, 'beta' => false, - 'languages' => [ + 'sdks' => [ [ 'key' => 'nodejs', 'name' => 'Node.js', diff --git a/app/tasks/sdks.php b/app/tasks/sdks.php index a6c7512826..b50f248b57 100644 --- a/app/tasks/sdks.php +++ b/app/tasks/sdks.php @@ -26,7 +26,8 @@ $cli ->task('sdks') ->action(function () { $platforms = Config::getParam('platforms'); - $selected = \strtolower(Console::confirm('Choose SDK ("*" for all):')); + $selectedPlatform = Console::confirm('Choose Platform ("'. APP_PLATFORM_CLIENT .'", "'. APP_PLATFORM_SERVER .'", "'. APP_PLATFORM_CONSOLE .'" or "*" for all):'); + $selectedSDK = \strtolower(Console::confirm('Choose SDK ("*" for all):')); $version = Console::confirm('Choose an Appwrite version'); $git = (Console::confirm('Should we use git push? (yes/no)') == 'yes'); $production = ($git) ? (Console::confirm('Type "Appwrite" to push code to production git repos') == 'Appwrite') : false; @@ -37,8 +38,12 @@ $cli } foreach ($platforms as $key => $platform) { - foreach ($platform['languages'] as $language) { - if ($selected !== $language['key'] && $selected !== '*') { + if ($selectedPlatform !== $key && $selectedPlatform !== '*') { + continue; + } + + foreach ($platform['sdks'] as $language) { + if ($selectedSDK !== $language['key'] && $selectedSDK !== '*') { continue; } From 4639f2c753c04e97e924a18090a0d39e04d7b1f5 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 13 Jan 2023 13:32:47 +0100 Subject: [PATCH 2/3] chore: run formatter --- app/tasks/sdks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/tasks/sdks.php b/app/tasks/sdks.php index b50f248b57..c8c089bd3c 100644 --- a/app/tasks/sdks.php +++ b/app/tasks/sdks.php @@ -26,7 +26,7 @@ $cli ->task('sdks') ->action(function () { $platforms = Config::getParam('platforms'); - $selectedPlatform = Console::confirm('Choose Platform ("'. APP_PLATFORM_CLIENT .'", "'. APP_PLATFORM_SERVER .'", "'. APP_PLATFORM_CONSOLE .'" or "*" for all):'); + $selectedPlatform = Console::confirm('Choose Platform ("' . APP_PLATFORM_CLIENT . '", "' . APP_PLATFORM_SERVER . '", "' . APP_PLATFORM_CONSOLE . '" or "*" for all):'); $selectedSDK = \strtolower(Console::confirm('Choose SDK ("*" for all):')); $version = Console::confirm('Choose an Appwrite version'); $git = (Console::confirm('Should we use git push? (yes/no)') == 'yes'); From f7e35cce2c72333236023c64a626b116e7532734 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 16 Jan 2023 12:09:13 +0100 Subject: [PATCH 3/3] fix: sdk typo --- app/controllers/web/home.php | 2 +- app/init.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/web/home.php b/app/controllers/web/home.php index 04785fb338..da1307e5ea 100644 --- a/app/controllers/web/home.php +++ b/app/controllers/web/home.php @@ -17,7 +17,7 @@ App::get('/versions') ]; foreach ($platforms as $platform) { - $languages = $platform['languages'] ?? []; + $languages = $platform['sdks'] ?? []; foreach ($languages as $key => $language) { if (isset($language['dev']) && $language['dev']) { diff --git a/app/init.php b/app/init.php index b05950d679..cd7bf8bb93 100644 --- a/app/init.php +++ b/app/init.php @@ -1048,7 +1048,7 @@ App::setResource('servers', function () { $languages = array_map(function ($language) { return strtolower($language['name']); - }, $server['languages']); + }, $server['sdks']); return $languages; });