Merge branch 'feat-g4' of github.com:appwrite/console into feat-g4

This commit is contained in:
Arman committed 2023-08-10 16:13:12 +02:00
commit f2ba163a8a
4 files changed
+15 -6

No files matched your search

@@ -15,6 +15,7 @@
resourcesToMigrationForm
} from '$lib/stores/migration';
import { addNotification } from '$lib/stores/notifications';
import { wizard } from '$lib/stores/wizard';
export let formData: ReturnType<typeof createMigrationFormStore>;
export let provider: ReturnType<typeof createMigrationProviderStore>;
@@ -100,6 +101,12 @@
case 'firebase': {
if ($provider.projectId) {
// OAuth
const res = await sdk.forProject.migrations.getFirebaseReportOAuth(
providerResources.firebase,
$provider.projectId
);
report = res;
} else if ($provider.serviceAccount) {
// Manual auth
const res = await sdk.forProject.migrations.getFirebaseReport(
@@ -139,7 +146,7 @@
$: resources = providerResources[$provider.provider];
// $: wizard.setNextDisabled(!report);
$: wizard.setNextDisabled(!report);
</script>
<div class="box" style:border-radius="0.5rem">
@@ -20,7 +20,7 @@
const resources = migrationFormToResources($formData);
if ($provider.provider !== 'appwrite') return;
await getSdkForProject($selectedProject).migrations.migrateAppwrite(
await getSdkForProject($selectedProject).migrations.createAppwriteMigration(
resources,
$provider.endpoint,
$provider.projectID,
@@ -135,10 +135,7 @@
}))} />
</FormList>
<p class="u-text-center u-margin-block-start-24">
Signed in
<button class="u-bold" on:click|preventDefault={deauthorizeGoogle}>
Sign Out?
</button>
<button class="u-bold" on:click|preventDefault={deauthorizeGoogle}>Sign Out</button>
</p>
{/if}
{:else if $provider.provider === 'supabase'}
@@ -51,6 +51,11 @@
case 'firebase': {
if ($provider.projectId) {
// OAuth
const res = await sdk.forProject.migrations.createFirebaseOAuthMigration(
resources,
$provider.projectId
);
} else if ($provider.serviceAccount) {
// Manual auth
await sdk.forProject.migrations.createFirebaseMigration(