From c8e9da2a768b38ecac1aab1b0e6ae191dd4f1fd8 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Wed, 12 Jul 2023 17:35:01 +0100 Subject: [PATCH] mock deploy to cloud & self-hosted --- src/lib/helpers/object.ts | 12 + src/lib/stores/migration.ts | 2 + src/routes/+layout.svelte | 3 +- src/routes/+layout.ts | 1 + src/routes/console/+layout.svelte | 8 - .../(migration-wizard)/step1.svelte | 244 ++++-------------- .../(migration-wizard)/step2.svelte | 25 +- .../+layout.svelte | 6 + .../migrations/(import)/wizard.svelte | 2 + .../settings/migrations/+page.svelte | 15 +- .../settings/migrations/+page.ts | 4 +- .../settings/migrations/details.svelte | 5 +- .../settings/migrations/stores.ts | 3 + 13 files changed, 115 insertions(+), 215 deletions(-) create mode 100644 src/routes/console/project-[project]/settings/migrations/stores.ts diff --git a/src/lib/helpers/object.ts b/src/lib/helpers/object.ts index a1aa69eeb..923053bfc 100644 --- a/src/lib/helpers/object.ts +++ b/src/lib/helpers/object.ts @@ -50,3 +50,15 @@ export function deepMap( return result; } + +export function parseIfString(value: unknown): any { + if (typeof value === 'string') { + try { + return JSON.parse(value); + } catch { + return value; + } + } + + return value; +} diff --git a/src/lib/stores/migration.ts b/src/lib/stores/migration.ts index 916890a3c..02e5a00ee 100644 --- a/src/lib/stores/migration.ts +++ b/src/lib/stores/migration.ts @@ -61,6 +61,8 @@ export const migrationFormToResources = (formData: MigrationFormData): Resource[ } if (formData.databases.documents) { resources.push('collection'); + resources.push('attribute'); + resources.push('index'); resources.push('document'); } if (formData.functions.root) { diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index fcc41255e..a50dd02f7 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -15,7 +15,8 @@ import { onMount } from 'svelte'; import { onCLS, onFCP, onFID, onINP, onLCP, onTTFB } from 'web-vitals'; import Loading from './loading.svelte'; - import { loading } from './store'; + import { loading, requestedMigration } from './store'; + import { openMigrationWizard } from './console/organization-[organization]/(migration-wizard)'; if (browser) { window.VERCEL_ANALYTICS_ID = import.meta.env.VERCEL_ANALYTICS_ID?.toString() ?? false; diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index ead3e4ac5..7bb0bbc4c 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -16,6 +16,7 @@ export const load: LayoutLoad = async ({ depends, url }) => { if (url.searchParams.has('migrate')) { requestedMigration.set(true); } + try { const account = await sdk.forConsole.account.get(); diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte index bb1f6f2bf..fe5bc502a 100644 --- a/src/routes/console/+layout.svelte +++ b/src/routes/console/+layout.svelte @@ -45,14 +45,6 @@ $log.data = null; $log.func = null; } - - $: { - if ($requestedMigration) { - console.log('hey fuckface'); - } else { - console.log('banana'); - } - } - import SvgIcon from '$lib/components/svgIcon.svelte'; - import { Button, FormList, InputNumber, InputText } from '$lib/elements/forms'; + import { page } from '$app/stores'; + import { InputSelect } from '$lib/elements/forms'; + import InputText from '$lib/elements/forms/inputText.svelte'; import { WizardStep } from '$lib/layout'; - import { provider, type Provider } from '.'; + import type { Models } from '@appwrite.io/console'; - const providers: Record = { - appwrite: 'Appwrite', - firebase: 'Firebase', - supabase: 'Supabase', - nhost: 'NHost' - }; + const projects = $page.data.allProjects as Models.ProjectList; + const hasProjects = projects.total > 0; - let showAuth = false; + let projectType = 'existing'; + + let selectedProject: string = null; - Choose provider -
- {#each Object.entries(providers) as [key, value]} -