diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte
index ced96b76e..0914ae989 100644
--- a/src/routes/console/+layout.svelte
+++ b/src/routes/console/+layout.svelte
@@ -2,7 +2,7 @@
import Shell from '$lib/layout/shell.svelte';
import SideNavigation from '$lib/layout/navigation.svelte';
import Header from '$lib/layout/header.svelte';
- import { organizationList, newOrgModal } from '$lib/stores/organization';
+ import { newOrgModal } from '$lib/stores/organization';
import Create from './createOrganization.svelte';
import { page } from '$app/stores';
import { beforeNavigate } from '$app/navigation';
@@ -33,7 +33,8 @@
+ !$page.url.pathname.includes('/console/account') &&
+ !$page.url.pathname.includes('/console/onboarding')}>
@@ -48,9 +49,7 @@
{/if}
-{#if $newOrgModal}
-
-{/if}
+
{#if $log.show}
diff --git a/src/routes/console/+page.ts b/src/routes/console/+page.ts
index 62d0b382c..ed9ab29d9 100644
--- a/src/routes/console/+page.ts
+++ b/src/routes/console/+page.ts
@@ -1,5 +1,4 @@
import { base } from '$app/paths';
-import { newOrgModal } from '$lib/stores/organization';
import { redirect } from '@sveltejs/kit';
import type { PageLoad } from './$types';
@@ -8,7 +7,6 @@ export const load: PageLoad = async ({ parent }) => {
if (organizations.total) {
throw redirect(303, `${base}/console/organization-${organizations.teams[0].$id}`);
} else {
- newOrgModal.set(true);
- throw redirect(303, `${base}/console`);
+ throw redirect(303, `${base}/console/onboarding`);
}
};
diff --git a/src/routes/console/createOrganization.svelte b/src/routes/console/createOrganization.svelte
index 93caa9649..6f329afd7 100644
--- a/src/routes/console/createOrganization.svelte
+++ b/src/routes/console/createOrganization.svelte
@@ -9,9 +9,8 @@
import { Dependencies } from '$lib/constants';
export let show = false;
- export let closable = true;
const dispatch = createEventDispatcher();
-
+ $: console.log(show);
let name: string;
let id: string;
let showCustomId = false;
@@ -36,7 +35,7 @@
};
-
+
Create New Organization
-
+
diff --git a/src/routes/console/onboarding/+layout.svelte b/src/routes/console/onboarding/+layout.svelte
new file mode 100644
index 000000000..4fa864ce7
--- /dev/null
+++ b/src/routes/console/onboarding/+layout.svelte
@@ -0,0 +1 @@
+
diff --git a/src/routes/console/onboarding/+layout.ts b/src/routes/console/onboarding/+layout.ts
new file mode 100644
index 000000000..e0a2cb5e5
--- /dev/null
+++ b/src/routes/console/onboarding/+layout.ts
@@ -0,0 +1,8 @@
+import Header from './header.svelte';
+import type { LayoutLoad } from './$types';
+
+export const load: LayoutLoad = async () => {
+ return {
+ header: Header
+ };
+};
diff --git a/src/routes/console/onboarding/+page.svelte b/src/routes/console/onboarding/+page.svelte
new file mode 100644
index 000000000..c3a81f1eb
--- /dev/null
+++ b/src/routes/console/onboarding/+page.svelte
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
diff --git a/src/routes/console/onboarding/header.svelte b/src/routes/console/onboarding/header.svelte
new file mode 100644
index 000000000..51f7314c6
--- /dev/null
+++ b/src/routes/console/onboarding/header.svelte
@@ -0,0 +1,7 @@
+
+
+
+ Let's create your first project
+
diff --git a/src/routes/console/organization-[organization]/+layout.ts b/src/routes/console/organization-[organization]/+layout.ts
index ace3842e1..c01621c39 100644
--- a/src/routes/console/organization-[organization]/+layout.ts
+++ b/src/routes/console/organization-[organization]/+layout.ts
@@ -11,7 +11,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
try {
return {
header: Header,
- breadcrumb: Breadcrumbs,
+ breadcrumbs: Breadcrumbs,
organization: sdkForConsole.teams.get(params.organization),
members: sdkForConsole.teams.listMemberships(params.organization)
};
diff --git a/src/routes/console/organization-[organization]/deleteOrganization.svelte b/src/routes/console/organization-[organization]/deleteOrganization.svelte
index d6de9d113..37a5adda4 100644
--- a/src/routes/console/organization-[organization]/deleteOrganization.svelte
+++ b/src/routes/console/organization-[organization]/deleteOrganization.svelte
@@ -3,7 +3,7 @@
import { Button } from '$lib/elements/forms';
import { addNotification } from '$lib/stores/notifications';
import { sdkForConsole } from '$lib/stores/sdk';
- import { newOrgModal, organization, organizationList } from '$lib/stores/organization';
+ import { organization, organizationList } from '$lib/stores/organization';
import { goto, invalidate } from '$app/navigation';
import { base } from '$app/paths';
import { Dependencies } from '$lib/constants';
@@ -21,8 +21,8 @@
await invalidate(Dependencies.ACCOUNT);
goto(`${base}/console/`);
} else {
- newOrgModal.set(true);
- goto(`${base}/console`);
+ await invalidate(Dependencies.ACCOUNT);
+ goto(`${base}/console/onboarding`);
}
showDelete = false;
} catch (error) {
diff --git a/src/routes/console/organization-[organization]/header.svelte b/src/routes/console/organization-[organization]/header.svelte
index cc049d2e7..e946f15f6 100644
--- a/src/routes/console/organization-[organization]/header.svelte
+++ b/src/routes/console/organization-[organization]/header.svelte
@@ -52,9 +52,7 @@
{#each $organizationList.teams as org}
- (showDropdown = false)}>
+
{org.name}
{/each}
@@ -62,12 +60,9 @@
- {
- showDropdown = false;
- newOrgModal.set(true);
- }}>New Organization
+ newOrgModal.set(true)}>
+ New Organization
+
diff --git a/src/routes/console/project-[project]/+layout.ts b/src/routes/console/project-[project]/+layout.ts
index e19be8f4c..ceb51ff80 100644
--- a/src/routes/console/project-[project]/+layout.ts
+++ b/src/routes/console/project-[project]/+layout.ts
@@ -3,8 +3,7 @@ import { sdkForConsole, sdkForProject, setProject } from '$lib/stores/sdk';
import { error } from '@sveltejs/kit';
import type { LayoutLoad } from './$types';
-export const load: LayoutLoad = async ({ params, depends, parent }) => {
- await parent();
+export const load: LayoutLoad = async ({ params, depends }) => {
depends(Dependencies.PROJECT);
if (sdkForProject.client.config.project !== params.project) {
diff --git a/src/routes/console/project-[project]/functions/function-[function]/+layout.svelte b/src/routes/console/project-[project]/functions/function-[function]/+layout.svelte
index d5ad77b62..e8b8dae48 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/+layout.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/+layout.svelte
@@ -5,6 +5,4 @@
-{#if $execute}
-
-{/if}
+
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 4e17cbfc3..80841688b 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
@@ -289,11 +289,7 @@
-
+
@@ -573,14 +569,10 @@
-
-{#if showVariablesModal}
-
-{/if}
-
+