-
+
{#if $app.themeInUse === 'dark'}
({
export const iconPath = derived(app, ($app) => {
return (name: string, type: 'color' | 'grayscale') => {
- return `/icons/${$app.themeInUse}/${type}/${name}.svg`;
+ return `${base}/icons/${$app.themeInUse}/${type}/${name}.svg`;
};
});
diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index 433706a49..f1e9680c2 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -18,14 +18,14 @@ import PaymentAuthRequired from '$lib/components/billing/alerts/paymentAuthRequi
import { addNotification, notifications } from './notifications';
import { goto } from '$app/navigation';
import { base } from '$app/paths';
-import { activeHeaderAlert, orgMissingPaymentMethod } from '$routes/console/store';
+import { activeHeaderAlert, orgMissingPaymentMethod } from '$routes/(console)/store';
import MarkedForDeletion from '$lib/components/billing/alerts/markedForDeletion.svelte';
import { BillingPlan } from '$lib/constants';
import PaymentMandate from '$lib/components/billing/alerts/paymentMandate.svelte';
import MissingPaymentMethod from '$lib/components/billing/alerts/missingPaymentMethod.svelte';
import LimitReached from '$lib/components/billing/alerts/limitReached.svelte';
import { wizard } from './wizard';
-import ChangeOrganizationTierCloud from '$routes/console/changeOrganizationTierCloud.svelte';
+import ChangeOrganizationTierCloud from '$routes/(console)/changeOrganizationTierCloud.svelte';
import { trackEvent } from '$lib/actions/analytics';
export type Tier = 'tier-0' | 'tier-1' | 'tier-2';
@@ -233,7 +233,7 @@ export async function checkForUsageLimit(org: Organization) {
{
name: 'View usage',
method: () => {
- goto(`${base}/console/organization-${org.$id}/usage`);
+ goto(`${base}/organization-${org.$id}/usage`);
}
},
{
@@ -297,7 +297,7 @@ export async function paymentExpired(org: Organization) {
{
name: 'Update payment details',
method: () => {
- goto(`${base}/console/account/payments`);
+ goto(`${base}/account/payments`);
}
}
]
@@ -311,7 +311,7 @@ export async function paymentExpired(org: Organization) {
{
name: 'Update payment details',
method: () => {
- goto(`${base}/console/account/payments`);
+ goto(`${base}/account/payments`);
}
}
]
diff --git a/src/lib/stores/oauth-providers.ts b/src/lib/stores/oauth-providers.ts
index 8d08dffdb..de3cc9748 100644
--- a/src/lib/stores/oauth-providers.ts
+++ b/src/lib/stores/oauth-providers.ts
@@ -1,15 +1,15 @@
import type { Models } from '@appwrite.io/console';
import type { SvelteComponent } from 'svelte';
import { writable } from 'svelte/store';
-import Apple from '../../routes/console/project-[project]/auth/(providers)/appleOAuth.svelte';
-import Auth0 from '../../routes/console/project-[project]/auth/(providers)/auth0OAuth.svelte';
-import Authentik from '../../routes/console/project-[project]/auth/(providers)/authentikOAuth.svelte';
-import GitLab from '../../routes/console/project-[project]/auth/(providers)/gitlabOAuth.svelte';
-import Google from '../../routes/console/project-[project]/auth/(providers)/googleOAuth.svelte';
-import Main from '../../routes/console/project-[project]/auth/(providers)/mainOAuth.svelte';
-import Microsoft from '../../routes/console/project-[project]/auth/(providers)/microsoftOAuth.svelte';
-import Oidc from '../../routes/console/project-[project]/auth/(providers)/oidcOAuth.svelte';
-import Okta from '../../routes/console/project-[project]/auth/(providers)/oktaOAuth.svelte';
+import Apple from '$routes/(console)/project-[project]/auth/(providers)/appleOAuth.svelte';
+import Auth0 from '$routes/(console)/project-[project]/auth/(providers)/auth0OAuth.svelte';
+import Authentik from '$routes/(console)/project-[project]/auth/(providers)/authentikOAuth.svelte';
+import GitLab from '$routes/(console)/project-[project]/auth/(providers)/gitlabOAuth.svelte';
+import Google from '$routes/(console)/project-[project]/auth/(providers)/googleOAuth.svelte';
+import Main from '$routes/(console)/project-[project]/auth/(providers)/mainOAuth.svelte';
+import Microsoft from '$routes/(console)/project-[project]/auth/(providers)/microsoftOAuth.svelte';
+import Oidc from '$routes/(console)/project-[project]/auth/(providers)/oidcOAuth.svelte';
+import Okta from '$routes/(console)/project-[project]/auth/(providers)/oktaOAuth.svelte';
export type Provider = Models.AuthProvider & {
icon: string;
diff --git a/src/lib/stores/stripe.ts b/src/lib/stores/stripe.ts
index 93b4576ae..ab52cbb8f 100644
--- a/src/lib/stores/stripe.ts
+++ b/src/lib/stores/stripe.ts
@@ -6,6 +6,7 @@ import type { PaymentMethodData } from '$lib/sdk/billing';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import { addNotification } from './notifications';
import { organization } from './organization';
+import { base } from '$app/paths';
export const stripe = writable();
let paymentMethod: PaymentMethodData;
@@ -62,7 +63,7 @@ export async function submitStripeCard(name: string, organizationId?: string) {
// // Element needs to be submitted before confirming the setup intent
elements.submit();
- const baseUrl = 'https://cloud.appwrite.io/console';
+ const baseUrl = 'https://cloud.appwrite.io' + base;
const accountUrl = `${baseUrl}/account/payments?clientSecret=${clientSecret}`;
const orgUrl = `${baseUrl}/organization-${organizationId}/billing?clientSecret=${clientSecret}`;
@@ -120,7 +121,7 @@ export async function confirmPayment(
) {
try {
const url =
- window.location.origin + (route ? route : `/console/organization-${orgId}/billing`);
+ window.location.origin + (route ? route : `${base}/organization-${orgId}/billing`);
const paymentMethod = await sdk.forConsole.billing.getPaymentMethod(paymentMethodId);
@@ -149,7 +150,7 @@ export async function confirmSetup(
paymentMethodId: string,
urlRoute?: string
) {
- const baseUrl = 'https://cloud.appwrite.io/console/';
+ const baseUrl = `https://cloud.appwrite.io${base}/`;
const { setupIntent, error } = await get(stripe).confirmCardSetup(clientSecret, {
payment_method: paymentMethodId,
diff --git a/src/lib/wizards/functions/components/repositories.svelte b/src/lib/wizards/functions/components/repositories.svelte
index dc8c73bd4..e067296f9 100644
--- a/src/lib/wizards/functions/components/repositories.svelte
+++ b/src/lib/wizards/functions/components/repositories.svelte
@@ -6,7 +6,7 @@
import { timeFromNow } from '$lib/helpers/date';
import { app } from '$lib/stores/app';
import { sdk } from '$lib/stores/sdk';
- import { repositories } from '$routes/console/project-[project]/functions/function-[function]/store';
+ import { repositories } from '$routes/(console)/project-[project]/functions/function-[function]/store';
import { installation, installations, repository } from '../store';
import { createEventDispatcher } from 'svelte';
@@ -120,7 +120,7 @@
Manage organization configuration in your project settingsproject settings
.
{#if selectedInstallation}
diff --git a/src/lib/wizards/functions/connectExisting.svelte b/src/lib/wizards/functions/connectExisting.svelte
index 7d097f773..ab104078e 100644
--- a/src/lib/wizards/functions/connectExisting.svelte
+++ b/src/lib/wizards/functions/connectExisting.svelte
@@ -4,7 +4,7 @@
import GitConfiguration from './steps/gitConfiguration.svelte';
import type { WizardStepsType } from '$lib/layout/wizard.svelte';
import { sdk } from '$lib/stores/sdk';
- import { func } from '$routes/console/project-[project]/functions/function-[function]/store';
+ import { func } from '$routes/(console)/project-[project]/functions/function-[function]/store';
import { choices, installation, repository } from './store';
import { wizard } from '$lib/stores/wizard';
import { invalidate } from '$app/navigation';
diff --git a/src/lib/wizards/functions/cover.svelte b/src/lib/wizards/functions/cover.svelte
index bcc19f123..126cfaa99 100644
--- a/src/lib/wizards/functions/cover.svelte
+++ b/src/lib/wizards/functions/cover.svelte
@@ -35,7 +35,7 @@
import { marketplace, type MarketplaceTemplate } from '$lib/stores/marketplace';
import { Button } from '$lib/elements/forms';
import { page } from '$app/stores';
- import { baseRuntimesList } from '$routes/console/project-[project]/functions/store';
+ import { baseRuntimesList } from '$routes/(console)/project-[project]/functions/store';
import { trackEvent } from '$lib/actions/analytics';
import type { Models } from '@appwrite.io/console';
import WizardCover from '$lib/layout/wizardCover.svelte';
@@ -44,7 +44,7 @@
import CreateGit from './createGit.svelte';
import { tooltip } from '$lib/actions/tooltip';
import { isSelfHosted } from '$lib/system';
- import { consoleVariables } from '$routes/console/store';
+ import { consoleVariables } from '$routes/(console)/store';
const isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true;
let hasInstallations: boolean;
@@ -256,7 +256,7 @@
text
noMargin
class="u-margin-inline-start-auto u-margin-block-start-16"
- href={`${base}/console/project-${$page.params.project}/functions/templates`}>
+ href={`${base}/project-${$page.params.project}/functions/templates`}>
All templates
diff --git a/src/lib/wizards/functions/createGit.svelte b/src/lib/wizards/functions/createGit.svelte
index cf8a4b748..55ef70af5 100644
--- a/src/lib/wizards/functions/createGit.svelte
+++ b/src/lib/wizards/functions/createGit.svelte
@@ -38,9 +38,7 @@
$choices.silentMode || undefined,
$choices.rootDir || undefined
);
- goto(
- `${base}/console/project-${$page.params.project}/functions/function-${response.$id}`
- );
+ goto(`${base}/project-${$page.params.project}/functions/function-${response.$id}`);
addNotification({
message: `${$createFunction.name} has been created`,
type: 'success'
diff --git a/src/lib/wizards/functions/createManual.svelte b/src/lib/wizards/functions/createManual.svelte
index a5b9fe20c..f5ab83b3b 100644
--- a/src/lib/wizards/functions/createManual.svelte
+++ b/src/lib/wizards/functions/createManual.svelte
@@ -44,9 +44,7 @@
$createFunctionDeployment[0],
true
);
- goto(
- `${base}/console/project-${$page.params.project}/functions/function-${response.$id}`
- );
+ goto(`${base}/project-${$page.params.project}/functions/function-${response.$id}`);
addNotification({
message: `${$createFunction.name} has been created`,
type: 'success'
diff --git a/src/lib/wizards/functions/createTemplate.svelte b/src/lib/wizards/functions/createTemplate.svelte
index 7d0d4958f..73c2502f8 100644
--- a/src/lib/wizards/functions/createTemplate.svelte
+++ b/src/lib/wizards/functions/createTemplate.svelte
@@ -68,9 +68,7 @@
await Promise.all(promises);
}
- goto(
- `${base}/console/project-${$page.params.project}/functions/function-${response.$id}`
- );
+ goto(`${base}/project-${$page.params.project}/functions/function-${response.$id}`);
addNotification({
message: `${response.name} has been created`,
type: 'success'
diff --git a/src/lib/wizards/functions/steps/details.svelte b/src/lib/wizards/functions/steps/details.svelte
index db5194d7c..c5c07bd07 100644
--- a/src/lib/wizards/functions/steps/details.svelte
+++ b/src/lib/wizards/functions/steps/details.svelte
@@ -5,7 +5,7 @@
import { WizardStep } from '$lib/layout';
import { onMount } from 'svelte';
import { createFunction } from '../store';
- import { runtimesList } from '$routes/console/project-[project]/functions/store';
+ import { runtimesList } from '$routes/(console)/project-[project]/functions/store';
let showCustomId = false;
diff --git a/src/lib/wizards/functions/steps/functionConfiguration.svelte b/src/lib/wizards/functions/steps/functionConfiguration.svelte
index a0209dd8d..d575ed6b3 100644
--- a/src/lib/wizards/functions/steps/functionConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/functionConfiguration.svelte
@@ -7,7 +7,7 @@
import { onMount } from 'svelte';
import { sdk } from '$lib/stores/sdk';
import { choices, createFunction, installation, repository } from '../store';
- import { runtimesList } from '$routes/console/project-[project]/functions/store';
+ import { runtimesList } from '$routes/(console)/project-[project]/functions/store';
let showCustomId = false;
diff --git a/src/lib/wizards/functions/steps/gitConfiguration.svelte b/src/lib/wizards/functions/steps/gitConfiguration.svelte
index 9980e765d..1552b668b 100644
--- a/src/lib/wizards/functions/steps/gitConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/gitConfiguration.svelte
@@ -4,7 +4,7 @@
import InputSelectSearch from '$lib/elements/forms/inputSelectSearch.svelte';
import { WizardStep } from '$lib/layout';
import { sdk } from '$lib/stores/sdk';
- import { sortBranches } from '$routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte';
+ import { sortBranches } from '$routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte';
import { choices, installation, repository } from '../store';
$choices.rootDir ??= '';
diff --git a/src/lib/wizards/functions/steps/templateConfiguration.svelte b/src/lib/wizards/functions/steps/templateConfiguration.svelte
index 7da879c82..91757ae87 100644
--- a/src/lib/wizards/functions/steps/templateConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/templateConfiguration.svelte
@@ -3,7 +3,7 @@
import { Pill } from '$lib/elements';
import { FormList, InputSelect, InputText } from '$lib/elements/forms';
import { WizardStep } from '$lib/layout';
- import { runtimesList } from '$routes/console/project-[project]/functions/store';
+ import { runtimesList } from '$routes/(console)/project-[project]/functions/store';
import { template, templateConfig } from '../store';
let showCustomId = false;
diff --git a/src/routes/auth/+layout.svelte b/src/routes/(auth)/git/+layout.svelte
similarity index 74%
rename from src/routes/auth/+layout.svelte
rename to src/routes/(auth)/git/+layout.svelte
index f2ffcf1d2..a4c2496e9 100644
--- a/src/routes/auth/+layout.svelte
+++ b/src/routes/(auth)/git/+layout.svelte
@@ -1,6 +1,6 @@
diff --git a/src/routes/git/authorize-contributor/+page.svelte b/src/routes/(auth)/git/authorize-contributor/+page.svelte
similarity index 100%
rename from src/routes/git/authorize-contributor/+page.svelte
rename to src/routes/(auth)/git/authorize-contributor/+page.svelte
diff --git a/src/routes/invite/+page.svelte b/src/routes/(auth)/invite/+page.svelte
similarity index 98%
rename from src/routes/invite/+page.svelte
rename to src/routes/(auth)/invite/+page.svelte
index cd6b2fc4e..b4d0b055e 100644
--- a/src/routes/invite/+page.svelte
+++ b/src/routes/(auth)/invite/+page.svelte
@@ -27,7 +27,7 @@
type: 'success',
message: 'Successfully logged in.'
});
- await goto(`${base}/console/organization-${teamId}`);
+ await goto(`${base}/organization-${teamId}`);
trackEvent(Submit.MembershipUpdateStatus);
} catch (error) {
addNotification({
diff --git a/src/routes/login/+page.svelte b/src/routes/(auth)/login/+page.svelte
similarity index 95%
rename from src/routes/login/+page.svelte
rename to src/routes/(auth)/login/+page.svelte
index e60e5811b..7dcac220f 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/(auth)/login/+page.svelte
@@ -44,10 +44,10 @@
if (redirect) {
await goto(`${base}${redirect}${$page.url.search}`);
} else {
- await goto(`${base}/console${$page.url.search ?? ''}`);
+ await goto(`${base}${$page.url.search ?? ''}`);
}
} else {
- await goto(`${base}/console`);
+ await goto(base);
}
} catch (error) {
disabled = false;
@@ -68,7 +68,7 @@
if (redirect) {
url = `${base}${redirect}${$page.url.search}`;
} else {
- url = `${base}/console${$page.url.search ?? ''}`;
+ url = `${base}${$page.url.search ?? ''}`;
}
}
sdk.forConsole.account.createOAuth2Session(
diff --git a/src/routes/mfa/+page.svelte b/src/routes/(auth)/mfa/+page.svelte
similarity index 98%
rename from src/routes/mfa/+page.svelte
rename to src/routes/(auth)/mfa/+page.svelte
index 389889db7..d97b17b11 100644
--- a/src/routes/mfa/+page.svelte
+++ b/src/routes/(auth)/mfa/+page.svelte
@@ -41,7 +41,7 @@
async function back() {
await sdk.forConsole.account.deleteSession('current');
- await goto(`${base}/`);
+ await goto(base);
}
async function verify() {
@@ -59,10 +59,10 @@
if (redirect) {
await goto(`${base}${redirect}${$page.url.search}`);
} else {
- await goto(`${base}/console${$page.url.search ?? ''}`);
+ await goto(`${base}${$page.url.search ?? ''}`);
}
} else {
- await goto(`${base}/console`);
+ await goto(base);
}
} catch (error) {
disabled = false;
diff --git a/src/routes/mfa/+page.ts b/src/routes/(auth)/mfa/+page.ts
similarity index 100%
rename from src/routes/mfa/+page.ts
rename to src/routes/(auth)/mfa/+page.ts
diff --git a/src/routes/recover/+page.svelte b/src/routes/(auth)/recover/+page.svelte
similarity index 100%
rename from src/routes/recover/+page.svelte
rename to src/routes/(auth)/recover/+page.svelte
diff --git a/src/routes/register/+page.svelte b/src/routes/(auth)/register/+page.svelte
similarity index 97%
rename from src/routes/register/+page.svelte
rename to src/routes/(auth)/register/+page.svelte
index ccc179174..4601675a7 100644
--- a/src/routes/register/+page.svelte
+++ b/src/routes/(auth)/register/+page.svelte
@@ -43,10 +43,10 @@
if (redirect) {
await goto(`${base}${redirect}${$page.url.search}`);
} else {
- await goto(`${base}/console${$page.url.search ?? ''}`);
+ await goto(`${base}${$page.url.search ?? ''}`);
}
} else {
- await goto(`${base}/console`);
+ await goto(base);
}
trackEvent(Submit.AccountCreate);
} catch (error) {
diff --git a/src/routes/register/invite/+layout.ts b/src/routes/(auth)/register/invite/+layout.ts
similarity index 100%
rename from src/routes/register/invite/+layout.ts
rename to src/routes/(auth)/register/invite/+layout.ts
diff --git a/src/routes/register/invite/[slug]/+page.svelte b/src/routes/(auth)/register/invite/[slug]/+page.svelte
similarity index 99%
rename from src/routes/register/invite/[slug]/+page.svelte
rename to src/routes/(auth)/register/invite/[slug]/+page.svelte
index 6b606bf18..a36c5505d 100644
--- a/src/routes/register/invite/[slug]/+page.svelte
+++ b/src/routes/(auth)/register/invite/[slug]/+page.svelte
@@ -77,7 +77,7 @@
const newPrefs = { ...prefs, code };
await sdk.forConsole.account.updatePrefs(newPrefs);
await invalidate(Dependencies.ACCOUNT);
- await goto(`${base}/console`);
+ await goto(base);
trackEvent('submit_account_create', { code: code });
}
} catch (error) {
diff --git a/src/routes/register/invite/[slug]/mlh-dark.svg b/src/routes/(auth)/register/invite/[slug]/mlh-dark.svg
similarity index 100%
rename from src/routes/register/invite/[slug]/mlh-dark.svg
rename to src/routes/(auth)/register/invite/[slug]/mlh-dark.svg
diff --git a/src/routes/register/invite/[slug]/mlh-light.svg b/src/routes/(auth)/register/invite/[slug]/mlh-light.svg
similarity index 100%
rename from src/routes/register/invite/[slug]/mlh-light.svg
rename to src/routes/(auth)/register/invite/[slug]/mlh-light.svg
diff --git a/src/routes/console/(migration-wizard)/index.ts b/src/routes/(console)/(migration)/index.ts
similarity index 100%
rename from src/routes/console/(migration-wizard)/index.ts
rename to src/routes/(console)/(migration)/index.ts
diff --git a/src/routes/console/(migration-wizard)/resource-form.svelte b/src/routes/(console)/(migration)/resource-form.svelte
similarity index 100%
rename from src/routes/console/(migration-wizard)/resource-form.svelte
rename to src/routes/(console)/(migration)/resource-form.svelte
diff --git a/src/routes/console/(migration-wizard)/step1.svelte b/src/routes/(console)/(migration)/step1.svelte
similarity index 100%
rename from src/routes/console/(migration-wizard)/step1.svelte
rename to src/routes/(console)/(migration)/step1.svelte
diff --git a/src/routes/console/(migration-wizard)/step2.svelte b/src/routes/(console)/(migration)/step2.svelte
similarity index 100%
rename from src/routes/console/(migration-wizard)/step2.svelte
rename to src/routes/(console)/(migration)/step2.svelte
diff --git a/src/routes/console/(migration-wizard)/wizard.svelte b/src/routes/(console)/(migration)/wizard.svelte
similarity index 92%
rename from src/routes/console/(migration-wizard)/wizard.svelte
rename to src/routes/(console)/(migration)/wizard.svelte
index 7123309e2..44bc33026 100644
--- a/src/routes/console/(migration-wizard)/wizard.svelte
+++ b/src/routes/(console)/(migration)/wizard.svelte
@@ -10,6 +10,7 @@
import Step1 from './step1.svelte';
import Step2 from './step2.svelte';
import { requestedMigration } from '$routes/store';
+ import { base } from '$app/paths';
const onExit = () => {
formData.reset();
@@ -30,7 +31,7 @@
await invalidateAll();
wizard.hide();
- goto(`/console/project-${$selectedProject}/settings/migrations`);
+ goto(`${base}/project-${$selectedProject}/settings/migrations`);
};
onDestroy(onExit);
diff --git a/src/routes/console/wizard/cloudOrganization/addressDetails.svelte b/src/routes/(console)/(wizard)/cloudOrganization/addressDetails.svelte
similarity index 100%
rename from src/routes/console/wizard/cloudOrganization/addressDetails.svelte
rename to src/routes/(console)/(wizard)/cloudOrganization/addressDetails.svelte
diff --git a/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte b/src/routes/(console)/(wizard)/cloudOrganization/confirmDetails.svelte
similarity index 100%
rename from src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
rename to src/routes/(console)/(wizard)/cloudOrganization/confirmDetails.svelte
diff --git a/src/routes/console/wizard/cloudOrganization/inviteMembers.svelte b/src/routes/(console)/(wizard)/cloudOrganization/inviteMembers.svelte
similarity index 100%
rename from src/routes/console/wizard/cloudOrganization/inviteMembers.svelte
rename to src/routes/(console)/(wizard)/cloudOrganization/inviteMembers.svelte
diff --git a/src/routes/console/wizard/cloudOrganization/organizationDetails.svelte b/src/routes/(console)/(wizard)/cloudOrganization/organizationDetails.svelte
similarity index 100%
rename from src/routes/console/wizard/cloudOrganization/organizationDetails.svelte
rename to src/routes/(console)/(wizard)/cloudOrganization/organizationDetails.svelte
diff --git a/src/routes/console/wizard/cloudOrganization/paymentDetails.svelte b/src/routes/(console)/(wizard)/cloudOrganization/paymentDetails.svelte
similarity index 100%
rename from src/routes/console/wizard/cloudOrganization/paymentDetails.svelte
rename to src/routes/(console)/(wizard)/cloudOrganization/paymentDetails.svelte
diff --git a/src/routes/console/wizard/cloudOrganization/store.ts b/src/routes/(console)/(wizard)/cloudOrganization/store.ts
similarity index 100%
rename from src/routes/console/wizard/cloudOrganization/store.ts
rename to src/routes/(console)/(wizard)/cloudOrganization/store.ts
diff --git a/src/routes/console/wizard/cloudOrganization/usageRates.svelte b/src/routes/(console)/(wizard)/cloudOrganization/usageRates.svelte
similarity index 100%
rename from src/routes/console/wizard/cloudOrganization/usageRates.svelte
rename to src/routes/(console)/(wizard)/cloudOrganization/usageRates.svelte
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/addressDetails.svelte b/src/routes/(console)/(wizard)/cloudOrganizationChangeTier/addressDetails.svelte
similarity index 100%
rename from src/routes/console/wizard/cloudOrganizationChangeTier/addressDetails.svelte
rename to src/routes/(console)/(wizard)/cloudOrganizationChangeTier/addressDetails.svelte
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte b/src/routes/(console)/(wizard)/cloudOrganizationChangeTier/choosePlan.svelte
similarity index 100%
rename from src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte
rename to src/routes/(console)/(wizard)/cloudOrganizationChangeTier/choosePlan.svelte
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte b/src/routes/(console)/(wizard)/cloudOrganizationChangeTier/confirmDetails.svelte
similarity index 100%
rename from src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
rename to src/routes/(console)/(wizard)/cloudOrganizationChangeTier/confirmDetails.svelte
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/inviteMembers.svelte b/src/routes/(console)/(wizard)/cloudOrganizationChangeTier/inviteMembers.svelte
similarity index 100%
rename from src/routes/console/wizard/cloudOrganizationChangeTier/inviteMembers.svelte
rename to src/routes/(console)/(wizard)/cloudOrganizationChangeTier/inviteMembers.svelte
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/paymentDetails.svelte b/src/routes/(console)/(wizard)/cloudOrganizationChangeTier/paymentDetails.svelte
similarity index 100%
rename from src/routes/console/wizard/cloudOrganizationChangeTier/paymentDetails.svelte
rename to src/routes/(console)/(wizard)/cloudOrganizationChangeTier/paymentDetails.svelte
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/planExcess.svelte b/src/routes/(console)/(wizard)/cloudOrganizationChangeTier/planExcess.svelte
similarity index 100%
rename from src/routes/console/wizard/cloudOrganizationChangeTier/planExcess.svelte
rename to src/routes/(console)/(wizard)/cloudOrganizationChangeTier/planExcess.svelte
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/store.ts b/src/routes/(console)/(wizard)/cloudOrganizationChangeTier/store.ts
similarity index 100%
rename from src/routes/console/wizard/cloudOrganizationChangeTier/store.ts
rename to src/routes/(console)/(wizard)/cloudOrganizationChangeTier/store.ts
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/usageExcess.svelte b/src/routes/(console)/(wizard)/cloudOrganizationChangeTier/usageExcess.svelte
similarity index 100%
rename from src/routes/console/wizard/cloudOrganizationChangeTier/usageExcess.svelte
rename to src/routes/(console)/(wizard)/cloudOrganizationChangeTier/usageExcess.svelte
diff --git a/src/routes/console/wizard/feedback/step1.svelte b/src/routes/(console)/(wizard)/feedback/step1.svelte
similarity index 100%
rename from src/routes/console/wizard/feedback/step1.svelte
rename to src/routes/(console)/(wizard)/feedback/step1.svelte
diff --git a/src/routes/console/wizard/feedback/step2.svelte b/src/routes/(console)/(wizard)/feedback/step2.svelte
similarity index 100%
rename from src/routes/console/wizard/feedback/step2.svelte
rename to src/routes/(console)/(wizard)/feedback/step2.svelte
diff --git a/src/routes/console/wizard/support/mobileSupportModal.svelte b/src/routes/(console)/(wizard)/support/mobileSupportModal.svelte
similarity index 100%
rename from src/routes/console/wizard/support/mobileSupportModal.svelte
rename to src/routes/(console)/(wizard)/support/mobileSupportModal.svelte
diff --git a/src/routes/console/wizard/support/step1.svelte b/src/routes/(console)/(wizard)/support/step1.svelte
similarity index 100%
rename from src/routes/console/wizard/support/step1.svelte
rename to src/routes/(console)/(wizard)/support/step1.svelte
diff --git a/src/routes/console/wizard/support/store.ts b/src/routes/(console)/(wizard)/support/store.ts
similarity index 100%
rename from src/routes/console/wizard/support/store.ts
rename to src/routes/(console)/(wizard)/support/store.ts
diff --git a/src/routes/console/+error.svelte b/src/routes/(console)/+error.svelte
similarity index 80%
rename from src/routes/console/+error.svelte
rename to src/routes/(console)/+error.svelte
index 408a5afaa..5e5be1084 100644
--- a/src/routes/console/+error.svelte
+++ b/src/routes/(console)/+error.svelte
@@ -1,4 +1,5 @@
@@ -71,8 +71,7 @@
{#each data.users.users as user}
-
+
{#if user.email || user.phone}
@@ -145,7 +144,7 @@
Sorry, we couldn't find '{data.search}'
There are no users that match your search.
@@ -103,7 +102,7 @@
Sorry, we couldn't find ‘{data.search}'
There are no teams that match your search.
-